X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FContact.java;h=1b888961466737bace2f6f647ee5d9d21b2b739b;hb=3634193b7a8927e68a3ae3d38fff4f6bd36c4ee5;hp=4c6d5d443b9075d42823af98660df19c904c88d9;hpb=e253bd50bb05519f4a16fed4fb95d5b3340128ea;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java
index 4c6d5d4..1b88896 100644
--- a/src/be/nikiroo/jvcard/Contact.java
+++ b/src/be/nikiroo/jvcard/Contact.java
@@ -11,7 +11,7 @@ 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.jvcard.resources.StringUtils;
 
 /**
  * A contact is the information that represent a contact person or organisation.
@@ -47,13 +47,9 @@ public class Contact extends BaseClass<Data> {
 		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;
@@ -103,7 +99,14 @@ public class Contact extends BaseClass<Data> {
 	 */
 	public String toString(Format format, int startingBKey) {
 		updateBKeys(false);
-		return Parser.toString(this, format, startingBKey);
+
+		StringBuilder builder = new StringBuilder();
+		for (String line : Parser.toStrings(this, format, startingBKey)) {
+			builder.append(line);
+			builder.append("\r\n");
+		}
+
+		return builder.toString();
 	}
 
 	/**
@@ -411,7 +414,7 @@ public class Contact extends BaseClass<Data> {
 
 	@Override
 	public String getState() {
-		return "" + getPreferredDataValue("UID");
+		return getId();
 	}
 
 	/**