Author: doll
Date: Mon Aug 25 12:54:17 2008
New Revision: 688853
URL: http://svn.apache.org/viewvc?rev=688853&view=rev
Log:
0.8.1 change
Added two new fields - accounts and ims to the person object.
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java
Modified:
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/PersonImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java?rev=688853&view=auto
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java
(added)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java
Mon Aug 25 12:54:17 2008
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Account;
+
+public class AccountImpl implements Account {
+ String domain;
+ String userId;
+ String username;
+
+ public AccountImpl() { }
+
+ public AccountImpl(String domain, String userId, String username) {
+ this.domain = domain;
+ this.userId = userId;
+ this.username = username;
+ }
+
+ public String getDomain() {
+ return domain;
+ }
+
+ public void setDomain(String domain) {
+ this.domain = domain;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+}
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=688853&r1=688852&r2=688853&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
Mon Aug 25 12:54:17 2008
@@ -23,6 +23,8 @@
String type;
String value;
+ public ListFieldImpl() { }
+
public ListFieldImpl(String type, String value) {
this.type = type;
this.value = value;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java?rev=688853&r1=688852&r2=688853&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
Mon Aug 25 12:54:17 2008
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.social.core.model;
+import org.apache.shindig.social.opensocial.model.Account;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.BodyType;
import org.apache.shindig.social.opensocial.model.Email;
@@ -38,6 +39,7 @@
*/
public class PersonImpl implements Person {
private String aboutMe;
+ private List<Account> accounts;
private List<String> activities;
private List<Address> addresses;
private Integer age;
@@ -58,6 +60,7 @@
private List<String> heroes;
private String humor;
private String id;
+ private List<ListField> ims;
private List<String> interests;
private String jobInterests;
private List<Organization> jobs;
@@ -113,6 +116,14 @@
this.aboutMe = aboutMe;
}
+ public List<Account> getAccounts() {
+ return accounts;
+ }
+
+ public void setAccounts(List<Account> accounts) {
+ this.accounts = accounts;
+ }
+
public List<String> getActivities() {
return activities;
}
@@ -273,6 +284,14 @@
this.id = id;
}
+ public List<ListField> getIms() {
+ return ims;
+ }
+
+ public void setIms(List<ListField> ims) {
+ this.ims = ims;
+ }
+
public List<String> getInterests() {
return interests;
}
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java?rev=688853&view=auto
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java
(added)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Account.java
Mon Aug 25 12:54:17 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.social.opensocial.model;
+
+public interface Account {
+
+ String getDomain();
+
+ void setDomain(String domain);
+
+ String getUserId();
+
+ void setUserId(String userId);
+
+ String getUsername();
+
+ void setUsername(String username);
+}
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=688853&r1=688852&r2=688853&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
Mon Aug 25 12:54:17 2008
@@ -44,6 +44,7 @@
public static enum Field {
/** the json field for aboutMe. */
ABOUT_ME("aboutMe"),
+ ACCOUNTS("accounts"),
/** the json field for activities. */
ACTIVITIES("activities"),
/** the json field for addresses. */
@@ -84,6 +85,7 @@
HUMOR("humor"),
/** the json field for id. */
ID("id"),
+ IMS("ims"),
/** the json field for interests. */
INTERESTS("interests"),
/** the json field for jobInterests. */
@@ -227,6 +229,10 @@
*/
void setAboutMe(String aboutMe);
+ List<Account> getAccounts();
+
+ void setAccounts(List<Account> accounts);
+
/**
* Get the person's favorite activities, specified as an List of strings.
Container support for
* this field is OPTIONAL.
@@ -542,6 +548,10 @@
*/
void setId(String id);
+ List<ListField> getIms();
+
+ void setIms(List<ListField> ims);
+
/**
* Get the person's interests, hobbies or passions, specified as an List of
strings. Container
* support for this field is OPTIONAL.
