X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FContact.java;h=d75d3380326a8bfde6c245f959dd6ff916b1f07f;hb=7671a2499e6f0d6c8e0765b36c18c1e89bc457c5;hp=9facbcd0f38cf45fe06c09f9d92f44e049c9d19d;hpb=bdcf43067f613bdf3837e353e992faeb2c6316ba;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java
index 9facbcd..d75d338 100644
--- a/src/be/nikiroo/jvcard/Contact.java
+++ b/src/be/nikiroo/jvcard/Contact.java
@@ -36,23 +36,26 @@ public class Contact extends BaseClass<Data> {
 	}
 
 	/**
-	 * 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;
+			if (pref == null)
+				pref = data;
 
-			if (data.isPreferred())
-				return data;
+			if (data.getPreferred() < ipref)
+				pref = data;
 		}
 
-		return first;
+		return pref;
 	}
 
 	/**