X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FContact.java;h=9facbcd0f38cf45fe06c09f9d92f44e049c9d19d;hb=bdcf43067f613bdf3837e353e992faeb2c6316ba;hp=779b60a3c596ee6ee9bcbc20b09bcf66e3d4edfd;hpb=26d254a3ac6cddbd3583cbbcbf8d43aa15c6a32e;p=jvcard.git
diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java
index 779b60a..9facbcd 100644
--- a/src/be/nikiroo/jvcard/Contact.java
+++ b/src/be/nikiroo/jvcard/Contact.java
@@ -88,34 +88,14 @@ 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 ('). *
* @@ -157,6 +146,15 @@ public class Contact extends BaseClass { * * *+ * 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 ('). *
* @@ -205,6 +203,15 @@ public class Contact extends BaseClass { * * *+ * 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 ('). *
* @@ -273,6 +280,15 @@ public class Contact extends BaseClass { * * *+ * 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 ('). *
* @@ -313,6 +329,8 @@ public class Contact extends BaseClass { int size = -1; boolean binary = false; boolean expand = false; + int fieldNum = -1; + int valueNum = -1; if (field.length() > 0 && field.charAt(0) != '\'' && field.contains("@")) { @@ -326,10 +344,22 @@ 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) { } } } @@ -338,8 +368,22 @@ public class Contact extends BaseClass { String value = null; if (field.length() > 0 && field.charAt(0) == '\'') { value = field.substring(1); + } else if (valueNum >= 0) { + List