diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 17:39:43 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 17:39:43 -0700 |
commit | a8d14b5ad6306e65266c1801dabb660f8d4a04a1 (patch) | |
tree | 01886b83f36c94024ce43801e4f018e3ba7352e9 | |
parent | 65b014e752df14505170881528f22a88f8922835 (diff) | |
download | gdata-a8d14b5ad6306e65266c1801dabb660f8d4a04a1.tar.gz |
auto import from //branches/cupcake_rel/...@140373HEADandroid-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1android-1.5r4android-1.5r3android-1.5r2android-1.5mastermaindonut-release2donut-releasedonutcupcake-releasecupcake
3 files changed, 29 insertions, 0 deletions
diff --git a/src/com/google/wireless/gdata/contacts/data/ContactEntry.java b/src/com/google/wireless/gdata/contacts/data/ContactEntry.java index 2d3246e..716a5fe 100644 --- a/src/com/google/wireless/gdata/contacts/data/ContactEntry.java +++ b/src/com/google/wireless/gdata/contacts/data/ContactEntry.java @@ -25,6 +25,7 @@ public class ContactEntry extends Entry { private final Vector organizations = new Vector(); private final Vector extendedProperties = new Vector(); private final Vector groups = new Vector(); + private String yomiName; public ContactEntry() { super(); @@ -112,6 +113,14 @@ public class ContactEntry extends Entry { return organizations; } + public void setYomiName(String yomiName) { + this.yomiName = yomiName; + } + + public String getYomiName() { + return yomiName; + } + /* * (non-Javadoc) * @see com.google.wireless.gdata.data.Entry#clear() @@ -129,6 +138,7 @@ public class ContactEntry extends Entry { organizations.removeAllElements(); extendedProperties.removeAllElements(); groups.removeAllElements(); + yomiName = null; } protected void toString(StringBuffer sb) { @@ -189,6 +199,9 @@ public class ContactEntry extends Entry { ((GroupMembershipInfo) iter.nextElement()).toString(sb); sb.append("\n"); } + if (!StringUtils.isEmpty(yomiName)) { + sb.append(" yomiName:").append(yomiName).append("\n"); + } } public void validate() throws ParseException { diff --git a/src/com/google/wireless/gdata/contacts/parser/xml/XmlContactsGDataParser.java b/src/com/google/wireless/gdata/contacts/parser/xml/XmlContactsGDataParser.java index 5c7f551..42a2534 100644 --- a/src/com/google/wireless/gdata/contacts/parser/xml/XmlContactsGDataParser.java +++ b/src/com/google/wireless/gdata/contacts/parser/xml/XmlContactsGDataParser.java @@ -237,6 +237,9 @@ public class XmlContactsGDataParser extends XmlGDataParser { group.setGroup(parser.getAttributeValue(null /* ns */, "href")); group.setDeleted("true".equals(parser.getAttributeValue(null /* ns */, "deleted"))); contactEntry.addGroup(group); + } else if ("yomiName".equals(name)) { + String yomiName = XmlUtils.extractChildText(parser); + contactEntry.setYomiName(yomiName); } } diff --git a/src/com/google/wireless/gdata/contacts/serializer/xml/XmlContactEntryGDataSerializer.java b/src/com/google/wireless/gdata/contacts/serializer/xml/XmlContactEntryGDataSerializer.java index 670e24b..70752b3 100644 --- a/src/com/google/wireless/gdata/contacts/serializer/xml/XmlContactEntryGDataSerializer.java +++ b/src/com/google/wireless/gdata/contacts/serializer/xml/XmlContactEntryGDataSerializer.java @@ -94,6 +94,8 @@ public class XmlContactEntryGDataSerializer extends XmlEntryGDataSerializer { while (eachGroup.hasMoreElements()) { serialize(serializer, (GroupMembershipInfo) eachGroup.nextElement()); } + + serializeYomiName(serializer, entry.getYomiName()); } private static void serialize(XmlSerializer serializer, EmailAddress email) @@ -240,4 +242,15 @@ public class XmlContactEntryGDataSerializer extends XmlEntryGDataSerializer { throws IOException, ParseException { serializer.text(blob); } + + private static void serializeYomiName(XmlSerializer serializer, + String yomiName) + throws IOException { + if (StringUtils.isEmpty(yomiName)) { + return; + } + serializer.startTag(XmlContactsGDataParser.NAMESPACE_CONTACTS_URI, "yomiName"); + serializer.text(yomiName); + serializer.endTag(XmlContactsGDataParser.NAMESPACE_CONTACTS_URI, "yomiName"); + } } |