X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FData.java;h=d6ba628d3353fa2f1b22d0f1440790a06c268631;hb=aecb3399b756d2ba04223bc6f553999fce73f9fb;hp=f2bb4080f6d770776e1824e0cf7cfd7495c20433;hpb=78e4af97505df331618f9c13dd5d98440d364764;p=jvcard.git diff --git a/src/be/nikiroo/jvcard/Data.java b/src/be/nikiroo/jvcard/Data.java index f2bb408..d6ba628 100644 --- a/src/be/nikiroo/jvcard/Data.java +++ b/src/be/nikiroo/jvcard/Data.java @@ -11,7 +11,7 @@ import java.util.List; * @author niki * */ -public class Data { +public class Data extends BaseClass { public enum DataPart { FN_FAMILY, FN_GIVEN, FN_ADDITIONAL, // Name FN_PRE, FN_POST, // Pre/Post @@ -24,9 +24,6 @@ public class Data { private String value; private String group; private int b64; // -1 = no, 0 = still not ordered, the rest is order - private List types; - private boolean dirty; - private Contact parent; /** * Create a new {@link Data} with the given values. @@ -34,25 +31,21 @@ public class Data { * @param types * the types of this {@link Data} * @param name - * its name + * its name (MUST NOT be NULL) * @param value - * its value + * its value (MUST NOT be NULL) * @param group - * its group if any + * its group if any (or NULL if none) */ public Data(List types, String name, String value, String group) { - if (types == null) { - types = new LinkedList(); - } + super(types); - this.types = types; - this.name = name; - this.value = value; + this.name = name.toUpperCase(); + this.value = value.toString(); // crash NOW if null this.group = group; b64 = -1; - for (TypeInfo type : types) { - type.setParent(this); + for (TypeInfo type : this) { if (type.getName().equals("ENCODING") && type.getValue().equals("b")) { b64 = 0; @@ -61,30 +54,6 @@ public class Data { } } - /** - * Return the number of {@link TypeInfo} present in this {@link Data}. - * - * @return the number of {@link TypeInfo}s - */ - public int size() { - return types.size(); - } - - /** - * Return the {@link TypeInfo} at index index. - * - * @param index - * the index of the {@link TypeInfo} to find - * - * @return the {@link TypeInfo} - * - * @throws IndexOutOfBoundsException - * if the index is < 0 or >= {@link Data#size()} - */ - public TypeInfo get(int index) { - return types.get(index); - } - /** * Return the name of this {@link Data} * @@ -100,6 +69,15 @@ public class Data { * @return the value */ public String getValue() { + return unescape(value); + } + + /** + * Return the RAW value of this {@link Data} + * + * @return the RAW value + */ + public String getRawValue() { return value; } @@ -110,6 +88,8 @@ public class Data { * the new value */ public void setValue(String value) { + value = escape(value); + if ((value == null && this.value != null) || (value != null && !value.equals(this.value))) { this.value = value; @@ -117,6 +97,45 @@ public class Data { } } + /** + * Return the {@link List} of comma-listed values from this {@link Data}. + * + * @return the {@link List} of values + */ + public List getValues() { + return getList(','); + } + + /** + * Set the {@link List} of comma-listed values from this {@link Data}. + * + * @param values + * the {@link List} of values + */ + public void setValues(List values) { + setList(values, ','); + } + + /** + * Return the {@link List} of semi-column-listed fields from this + * {@link Data}. + * + * @return the {@link List} of values + */ + public List getFields() { + return getList(';'); + } + + /** + * Set the {@link List} of comma-listed values from this {@link Data}. + * + * @param values + * the {@link List} of values + */ + public void setFields(List values) { + setList(values, ';'); + } + /** * Return the group of this {@link Data} * @@ -126,6 +145,20 @@ public class Data { return group; } + /** + * Change the group of this {@link Data} + * + * @param group + * the new group + */ + public void setGroup(String group) { + if ((group == null && this.group != null) + || (group != null && !group.equals(this.group))) { + this.group = group; + setDirty(); + } + } + /** * Return the bkey number of this {@link Data} or -1 if it is not binary. * @@ -135,6 +168,30 @@ public class Data { return b64; } + /** + * Check if this {@link Data} is binary + * + * @return TRUE if it is + */ + public boolean isBinary() { + return b64 >= 0; + } + + /** + * Check if this {@link Data} has the "preferred" flag. + * + * @return TRUE if it has + */ + public boolean isPreferred() { + for (TypeInfo type : this) { + if (type.getName().equals("TYPE") && type.getValue().equals("pref")) { + return true; + } + } + + return false; + } + /** * Change the bkey of this {@link Data} * @@ -156,51 +213,69 @@ public class Data { } /** - * Check if this {@link Data} is binary + * Return the {@link List} of sep-listed values from this {@link String} + * data. * - * @return TRUE if it is + * @param value + * the data + * + * @param the + * separator + * + * @return the {@link List} of values */ - public boolean isBinary() { - return b64 >= 0; + private List getList(char sep) { + List rep = new LinkedList(); + + if (value != null && value.length() > 0) { + int last = 0; + for (int i = 0; i < value.length(); i++) { + if (value.charAt(i) == sep + && (i == 0 || value.charAt(i - 1) != '\\')) { + rep.add(value.substring(last, i - last)); + } + } + + rep.add(value.substring(last)); + } + + return rep; } /** - * Check if this {@link Data} has unsaved changes. + * Create the {@link String}-encoded {@link List} of sep-listed values from + * the given values. * - * @return TRUE if it has + * @param values + * the {@link List} of values + * + * @param sep + * the separator + * + * @return the {@link String} */ - public boolean isDirty() { - return dirty; - } + private void setList(List values, char sep) { + StringBuilder builder = new StringBuilder(); + boolean first = true; + for (String value : values) { + if (!first) + builder.append(sep); - /** - * Notify that this element has unsaved changes, and notify its parent of - * the same if any. - */ - protected void setDirty() { - this.dirty = true; - if (this.parent != null) - this.parent.setDirty(); - } + builder.append(escape(value)); - /** - * Notify this element and all its descendants that it is in pristine - * state (as opposed to dirty). - */ - void setPristine() { - dirty = false; - for (TypeInfo type : types) { - type.setPristine(); + first = false; } + + value = builder.toString(); } - /** - * Set the parent of this {@link Data}. - * - * @param parent - * the new parent - */ - void setParent(Contact parent) { - this.parent = parent; + @Override + public String getId() { + return "" + name; + } + + @Override + public String getState() { + return ("" + name + value + group).replace(' ', '_'); } }