Beta2 relase

[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 328993947311772e5b62af6920ea178adef6b02c..c5579fe8c5e1cf4a71eeec149d83c7d23be79ff4 100644 (file)
--- a/src/be/nikiroo/jvcard/Contact.java
+++ b/src/be/nikiroo/jvcard/Contact.java
@@ -34,15 +34,17 @@ public class Contact {
 
                boolean fn = false;
                boolean n = false;
-               for (Data data : content) {
-                       if (data.getName().equals("N")) {
-                               n = true;
-                       } else if (data.getName().equals("FN")) {
-                               fn = true;
-                       }
+               if (content != null) {
+                       for (Data data : content) {
+                               if (data.getName().equals("N")) {
+                                       n = true;
+                               } else if (data.getName().equals("FN")) {
+                                       fn = true;
+                               }
 
-                       if (!data.getName().equals("VERSION")) {
-                               datas.add(data);
+                               if (!data.getName().equals("VERSION")) {
+                                       datas.add(data);
+                               }
                        }
                }
 
@@ -81,6 +83,32 @@ public class Contact {
                return datas.get(index);
        }
 
+       /**
+        * Add a new {@link Data} in this {@link Contact}.
+        * 
+        * @param data
+        *            the new data
+        */
+       public void add(Data data) {
+               data.setParent(this);
+               data.setDirty();
+               datas.add(data);
+       }
+
+       /**
+        * Remove the given {@link Data} from its this {@link Contact} if it is in.
+        * 
+        * @return TRUE in case of success
+        */
+       public boolean remove(Data data) {
+               if (datas.remove(data)) {
+                       setDirty();
+                       return true;
+               }
+
+               return false;
+       }
+
        /**
         * Return the preferred Data field with the given name, or NULL if none.
         * 
@@ -460,14 +488,7 @@ public class Contact {
         */
        public boolean delete() {
                if (parent != null) {
-                       List<Contact> list = parent.getContactsList();
-                       for (int i = 0; i < list.size(); i++) {
-                               if (list.get(i) == this) {
-                                       list.remove(i);
-                                       parent.setDirty();
-                                       return true;
-                               }
-                       }
+                       return parent.remove(this);
                }
 
                return false;