svn commit: r1342836 - in /shindig/trunk: content/samplecontainer/examples/ActivityStreams/ java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/

[hs...@apache.org]

Author: hsaputra
Date: Fri May 25 22:51:54 2012
New Revision: 1342836

URL: http://svn.apache.org/viewvc?rev=1342836&view=rev
Log:
Fix the error stack because of typo @friend instead of @friends group id. Cleanup javadoc.

Modified:
    shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java

Modified: shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js?rev=1342836&r1=1342835&r2=1342836&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js (original)
+++ shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js Fri May 25 22:51:54 2012
@@ -49,7 +49,7 @@ function OpenSocialWrapper() {
 		var batch = osapi.newBatch();
 		batch.add('viewerActivities', osapi.activities.get({userId: '@viewer', groupId: '@self'}));
 		batch.add('ownerActivities', osapi.activities.get({userId: '@owner', groupId: '@self'}));
-		batch.add('friendActivities', osapi.activities.get({userId: '@viewer', groupId: '@friend'}));
+		batch.add('friendActivities', osapi.activities.get({userId: '@viewer', groupId: '@friends'}));
 		batch.execute(callback);
 	}
 

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java?rev=1342836&r1=1342835&r2=1342836&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java Fri May 25 22:51:54 2012
@@ -23,7 +23,7 @@ import com.google.common.base.Objects;
 
 /**
  * GroupId as defined by the OpenSocial 2.0.1 Spec
- * @see http://opensocial-resources.googlecode.com/svn/spec/2.0.1/Social-Data.xml#Group-Id
+ * @see "http://opensocial-resources.googlecode.com/svn/spec/2.0.1/Social-Data.xml#Group-Id"
  */
 public class GroupId {
 

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java?rev=1342836&r1=1342835&r2=1342836&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ObjectId.java Fri May 25 22:51:54 2012
@@ -23,7 +23,7 @@ import com.google.common.base.Objects;
 
 /**
  * ObjectId as defined by the OpenSocial 2.0.1 Spec
- * @see http://opensocial-resources.googlecode.com/svn/spec/2.0.1/Core-Data.xml#Object-Id
+ * @see "http://opensocial-resources.googlecode.com/svn/spec/2.0.1/Core-Data.xml#Object-Id"
  */
 public class ObjectId {
 
@@ -33,7 +33,7 @@ public class ObjectId {
    * This constructor allows for a LocalId to be passed in order
    * to create an ObjectId.
    *
-   * @param LocalId the localId used to create the ObjectId
+   * @param localId the localId used to create the ObjectId
    */
   public ObjectId(LocalId localId) {
     this.objectId = localId;
@@ -43,7 +43,7 @@ public class ObjectId {
    * This constructor allows for a GlobalId to be passed in order
    * to create an ObjectId.
    *
-   * @param GlobalId the globalId used to create the ObjectId
+   * @param globalId the globalId used to create the ObjectId
    */
   public ObjectId(GlobalId globalId) {
     this.objectId = globalId;
@@ -54,7 +54,7 @@ public class ObjectId {
    * to create an ObjectId. It will store it as a LocalId and
    * verify it as such.
    *
-   * @param String The id of the new LocalId that will be created
+   * @param id The id of the new LocalId that will be created
    * @throws IllegalArgumentException when the id provided could not be parsed
    *   into either a GlobalId or a LocalId
    */
@@ -67,7 +67,7 @@ public class ObjectId {
         this.objectId = new LocalId(id);
       } catch(IllegalArgumentException e2) {
         // Not either so throw exception
-	    throw new IllegalArgumentException("The provided ObjectId is not valid");
+	      throw new IllegalArgumentException("The provided ObjectId is not valid");
       }
 	}
   }