svn commit: r1135719 - in /shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social: core/model/ActivityEntryImpl.java opensocial/model/ActivityEntry.java

[woodser]

Author: woodser
Date: Tue Jun 14 17:52:38 2011
New Revision: 1135719

URL: http://svn.apache.org/viewvc?rev=1135719&view=rev
Log:
Small change to Activity Stream data model; icon was changed from String to 
MediaLink per the spec.

Modified:
    
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
    
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java

Modified: 
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java?rev=1135719&r1=1135718&r2=1135719&view=diff
==============================================================================
--- 
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
 (original)
+++ 
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
 Tue Jun 14 17:52:38 2011
@@ -22,6 +22,7 @@ import org.apache.shindig.protocol.model
 import org.apache.shindig.protocol.model.ExtendableBeanImpl;
 import org.apache.shindig.social.opensocial.model.ActivityEntry;
 import org.apache.shindig.social.opensocial.model.ActivityObject;
+import org.apache.shindig.social.opensocial.model.MediaLink;
 
 /**
  * A simple bean implementation of an ActivityStream Entry.
@@ -32,7 +33,7 @@ public class ActivityEntryImpl extends E
   private ActivityObject actor;
   private String content;
   private ActivityObject generator;
-  private String icon;
+  private MediaLink icon;
   private String id;
   private ActivityObject object;
   private String published;
@@ -80,12 +81,12 @@ public class ActivityEntryImpl extends E
   }
 
   /** {@inheritDoc} */
-  public String getIcon() {
+  public MediaLink getIcon() {
     return icon;
   }
 
   /** {@inheritDoc} */
-  public void setIcon(String icon) {
+  public void setIcon(MediaLink icon) {
     this.icon = icon;
   }
 

Modified: 
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java?rev=1135719&r1=1135718&r2=1135719&view=diff
==============================================================================
--- 
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
 (original)
+++ 
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
 Tue Jun 14 17:52:38 2011
@@ -118,16 +118,16 @@ public interface ActivityEntry extends C
   /**
    * <p>getIcon</p>
    *
-   * @return a {@link java.lang.String} object.
+   * @return a {@link org.apache.shindig.extras.as.opensocial.model.MediaLink} 
object.
    */
-  String getIcon();
+  MediaLink getIcon();
 
   /**
    * <p>setIcon</p>
    *
-   * @param icon a {@link java.lang.String} object.
+   * @param icon a {@link 
org.apache.shindig.extras.as.opensocial.model.MediaLink} object.
    */
-  void setIcon(String icon);
+  void setIcon(MediaLink icon);
   
   /**
    * <p>getId</p>