X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FContact.java;h=4b4446de67c7ab0b9d4fed2650024a7274913421;hb=f04a32e97c847d7e2551037a4d5f6a070879215c;hp=948fd8447965a87d06663db2b4513d6bea022d92;hpb=26d2bd0591901a8d52bd24802a8d6827d0e9b833;p=jvcard.git diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java index 948fd84..4b4446d 100644 --- a/src/be/nikiroo/jvcard/Contact.java +++ b/src/be/nikiroo/jvcard/Contact.java @@ -7,16 +7,21 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.UUID; import be.nikiroo.jvcard.parsers.Format; import be.nikiroo.jvcard.parsers.Parser; -import be.nikiroo.jvcard.tui.StringUtils; +import be.nikiroo.utils.StringUtils; /** * A contact is the information that represent a contact person or organisation. + *
+ * Each {@link Data} inside can be binary encoded or not: if it is binary
+ * encoded, it has an active BKey number (not -1) associated to it (of value 0
+ * if still not sorted, or unique for the whole {@link Contact} if already
+ * processed).
*
* @author niki
- *
*/
public class Contact extends BaseClass {
private int nextBKey = 1;
@@ -35,32 +40,32 @@ public class Contact extends BaseClass {
}
/**
- * Return the preferred Data field with the given name, or NULL if none.
+ * Return the preferred Data field with the given name, the first one if
+ * none is preferred, or NULL if none at all.
*
* @param name
* the name to look for
- * @return the Data field, or NULL
+ *
+ * @return the {@link Data} field, or NULL
*/
public Data getPreferredData(String name) {
- Data first = null;
+ Data pref = null;
+ int ipref = Integer.MAX_VALUE;
for (Data data : getData(name)) {
- if (first == null)
- first = data;
- for (int index = 0; index < data.size(); index++) {
- TypeInfo type = data.get(index);
- if (type.getName().equals("TYPE")
- && type.getValue().equals("pref")) {
- return data;
- }
- }
+ if (pref == null)
+ pref = data;
+
+ if (data.getPreferred() < ipref)
+ pref = data;
}
- return first;
+ return pref;
}
/**
* Return the value of the preferred data field with this name, or NULL if
- * none (you cannot differentiate a NULL value and no value).
+ * none (you cannot differentiate a NULL value and no value with this method
+ * -- for that, check {@link Contact#getPreferredData(String)}).
*
* @param name
* the name to look for
@@ -77,7 +82,7 @@ public class Contact extends BaseClass {
* Get the Data fields that share the given name.
*
* @param name
- * the name to ook for
+ * the name to look for
* @return a list of Data fields with this name
*/
public List getData(String name) {
@@ -91,56 +96,79 @@ public class Contact extends BaseClass {
return found;
}
- /**
- * Return a {@link String} representation of this contact.
- *
- * @param format
- * the {@link Format} to use
- * @param startingBKey
- * the starting BKey or -1 for no BKeys
- * @return the {@link String} representation
- */
- public String toString(Format format, int startingBKey) {
- updateBKeys(false);
- return Parser.toString(this, format, startingBKey);
- }
-
/**
* Return a {@link String} representation of this contact formated
* accordingly to the given format.
*
+ *
* The format is basically a list of field names separated by a pipe and
- * optionally parametrised. The parameters allows you to:
+ * optionally parametrised with the 'at' (@) symbol. The parameters allows
+ * you to:
*
*
+ *
+ * In case of lists or multiple-fields values, you can select a specific + * list or field with: + *
+ * You can also add a fixed text if it starts with a simple-quote ('). + *
+ * + *+ * Example: "'Contact: |N@10|FN@20|NICK@+|PHOTO@x" + *
* * @param format * the format to use + * @param separator + * the separator {@link String} to use between fields * * @return the {@link String} representation */ - public String toString(String format) { - return toString(format, "|", null, -1, true, false); + public String toString(String format, String separator) { + return toString(format, separator, null, -1, true); } /** * Return a {@link String} representation of this contact formated * accordingly to the given format. * + ** The format is basically a list of field names separated by a pipe and * optionally parametrised. The parameters allows you to: *
+ * In case of lists or multiple-fields values, you can select a specific + * list or field with: + *
+ * You can also add a fixed text if it starts with a simple-quote ('). + *
+ * + *+ * Example: "'Contact: |N@10|FN@20|NICK@+|PHOTO@x" + *
* * @param format * the format to use @@ -150,14 +178,13 @@ public class Contact extends BaseClass { * the {@link String} to use for left and right padding * @param width * a fixed width or -1 for "as long as needed" - * * @param unicode - * allow Uniode or only ASCII characters + * allow Unicode or only ASCII characters * * @return the {@link String} representation */ public String toString(String format, String separator, String padding, - int width, boolean unicode, boolean removeAccents) { + int width, boolean unicode) { StringBuilder builder = new StringBuilder(); for (String str : toStringArray(format, separator, padding, width, @@ -172,6 +199,7 @@ public class Contact extends BaseClass { * Return a {@link String} representation of this contact formated * accordingly to the given format, part by part. * + ** The format is basically a list of field names separated by a pipe and * optionally parametrised. The parameters allows you to: *
+ * In case of lists or multiple-fields values, you can select a specific + * list or field with: + *
+ * You can also add a fixed text if it starts with a simple-quote ('). + *
+ * + *+ * Example: "'Contact: |N@10|FN@20|NICK@+|PHOTO@x" + *
* * @param format * the format to use @@ -232,6 +276,7 @@ public class Contact extends BaseClass { * Return a {@link String} representation of this contact formated * accordingly to the given format, part by part. * + ** The format is basically a list of field names separated by a pipe and * optionally parametrised. The parameters allows you to: *
+ * In case of lists or multiple-fields values, you can select a specific + * list or field with: + *
+ * You can also add a fixed text if it starts with a simple-quote ('). + *
* - * Example: "N@10|FN@20|NICK@+|PHOTO@x" + *+ * Example: "'Contact: |N@10|FN@20|NICK@+|PHOTO@x" + *
* * @param format * the format to use @@ -248,7 +309,7 @@ public class Contact extends BaseClass { * a fixed width or -1 for "as long as needed" * @param unicode * allow Uniode or only ASCII characters - * + * * @return the {@link String} representation */ public String[] toStringArray(String format, int width, boolean unicode) { @@ -275,8 +336,11 @@ public class Contact extends BaseClass { int size = -1; boolean binary = false; boolean expand = false; + int fieldNum = -1; + int valueNum = -1; - if (field.contains("@")) { + if (field.length() > 0 && field.charAt(0) != '\'' + && field.contains("@")) { String[] opts = field.split("@"); if (opts.length > 0) field = opts[0]; @@ -287,16 +351,48 @@ public class Contact extends BaseClass { } else if (opt.equals("+")) { expand = true; numOfFieldsToExpand++; + } else if (opt.length() > 0 && opt.charAt(0) == '(') { + try { + opt = opt.substring(1, opt.length() - 1); + valueNum = Integer.parseInt(opt); + } catch (Exception e) { + } + } else if (opt.length() > 0 && opt.charAt(0) == '[') { + try { + opt = opt.substring(1, opt.length() - 1); + fieldNum = Integer.parseInt(opt); + } catch (Exception e) { + } } else { try { size = Integer.parseInt(opt); - } catch (Exception e) { + } catch (NumberFormatException e) { } } } } - String value = getPreferredDataValue(field); + String value = null; + if (field.length() > 0 && field.charAt(0) == '\'') { + value = field.substring(1); + } else if (valueNum >= 0) { + List
+ * Will always add one and only one {@link String} (potentially empty) at
+ * the end of list.
*
* @param list
+ * the list to add to
* @param add
+ * the {@link String} to (either fully or partially) add
* @param currentSize
+ * the current total size (managed outside of this method)
* @param maxSize
- * @return
+ * the maximum size that cannot be exceeded (or -1 for
+ * "no maximum") -- if the maximum size would be exceeded by
+ * adding this {@link String}, only a part of it will be added;
+ * if the maximum size is already reached or exceeded (should not
+ * happen because of this method), an empty {@link String} will
+ * be added
+ *
+ * @return the number of characters added (the size of the last
+ * {@link String} in list)
*/
static private int addToList(List