Author: doll
Date: Wed Apr 16 04:46:07 2008
New Revision: 648673
URL: http://svn.apache.org/viewvc?rev=648673&view=rev
Log:
SHINDIG-194
Patch from Raymond Auge. Adds Field enums to all of the opensocial java model
classes that match the enums in the javascript objects.
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
Wed Apr 16 04:46:07 2008
@@ -24,6 +24,38 @@
import java.util.List;
public class Activity extends AbstractGadgetData {
+
+ public static enum Field {
+ APP_ID("appId"),
+ BODY("body"),
+ BODY_ID("bodyId"),
+ EXTERNAL_ID("externalId"),
+ ID("id"),
+ MEDIA_ITEMS("mediaItems"),
+ POSTED_TIME("postedTime"),
+ PRIORITY("priority"),
+ STREAM_FAVICON_URL("streamFaviconUrl"),
+ STREAM_SOURCE_URL("streamSourceUrl"),
+ STREAM_TITLE("streamTitle"),
+ STREAM_URL("streamUrl"),
+ TEMPLATE_PARAMS("templateParams"),
+ TITLE("title"),
+ TITLE_ID("titleId"),
+ URL("url"),
+ USER_ID("userId");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String appId;
private String body;
private String bodyId;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
Wed Apr 16 04:46:07 2008
@@ -25,6 +25,32 @@
*
*/
public class Address extends AbstractGadgetData {
+
+ public static enum Field {
+ COUNTRY("country"),
+ EXTENDED_ADDRESS("extendedAddress"),
+ LATITUDE("latitude"),
+ LOCALITY("locality"),
+ LONGITUDE("longitude"),
+ PO_BOX("poBox"),
+ POSTAL_CODE("postalCode"),
+ REGION("region"),
+ STREET_ADDRESS("streetAddress"),
+ TYPE("type"),
+ UNSTRUCTURED_ADDRESS("unstructuredAddress");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String country;
private String extendedAddress;
private Float latitude;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
Wed Apr 16 04:46:07 2008
@@ -25,6 +25,26 @@
*
*/
public class BodyType extends AbstractGadgetData {
+
+ public static enum Field {
+ BUILD("build"),
+ EYE_COLOR("height"),
+ HAIR_COLOR("weight"),
+ HEIGHT("eyeColor"),
+ WEIGHT("hairColor");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String build;
private String eyeColor;
private String hairColor;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
Wed Apr 16 04:46:07 2008
@@ -25,6 +25,23 @@
*
*/
public class Email extends AbstractGadgetData {
+
+ public static enum Field {
+ ADDRESS("address"),
+ TYPE("type");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String address;
private String type;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
Wed Apr 16 04:46:07 2008
@@ -25,14 +25,32 @@
*
*/
public class MediaItem extends AbstractGadgetData {
+
+ public static enum Field {
+ MIME_TYPE("mimeType"),
+ TYPE("type"),
+ URL("url");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String mimeType;
private Type type;
private String url;
public enum Type {
- AUDIO("AUDIO"),
- VIDEO("VIDEO"),
- IMAGE("IMAGE");
+ AUDIO("audio"),
+ IMAGE("image"),
+ VIDEO("video");
private final String jsonString;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
Wed Apr 16 04:46:07 2008
@@ -20,14 +20,32 @@
import org.apache.shindig.social.AbstractGadgetData;
/**
- *
+ *
* Base interface for all message objects.
- *
+ *
* see
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Message.html
*
*/
public final class Message extends AbstractGadgetData {
+
+ public static enum Field {
+ BODY("body"),
+ TITLE("title"),
+ TYPE("type");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String body;
private String title;
private Type type;
@@ -119,5 +137,5 @@
*/
public String sanitizeHTML(String htmlStr) {
return htmlStr;
- }
+ }
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
Wed Apr 16 04:46:07 2008
@@ -25,6 +25,27 @@
*
*/
public class Name extends AbstractGadgetData {
+
+ public static enum Field {
+ ADDITIONAL_NAME("additionalName"),
+ FAMILY_NAME("familyName"),
+ GIVEN_NAME("givenName"),
+ HONORIFIC_PREFIX("honorificPrefix"),
+ HONORIFIC_SUFFIX("honorificSuffix"),
+ UNSTRUCTURED("unstructured");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String additionalName;
private String familyName;
private String givenName;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
Wed Apr 16 04:46:07 2008
@@ -27,6 +27,31 @@
*
*/
public class Organization extends AbstractGadgetData {
+
+ public static enum Field {
+ ADDRESS("address"),
+ DESCRIPTION("description"),
+ END_DATE("endDate"),
+ FIELD("field"),
+ NAME("name"),
+ SALARY("salary"),
+ START_DATE("startDate"),
+ SUB_FIELD("subField"),
+ TITLE("title"),
+ WEBPAGE("webpage");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private Address address;
private String description;
private Date endDate;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
Wed Apr 16 04:46:07 2008
@@ -29,6 +29,74 @@
*
*/
public class Person extends AbstractGadgetData {
+
+ public static enum Field {
+ ABOUT_ME("aboutMe"),
+ ACTIVITIES("activities"),
+ ADDRESSES("addresses"),
+ AGE("age"),
+ BODY_TYPE("bodyType"),
+ BOOKS("books"),
+ CARS("cars"),
+ CHILDREN("children"),
+ CURRENT_LOCATION("currentLocation"),
+ DATE_OF_BIRTH("dateOfBirth"),
+ DRINKER("drinker"),
+ EMAILS("emails"),
+ ETHNICITY("ethnicity"),
+ FASHION("fashion"),
+ FOOD("food"),
+ GENDER("gender"),
+ HAPPIEST_WHEN("happiestWhen"),
+ HEROES("heroes"),
+ HUMOR("humor"),
+ ID("id"),
+ INTERESTS("interests"),
+ JOB_INTERESTS("jobInterests"),
+ JOBS("jobs"),
+ LANGUAGES_SPOKEN("languagesSpoken"),
+ LIVING_ARRANGEMENT("livingArrangement"),
+ LOOKING_FOR("lookingFor"),
+ MOVIES("movies"),
+ MUSIC("music"),
+ NAME("name"),
+ NICKNAME("nickname"),
+ PETS("pets"),
+ PHONE_NUMBERS("phoneNumbers"),
+ POLITICAL_VIEWS("politicalViews"),
+ PROFILE_SONG("profileSong"),
+ PROFILE_URL("profileUrl"),
+ PROFILE_VIDEO("profileVideo"),
+ QUOTES("quotes"),
+ RELATIONSHIP_STATUS("relationshipStatus"),
+ RELIGION("religion"),
+ ROMANCE("romance"),
+ SCARED_OF("scaredOf"),
+ SCHOOLS("schools"),
+ SEXUAL_ORIENTATION("sexualOrientation"),
+ SMOKER("smoker"),
+ SPORTS("sports"),
+ STATUS("status"),
+ TAGS("tags"),
+ THUMBNAIL_URL("thumbnailUrl"),
+ TIME_ZONE("timeZone"),
+ TURN_OFFS("turnOffs"),
+ TURN_ONS("turnOns"),
+ TV_SHOWS("tvShows"),
+ URLS("urls");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String aboutMe;
private List<String> activities;
private List<Address> addresses;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
Wed Apr 16 04:46:07 2008
@@ -26,6 +26,23 @@
*
*/
public class Phone extends AbstractGadgetData {
+
+ public static enum Field {
+ NUMBER("number"),
+ TYPE("type");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
@Mandatory private String number;
private String type;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java?rev=648673&r1=648672&r2=648673&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
Wed Apr 16 04:46:07 2008
@@ -24,6 +24,24 @@
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Url.Field.html
*/
public class Url extends AbstractGadgetData {
+
+ public static enum Field {
+ ADDRESS("address"),
+ LINK_TEXT("linkText"),
+ TYPE("type");
+
+ private final String jsonString;
+
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ @Override
+ public String toString() {
+ return this.jsonString;
+ }
+ }
+
private String address;
private String linkText;
private String type;
