Author: doll
Date: Tue Aug 26 10:23:56 2008
New Revision: 689142
URL: http://svn.apache.org/viewvc?rev=689142&view=rev
Log:
0.8.1 change
Added a primary field to organizations, addresses, and all of the list fields.
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.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/ListField.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java?rev=689142&r1=689141&r2=689142&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
Tue Aug 26 10:23:56 2008
@@ -20,7 +20,6 @@
import org.apache.shindig.social.opensocial.model.Address;
public class AddressImpl implements Address {
-
private String country;
private Float latitude;
private Float longitude;
@@ -30,6 +29,7 @@
private String streetAddress;
private String type;
private String formatted;
+ private Boolean primary;
public AddressImpl() { }
@@ -109,4 +109,11 @@
this.formatted = formatted;
}
+ public Boolean getPrimary() {
+ return primary;
+ }
+
+ public void setPrimary(Boolean primary) {
+ this.primary = primary;
+ }
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java?rev=689142&r1=689141&r2=689142&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
Tue Aug 26 10:23:56 2008
@@ -22,6 +22,7 @@
public class ListFieldImpl implements ListField {
String type;
String value;
+ Boolean primary;
public ListFieldImpl() { }
@@ -45,4 +46,12 @@
public void setValue(String value) {
this.value = value;
}
+
+ public Boolean getPrimary() {
+ return primary;
+ }
+
+ public void setPrimary(Boolean primary) {
+ this.primary = primary;
+ }
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java?rev=689142&r1=689141&r2=689142&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
Tue Aug 26 10:23:56 2008
@@ -23,7 +23,6 @@
import java.util.Date;
public class OrganizationImpl implements Organization {
-
private Address address;
private String description;
private Date endDate;
@@ -35,6 +34,7 @@
private String title;
private String webpage;
private String type;
+ private Boolean primary;
public Address getAddress() {
return address;
@@ -123,4 +123,12 @@
public void setType(String type) {
this.type = type;
}
+
+ public Boolean getPrimary() {
+ return primary;
+ }
+
+ public void setPrimary(Boolean primary) {
+ this.primary = primary;
+ }
}
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=689142&r1=689141&r2=689142&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
Tue Aug 26 10:23:56 2008
@@ -42,7 +42,8 @@
/** this field may be multiple lines */
STREET_ADDRESS("streetAddress"),
TYPE("type"),
- FORMATTED("formatted");
+ FORMATTED("formatted"),
+ PRIMARY("primary");
/**
* The json field that the instance represents.
@@ -194,4 +195,8 @@
* @param formatted the formatted address
*/
void setFormatted(String formatted);
+
+ Boolean getPrimary();
+
+ void setPrimary(Boolean primary);
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java?rev=689142&r1=689141&r2=689142&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java
Tue Aug 26 10:23:56 2008
@@ -27,7 +27,8 @@
public static enum Field {
VALUE("value"),
- TYPE("type");
+ TYPE("type"),
+ PRIMARY("primary");
private final String jsonString;
@@ -48,4 +49,8 @@
String getValue();
void setValue(String value);
+
+ Boolean getPrimary();
+
+ void setPrimary(Boolean primary);
}
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=689142&r1=689141&r2=689142&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
Tue Aug 26 10:23:56 2008
@@ -44,7 +44,8 @@
TITLE("title"),
WEBPAGE("webpage"),
/** Should have the value of "job" or "school" to be put in the right js
fields */
- TYPE("type");
+ TYPE("type"),
+ PRIMARY("primary");
private final String jsonString;
@@ -102,4 +103,8 @@
void setType(String type);
+ Boolean getPrimary();
+
+ void setPrimary(Boolean primary);
+
}
