X-Git-Url: http://git.nikiroo.be/?p=jvcard.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FContact.java;h=f2a8b01b5ac4be470383f2b29934fde412bbeca8;hp=08d5eee0fdcfe25588d37f466293225af6c17217;hb=9c8baf0c360173b864683176c567757429c4fb12;hpb=fae07ea7af01c64ca1a858db75a615555318d5e2

diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java
index 08d5eee..f2a8b01 100644
--- a/src/be/nikiroo/jvcard/Contact.java
+++ b/src/be/nikiroo/jvcard/Contact.java
@@ -159,34 +159,71 @@ public class Contact {
 	 * @return the {@link String} representation
 	 */
 	public String toString(String format, String separator, int width) {
-		String str = null;
+		StringBuilder builder = new StringBuilder();
 
 		String[] formatFields = format.split("\\|");
-		String[] values = new String[formatFields.length];
-		Boolean[] expandedFields = new Boolean[formatFields.length];
-		Boolean[] fixedsizeFields = new Boolean[formatFields.length];
-		int numOfFieldsToExpand = 0;
-		int totalSize = 0;
-
-		if (width == 0) {
-			return "";
-		}
-
 		if (width > -1 && separator != null && separator.length() > 0
 				&& formatFields.length > 1) {
 			int swidth = (formatFields.length - 1) * separator.length();
 			if (swidth >= width) {
-				str = separator;
-				while (str.length() < width) {
-					str += separator;
+				int num = width / separator.length();
+				int remainder = width % separator.length();
+
+				if (remainder > 0)
+					num++;
+
+				while (builder.length() < width) {
+					if (builder.length() + separator.length() <= width)
+						builder.append(separator);
+					else
+						builder.append(separator
+								.substring(0, (builder.length() + separator
+										.length())
+										- width));
 				}
 
-				return str.substring(0, width);
+				return builder.toString();
 			}
 
 			width -= swidth;
 		}
 
+		for (String str : toStringArray(format, width)) {
+			builder.append(str);
+		}
+
+		return builder.toString();
+	}
+
+	/**
+	 * 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. See {@link Contact#toString} for more
+	 * information about the format.
+	 * 
+	 * @param format
+	 *            the format to use
+	 * @param width
+	 *            a fixed width or -1 for "as long as needed"
+	 * 
+	 * @return the {@link String} representation
+	 */
+	public String[] toStringArray(String format, int width) {
+		List<String> str = new LinkedList<String>();
+
+		String[] formatFields = format.split("\\|");
+		String[] values = new String[formatFields.length];
+		Boolean[] expandedFields = new Boolean[formatFields.length];
+		Boolean[] fixedsizeFields = new Boolean[formatFields.length];
+		int numOfFieldsToExpand = 0;
+		int totalSize = 0;
+
+		if (width == 0) {
+			return str.toArray(new String[] {});
+		}
+
 		for (int i = 0; i < formatFields.length; i++) {
 			String field = formatFields[i];
 
@@ -236,7 +273,7 @@ public class Contact {
 				totalSize += value.length();
 			}
 		}
-		
+
 		if (width > -1 && totalSize > width) {
 			int toDo = totalSize - width;
 			for (int i = fixedsizeFields.length - 1; toDo > 0 && i >= 0; i--) {
@@ -257,7 +294,7 @@ public class Contact {
 
 			totalSize = width + toDo;
 		}
-		
+
 		if (width > -1 && numOfFieldsToExpand > 0) {
 			int availablePadding = width - totalSize;
 
@@ -284,23 +321,13 @@ public class Contact {
 				totalSize = width;
 			}
 		}
-		
-		for (String field : values) {
-			if (str == null) {
-				str = field;
-			} else {
-				str += separator + field;
-			}
-		}
-
-		if (str == null)
-			str = "";
 
-		if (width > -1) {
-			str = fixedString(str, width);
+		int currentSize = 0;
+		for (int i = 0; i < values.length; i++) {
+			currentSize += addToList(str, values[i], currentSize, width);
 		}
 
-		return str;
+		return str.toArray(new String[] {});
 	}
 
 	/**
@@ -326,6 +353,41 @@ public class Contact {
 		return string;
 	}
 
+	/**
+	 * Add a {@link String} to the given {@link List}, but make sure it does not
+	 * exceed the maximum size, and truncate it if needed to fit.
+	 * 
+	 * @param list
+	 * @param add
+	 * @param currentSize
+	 * @param maxSize
+	 * @return
+	 */
+	static private int addToList(List<String> list, String add,
+			int currentSize, int maxSize) {
+		if (add == null || add.length() == 0) {
+			if (add != null)
+				list.add(add);
+			return 0;
+		}
+
+		if (maxSize > -1) {
+			if (currentSize < maxSize) {
+				if (currentSize + add.length() >= maxSize) {
+					add = add.substring(0, maxSize - currentSize);
+				}
+			} else {
+				add = "";
+			}
+		}
+
+		if (add.length() > 0) {
+			list.add(add);
+		}
+
+		return add.length();
+	}
+
 	/**
 	 * Return a {@link String} representation of this contact, in vCard 2.1,
 	 * without BKeys.