You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/03/20 13:13:44 UTC
svn commit: r1458782 -
/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java
Author: mfranklin
Date: Wed Mar 20 12:13:44 2013
New Revision: 1458782
URL: http://svn.apache.org/r1458782
Log:
Adding remaining changes for RAVE-915
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java?rev=1458782&r1=1458781&r2=1458782&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java Wed Mar 20 12:13:44 2013
@@ -20,9 +20,14 @@
package org.apache.rave.util;
import com.google.common.collect.Lists;
+import org.apache.rave.portal.model.ActivityStreamsEntry;
import org.apache.rave.portal.model.ActivityStreamsItem;
+import org.apache.rave.portal.model.ActivityStreamsMediaLink;
+import org.apache.rave.portal.model.ActivityStreamsObject;
+import org.apache.rave.portal.model.impl.ActivityStreamsEntryImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsMediaLinkImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsObjectImpl;
+import org.apache.rave.portal.util.ModelUtil;
import org.apache.shindig.protocol.model.ExtendableBean;
import org.apache.shindig.protocol.model.ExtendableBeanImpl;
import org.apache.shindig.social.core.model.ActivityEntryImpl;
@@ -31,16 +36,11 @@ import org.apache.shindig.social.core.mo
import org.apache.shindig.social.opensocial.model.ActivityEntry;
import org.apache.shindig.social.opensocial.model.ActivityObject;
import org.apache.shindig.social.opensocial.model.MediaLink;
-import org.apache.rave.portal.model.impl.ActivityStreamsEntryImpl;
-import org.apache.rave.portal.model.ActivityStreamsEntry;
-import org.apache.rave.portal.model.ActivityStreamsObject;
-import org.apache.rave.portal.model.ActivityStreamsMediaLink;
-import org.apache.rave.portal.util.ModelUtil;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import static org.apache.rave.portal.util.ModelUtil.dateToString;
@@ -196,14 +196,14 @@ public class ActivityConversionUtil {
return entity;
}
- public HashMap convert (ExtendableBean bean) {
+ public Map convert (ExtendableBean bean) {
if(bean == null) return null;
- HashMap entity = new HashMap();
+ Map entity = new HashMap();
entity.putAll(bean);
return entity;
}
- public ExtendableBean convert(HashMap map){
+ public ExtendableBean convert(Map map){
if(map == null) return null;
ExtendableBean bean = new ExtendableBeanImpl();
bean.putAll(map);