X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FData.java;h=0484adef9c5b339d270c7b8ad6256a80625299d3;hb=f04a32e97c847d7e2551037a4d5f6a070879215c;hp=377c41e29edbbbc8d97d73d2d27c79390752944f;hpb=176a83279a5aafb7e44cc7c34bf78f0bc35225fe;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/Data.java b/src/be/nikiroo/jvcard/Data.java
index 377c41e..0484ade 100644
--- a/src/be/nikiroo/jvcard/Data.java
+++ b/src/be/nikiroo/jvcard/Data.java
@@ -5,28 +5,27 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * A data is a piece of information present in a {@link Contact}. It is
+ * A {@link Data} is a piece of information present in a {@link Contact}. It is
  * basically a key/value pair with optional types and an optional group name.
+ * <p>
+ * A {@link Data} can also be binary encoded: in this case, it has an associated
+ * BKey number to identify it.
  * 
  * @author niki
- *
  */
-public class Data {
+public class Data extends BaseClass<TypeInfo> {
 	public enum DataPart {
 		FN_FAMILY, FN_GIVEN, FN_ADDITIONAL, // Name
 		FN_PRE, FN_POST, // Pre/Post
 		BDAY_YYYY, BDAY_MM, BDAY_DD, // BDay
+		// Address:
 		ADR_PBOX, ADR_EXTENDED, ADR_STREET, ADR_CITY, ADR_REGION, ADR_POSTAL_CODE, ADR_COUNTRY
-		// Address
 	}
 
 	private String name;
 	private String value;
 	private String group;
 	private int b64; // -1 = no, 0 = still not ordered, the rest is order
-	private List<TypeInfo> types;
-	private boolean dirty;
-	private Contact parent;
 
 	/**
 	 * Create a new {@link Data} with the given values.
@@ -34,25 +33,21 @@ public class Data {
 	 * @param types
 	 *            the types of this {@link Data}
 	 * @param name
-	 *            its name
+	 *            its name (<b>MUST NOT</b> be NULL)
 	 * @param value
-	 *            its value
+	 *            its value (<b>MUST NOT</b> be NULL)
 	 * @param group
-	 *            its group if any
+	 *            its group if any (or NULL if none)
 	 */
 	public Data(List<TypeInfo> types, String name, String value, String group) {
-		if (types == null) {
-			types = new LinkedList<TypeInfo>();
-		}
+		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;
@@ -62,102 +57,93 @@ public class Data {
 	}
 
 	/**
-	 * Return the number of {@link TypeInfo} present in this {@link Data}.
+	 * Return the name of this {@link Data}
 	 * 
-	 * @return the number of {@link TypeInfo}s
+	 * @return the name
 	 */
-	public int size() {
-		return types.size();
+	public String getName() {
+		return name;
 	}
 
 	/**
-	 * Return the {@link TypeInfo} at index <i>index</i>.
-	 * 
-	 * @param index
-	 *            the index of the {@link TypeInfo} to find
+	 * Return the value of this {@link Data}
 	 * 
-	 * @return the {@link TypeInfo}
+	 * @return the value
+	 */
+	public String getValue() {
+		return unescape(value);
+	}
+
+	/**
+	 * Change the value of this {@link Data}
 	 * 
-	 * @throws IndexOutOfBoundsException
-	 *             if the index is < 0 or >= {@link Data#size()}
+	 * @param value
+	 *            the new value
 	 */
-	public TypeInfo get(int index) {
-		return types.get(index);
+	public void setValue(String value) {
+		setRawValue(escape(value));
 	}
 
 	/**
-	 * Add a new {@link TypeInfo} in this {@link Data}.
+	 * Return the raw value of this {@link Data}
 	 * 
-	 * @param type
-	 *            the new type
+	 * @return the raw value
 	 */
-	public void add(TypeInfo type) {
-		type.setParent(this);
-		type.setDirty();
-		types.add(type);
+	public String getRawValue() {
+		return value;
 	}
 
 	/**
-	 * Remove the given {@link TypeInfo} from its this {@link Data} if it is in.
+	 * Change the raw value of this {@link Data}
 	 * 
-	 * @return TRUE in case of success
+	 * @param value
+	 *            the new raw value
 	 */
-	public boolean remove(TypeInfo type) {
-		if (types.remove(type)) {
+	public void setRawValue(String value) {
+		if ((value == null && this.value != null)
+				|| (value != null && !value.equals(this.value))) {
+			this.value = value;
 			setDirty();
 		}
-
-		return false;
 	}
 
 	/**
-	 * Change the {@link TypeInfo}s of this {@link Data}.
+	 * Return the {@link List} of comma-listed values from this {@link Data}.
 	 * 
-	 * @param types
-	 *            the new types
+	 * @return the {@link List} of values
 	 */
-	@Deprecated
-	public void setTypes(List<TypeInfo> types) {
-		// TODO: check if this method is required
-		this.types.clear();
-		for (TypeInfo type : types) {
-			this.types.add(type);
-			type.setParent(this);
-		}
-
-		setDirty();
+	public List<String> getValues() {
+		return getList(',');
 	}
 
 	/**
-	 * Return the name of this {@link Data}
+	 * Set the {@link List} of comma-listed values from this {@link Data}.
 	 * 
-	 * @return the name
+	 * @param values
+	 *            the {@link List} of values
 	 */
-	public String getName() {
-		return name;
+	public void setValues(List<String> values) {
+		setList(values, ',');
 	}
 
 	/**
-	 * Return the value of this {@link Data}
+	 * Return the {@link List} of semi-column-listed fields from this
+	 * {@link Data}.
 	 * 
-	 * @return the value
+	 * @return the {@link List} of values
 	 */
-	public String getValue() {
-		return value;
+	public List<String> getFields() {
+		return getList(';');
 	}
 
 	/**
-	 * Change the value of this {@link Data}
+	 * Set the {@link List} of comma-listed values from this {@link Data}.
 	 * 
-	 * @param value
-	 *            the new value
+	 * @param values
+	 *            the {@link List} of values
 	 */
-	public void setValue(String value) {
-		if ((value == null && this.value != null)
-				|| (value != null && !value.equals(this.value))) {
-			this.value = value;
-			setDirty();
-		}
+	public void setFields(List<String> values) {
+		setList(values, ';');
 	}
 
 	/**
@@ -185,13 +171,45 @@ public class Data {
 
 	/**
 	 * Return the bkey number of this {@link Data} or -1 if it is not binary.
+	 * <p>
+	 * For binary data, as long as the BKey is not processed, it will be 0.
 	 * 
-	 * @return the bkey or -1
+	 * @return the bkey, 0 or -1
 	 */
 	public int getB64Key() {
 		return b64;
 	}
 
+	/**
+	 * Check if this {@link Data} is binary (in this case, the BKey will be
+	 * present).
+	 * 
+	 * @return TRUE if it is
+	 */
+	public boolean isBinary() {
+		return b64 >= 0;
+	}
+
+	/**
+	 * Return the preferred value of this {@link Data}, or
+	 * {@link Integer#MAX_VALUE} if none.
+	 * 
+	 * @return the preferred value
+	 */
+	public int getPreferred() {
+		for (TypeInfo type : this) {
+			if (type.getName().equals("PRE")) {
+				try {
+					return Integer.parseInt(type.getValue());
+				} catch (NumberFormatException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+		return Integer.MAX_VALUE;
+	}
+
 	/**
 	 * Change the bkey of this {@link Data}
 	 * 
@@ -213,64 +231,87 @@ public class Data {
 	}
 
 	/**
-	 * Check if this {@link Data} is binary
+	 * Return the {@link List} of sep-listed values from this {@link String}
+	 * data.
+	 * <p>
+	 * Will take the backslash character into account (i.e., a backslash can
+	 * escape the given separator).
 	 * 
-	 * @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<String> getList(char sep) {
+		List<String> rep = new LinkedList<String>();
+
+		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 = i + 1;
+				}
+			}
+
+			if (last < value.length())
+				rep.add(value.substring(last));
+		}
+
+		return rep;
 	}
 
 	/**
-	 * Delete this {@link Contact} from its parent {@link Card} if any.
+	 * Create the {@link String}-encoded {@link List} of sep-listed values from
+	 * the given values.
+	 * 
+	 * @param values
+	 *            the {@link List} of values
 	 * 
-	 * @return TRUE in case of success
+	 * @param sep
+	 *            the separator
+	 * 
+	 * @return the {@link String}
 	 */
-	public boolean delete() {
-		if (parent != null) {
-			return parent.remove(this);
+	private void setList(List<String> values, char sep) {
+		StringBuilder builder = new StringBuilder();
+		boolean first = true;
+		for (String value : values) {
+			if (!first)
+				builder.append(sep);
+
+			builder.append(escape(value));
+
+			first = false;
 		}
 
-		return false;
+		value = builder.toString();
 	}
 
-	/**
-	 * Check if this {@link Data} has unsaved changes.
-	 * 
-	 * @return TRUE if it has
-	 */
-	public boolean isDirty() {
-		return dirty;
+	@Override
+	public String getId() {
+		return "" + name;
 	}
 
-	/**
-	 * 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();
+	@Override
+	public String getState() {
+		return ("" + name + value + group).replace(' ', '_');
 	}
 
-	/**
-	 * Notify this element <i>and all its descendants</i> that it is in pristine
-	 * state (as opposed to dirty).
-	 */
-	void setPristine() {
-		dirty = false;
-		for (TypeInfo type : types) {
-			type.setPristine();
+	@Override
+	public String toString() {
+		String out = name + ": " + value;
+		if (group != null && !group.isEmpty()) {
+			out += " (" + group + ")";
+		}
+		if (b64 >= 0) {
+			out += " [" + b64 + "]";
 		}
-	}
 
-	/**
-	 * Set the parent of this {@link Data}.
-	 * 
-	 * @param parent
-	 *            the new parent
-	 */
-	void setParent(Contact parent) {
-		this.parent = parent;
+		return out;
 	}
 }