X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FContact.java;h=9facbcd0f38cf45fe06c09f9d92f44e049c9d19d;hb=a1783d00d03245556a833bc02fbe2865225c2501;hp=ce701a26a60ad88031881a13b71291b72c1ef627;hpb=7da41ecd30228908bf2afcd07ff7943ab59d4c01;p=jvcard.git
diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java
index ce701a2..9facbcd 100644
--- a/src/be/nikiroo/jvcard/Contact.java
+++ b/src/be/nikiroo/jvcard/Contact.java
@@ -47,13 +47,9 @@ public class Contact extends BaseClass {
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 (data.isPreferred())
+ return data;
}
return first;
@@ -92,63 +88,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);
-
- StringBuilder builder = new StringBuilder();
- for (String line : Parser.toStrings(this, format, startingBKey)) {
- builder.append(line);
- builder.append("\r\n");
- }
-
- return builder.toString();
- }
-
/**
* 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: "N@10|FN@20|NICK@+|PHOTO@x" + *+ * 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, false); } /** * 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 @@ -180,6 +192,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 @@ -240,6 +269,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 @@ -283,8 +329,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]; @@ -295,16 +344,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