Add more warnings source to 1.6) and fix warnings

[jvcard.git] / src / be / nikiroo / jvcard / Contact.java

diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java
index 9facbcd0f38cf45fe06c09f9d92f44e049c9d19d..6d362f9c9aed7675fe7fb292095d021848829b52 100644 (file)
--- 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.resources.StringUtils;
+import be.nikiroo.utils.StringUtils;
 
 /**
  * A contact is the information that represent a contact person or organisation.
@@ -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;
        }
 
        /**
@@ -128,7 +131,7 @@ public class Contact extends BaseClass<Data> {
         * @return the {@link String} representation
         */
        public String toString(String format, String separator) {
-               return toString(format, separator, null, -1, true, false);
+               return toString(format, separator, null, -1, true);
        }
 
        /**
@@ -170,14 +173,13 @@ public class Contact extends BaseClass<Data> {
         *            the {@link String} to use for left and right padding
         * @param width
         *            a fixed width or -1 for "as long as needed"
-        * 
         * @param unicode
-        *            allow Uniode or only ASCII characters
+        *            allow Unicode or only ASCII characters
         * 
         * @return the {@link String} representation
         */
        public String toString(String format, String separator, String padding,
-                       int width, boolean unicode, boolean removeAccents) {
+                       int width, boolean unicode) {
                StringBuilder builder = new StringBuilder();
 
                for (String str : toStringArray(format, separator, padding, width,
@@ -302,7 +304,7 @@ public class Contact extends BaseClass<Data> {
         *            a fixed width or -1 for "as long as needed"
         * @param unicode
         *            allow Uniode or only ASCII characters
-        *
+        * 
         * @return the {@link String} representation
         */
        public String[] toStringArray(String format, int width, boolean unicode) {