- add some convenience constructors

- clear out some fields that were overlooked
- improve the debug printing of the ContentEntry

12 files changed, 94 insertions, 7 deletions

diff --git a/src/com/google/wireless/gdata2/contacts/data/ContactEntry.java b/src/com/google/wireless/gdata2/contacts/data/ContactEntry.java
index 2763862..906f9a4 100644
--- a/src/com/google/wireless/gdata2/contacts/data/ContactEntry.java
+++ b/src/com/google/wireless/gdata2/contacts/data/ContactEntry.java
@@ -489,6 +489,8 @@ public class ContactEntry extends Entry {
     sensitivity = TypedElement.TYPE_NONE;
     shortName = null;
     subject = null;
+    birthday = null;
+    billingInformation = null;
     name = null;
     emailAddresses.removeAllElements();
     imAddresses.removeAllElements();
@@ -514,13 +516,13 @@ public class ContactEntry extends Entry {
     sb.append("\n");
     sb.append("ContactEntry:");
     if (!StringUtils.isEmpty(linkPhotoHref)) {
-      sb.append(" linkPhotoHref:").append(linkPhotoHref).append("\n");
+      sb.append(" linkPhotoHref:").append(linkPhotoHref);
     }
     if (!StringUtils.isEmpty(linkPhotoType)) {
-      sb.append(" linkPhotoType:").append(linkPhotoType).append("\n");
+      sb.append(" linkPhotoType:").append(linkPhotoType);
     }
      if (!StringUtils.isEmpty(linkPhotoEtag)) {
-      sb.append(" linkPhotoEtag:").append(linkPhotoEtag).append("\n");
+      sb.append(" linkPhotoEtag:").append(linkPhotoEtag);
     }
     if (!StringUtils.isEmpty(directoryServer)) {
       sb.append(" directoryServer:").append(directoryServer);
@@ -553,6 +555,17 @@ public class ContactEntry extends Entry {
     if (!StringUtils.isEmpty(subject)) {
       sb.append(" subject:").append(subject);
     }
+    if (!StringUtils.isEmpty(birthday)) {
+      sb.append(" birthday:").append(birthday);
+    }
+    if (!StringUtils.isEmpty(billingInformation)) {
+      sb.append(" billingInformation:").append(billingInformation);
+    }
+    sb.append("\n");
+    if (name != null) {
+      name.toString(sb);
+      sb.append("\n");
+    }
     for (Enumeration iter = emailAddresses.elements();
         iter.hasMoreElements(); ) {
       sb.append("  ");
diff --git a/src/com/google/wireless/gdata2/contacts/data/ContactsElement.java b/src/com/google/wireless/gdata2/contacts/data/ContactsElement.java
index 26e8410..d8e23cc 100644
--- a/src/com/google/wireless/gdata2/contacts/data/ContactsElement.java
+++ b/src/com/google/wireless/gdata2/contacts/data/ContactsElement.java
@@ -12,6 +12,12 @@ import com.google.wireless.gdata2.parser.ParseException;
 public abstract class ContactsElement extends TypedElement {
   private boolean isPrimary;
 
+  public ContactsElement() {}
+  public ContactsElement(byte type, String label, boolean isPrimary) {
+    super(type, label);
+    this.isPrimary = isPrimary;
+  }
+
   public boolean isPrimary() {
     return isPrimary;
   }
diff --git a/src/com/google/wireless/gdata2/contacts/data/EmailAddress.java b/src/com/google/wireless/gdata2/contacts/data/EmailAddress.java
index af9406a..bd5fed1 100644
--- a/src/com/google/wireless/gdata2/contacts/data/EmailAddress.java
+++ b/src/com/google/wireless/gdata2/contacts/data/EmailAddress.java
@@ -17,6 +17,12 @@ public class EmailAddress extends ContactsElement {
    * default empty constructor
    */
   public EmailAddress() {}
+  public EmailAddress(String address, String displayName,
+      byte type, String label, boolean isPrimary) {
+    super(type, label, isPrimary);
+    this.address = address;
+    this.displayName = displayName;
+  }
 
   public String getAddress() {
     return address;
diff --git a/src/com/google/wireless/gdata2/contacts/data/Event.java b/src/com/google/wireless/gdata2/contacts/data/Event.java
index fc0df68..7bac378 100644
--- a/src/com/google/wireless/gdata2/contacts/data/Event.java
+++ b/src/com/google/wireless/gdata2/contacts/data/Event.java
@@ -24,6 +24,10 @@ public class Event extends TypedElement {
    * default empty constructor
    */
   public Event() {}
+  public Event(String startDate, byte type, String label) {
+    super(type, label);
+    this.startDate = startDate;
+  }
 
   /**
    * StartDate associated with this event
@@ -40,6 +44,7 @@ public class Event extends TypedElement {
   }
  
   public void toString(StringBuffer sb) {
+    sb.append("Event");
     super.toString(sb);
     sb.append(" date:").append(startDate.toString());
   }
diff --git a/src/com/google/wireless/gdata2/contacts/data/ImAddress.java b/src/com/google/wireless/gdata2/contacts/data/ImAddress.java
index 3d72d2e..3f4c86c 100644
--- a/src/com/google/wireless/gdata2/contacts/data/ImAddress.java
+++ b/src/com/google/wireless/gdata2/contacts/data/ImAddress.java
@@ -30,6 +30,13 @@ public class ImAddress extends ContactsElement {
    * default empty constructor
    */
   public ImAddress() {}
+  public ImAddress(String address, byte protocolPredefined, String protocolCustom,
+          byte type, String label, boolean isPrimary) {
+      super(type, label, isPrimary);
+      this.address = address;
+      this.protocolPredefined = protocolPredefined;
+      this.protocolCustom = protocolCustom;
+  }
 
   public byte getProtocolPredefined() {
     return protocolPredefined;
diff --git a/src/com/google/wireless/gdata2/contacts/data/Organization.java b/src/com/google/wireless/gdata2/contacts/data/Organization.java
index dde61c9..302fa24 100644
--- a/src/com/google/wireless/gdata2/contacts/data/Organization.java
+++ b/src/com/google/wireless/gdata2/contacts/data/Organization.java
@@ -23,7 +23,18 @@ public class Organization extends ContactsElement {
    * default empty constructor
    */
   public Organization() {}
-  
+  public Organization(String name, String nameYomi, String title, String orgDepartment,
+          String orgJobDescription, String orgSymbol, String where,
+        byte type, String label, boolean isPrimary) {
+      super(type, label, isPrimary);
+      this.name = name;
+      this.nameYomi = nameYomi;
+      this.title = title;
+      this.orgDepartment = orgDepartment;
+      this.orgJobDescription = orgJobDescription;
+      this.orgSymbol = orgSymbol;
+      this.where = where;
+  }
  
   public String getName() {
     return name;
diff --git a/src/com/google/wireless/gdata2/contacts/data/PhoneNumber.java b/src/com/google/wireless/gdata2/contacts/data/PhoneNumber.java
index be7ae65..a4b4c62 100644
--- a/src/com/google/wireless/gdata2/contacts/data/PhoneNumber.java
+++ b/src/com/google/wireless/gdata2/contacts/data/PhoneNumber.java
@@ -33,6 +33,10 @@ public class PhoneNumber extends ContactsElement {
    * default empty constructor
    */
   public PhoneNumber() {}
+  public PhoneNumber(String phoneNumber, byte type, String label, boolean isPrimary) {
+    super(type, label, isPrimary);
+    this.phoneNumber = phoneNumber;
+  }
   
 
   public String getPhoneNumber() {
diff --git a/src/com/google/wireless/gdata2/contacts/data/Relation.java b/src/com/google/wireless/gdata2/contacts/data/Relation.java
index 10ab8e5..1944c49 100644
--- a/src/com/google/wireless/gdata2/contacts/data/Relation.java
+++ b/src/com/google/wireless/gdata2/contacts/data/Relation.java
@@ -34,7 +34,11 @@ public class Relation extends TypedElement {
    * default empty constructor
    */
   public Relation() {}
-  
+  public Relation(String text, byte type, String label) {
+    super(type, label);
+    this.text = text;
+  }
+
  
   
   /**
@@ -53,6 +57,7 @@ public class Relation extends TypedElement {
  
  
    public void toString(StringBuffer sb) {
+    sb.append("Relation");
     super.toString(sb);
     if (!StringUtils.isEmpty(text)) {
       sb.append(" text:").append(text);
diff --git a/src/com/google/wireless/gdata2/contacts/data/StructuredPostalAddress.java b/src/com/google/wireless/gdata2/contacts/data/StructuredPostalAddress.java
index c3f40d5..79399f5 100644
--- a/src/com/google/wireless/gdata2/contacts/data/StructuredPostalAddress.java
+++ b/src/com/google/wireless/gdata2/contacts/data/StructuredPostalAddress.java
@@ -30,7 +30,20 @@ public class StructuredPostalAddress extends ContactsElement {
    * default empty constructor
    */
   public StructuredPostalAddress() {}
- 
+    public StructuredPostalAddress(String street, String pobox, String city, String postcode,
+            String country, String region, String neighborhood, String formattedAddress,
+        byte type, String label, boolean isPrimary) {
+    super(type, label, isPrimary);
+    this.street = street;
+    this.pobox = pobox;
+    this.city = city;
+    this.postcode = postcode;
+    this.country = country;
+    this.region = region;
+    this.neighborhood = neighborhood;
+    this.formattedAddress = formattedAddress;
+  }
+
   /**
    * Getter for street 
    * Can be street, avenue, road, etc. This element also includes 
@@ -188,6 +201,6 @@ public class StructuredPostalAddress extends ContactsElement {
     if (region != null) sb.append(" region:").append(region);
     if (postcode != null) sb.append(" postcode:").append(postcode);
     if (country != null) sb.append(" country:").append(country);
-    if (formattedAddress != null) sb.append(" formatedAddress:").append(formattedAddress);
+    if (formattedAddress != null) sb.append(" formattedAddress:").append(formattedAddress);
   }
 }
diff --git a/src/com/google/wireless/gdata2/contacts/data/TypedElement.java b/src/com/google/wireless/gdata2/contacts/data/TypedElement.java
index bb37e93..20595b7 100644
--- a/src/com/google/wireless/gdata2/contacts/data/TypedElement.java
+++ b/src/com/google/wireless/gdata2/contacts/data/TypedElement.java
@@ -15,6 +15,12 @@ public abstract class TypedElement {
 
   private String label;
 
+  public TypedElement() {}
+  public TypedElement(byte type, String label) {
+    this.type = type;
+    this.label = label;
+  }
+
   public byte getType() {
     return type;
   }
diff --git a/src/com/google/wireless/gdata2/contacts/data/WebSite.java b/src/com/google/wireless/gdata2/contacts/data/WebSite.java
index 35800f0..6c3e59b 100644
--- a/src/com/google/wireless/gdata2/contacts/data/WebSite.java
+++ b/src/com/google/wireless/gdata2/contacts/data/WebSite.java
@@ -24,6 +24,10 @@ public class WebSite extends ContactsElement {
    * default empty constructor
    */
   public WebSite() {}
+  public WebSite(String href, byte type, String label, boolean isPrimary) {
+    super(type, label, isPrimary);
+    this.href = href;
+  }
 
   /**
    * The URL of the website.
diff --git a/src/com/google/wireless/gdata2/data/ExtendedProperty.java b/src/com/google/wireless/gdata2/data/ExtendedProperty.java
index 7e2b0db..3f6d958 100644
--- a/src/com/google/wireless/gdata2/data/ExtendedProperty.java
+++ b/src/com/google/wireless/gdata2/data/ExtendedProperty.java
@@ -12,6 +12,13 @@ public class ExtendedProperty {
   private String value;
   private String xmlBlob;
 
+  public ExtendedProperty() {}
+  public ExtendedProperty(String name, String value, String xmlBlob) {
+      this.name = name;
+      this.value = value;
+      this.xmlBlob = xmlBlob;
+  }
+
   public String getXmlBlob() {
     return xmlBlob;
   }