Author: scottbw
Date: Fri Apr 15 13:56:53 2011
New Revision: 1092707
URL: http://svn.apache.org/viewvc?rev=1092707&view=rev
Log:
Removed the "convenience" methods for getting shared data from the Widget and
WidgetInstance beans and replaced with accessing the SharedDataHelper facade -
this is mainly to make sure all access to shared data uses the same method so
we can simplify the data model more easily, but also as it cuts out a fair
amount of boilerplate code that has to be implemented across both the JPA and
JCR persistence frameworks.
Modified:
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java
incubator/wookie/trunk/src/org/apache/wookie/feature/wave/WaveAPIImpl.java
Modified:
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java?rev=1092707&r1=1092706&r2=1092707&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
Fri Apr 15 13:56:53 2011
@@ -35,6 +35,7 @@ import org.apache.wookie.beans.util.Pers
import org.apache.wookie.controller.PropertiesController;
import org.apache.wookie.controller.WidgetInstancesController;
import org.apache.wookie.helpers.Notifier;
+import org.apache.wookie.helpers.SharedDataHelper;
import org.apache.wookie.queues.QueueManager;
import org.apache.wookie.server.ContextListener;
import org.apache.wookie.server.LocaleHandler;
@@ -172,7 +173,7 @@ public class WidgetAPIImpl implements IW
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
IWidgetInstance widgetInstance =
persistenceManager.findWidgetInstanceByIdKey(id_key);
if (widgetInstance == null) return
localizedMessages.getString("WidgetAPIImpl.0");
- ISharedData data = widgetInstance.getSharedData(key);
+ ISharedData data =
SharedDataHelper.findSharedData(widgetInstance, key);
if (data == null) return
localizedMessages.getString("WidgetAPIImpl.1");
return data.getDvalue();
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java?rev=1092707&r1=1092706&r2=1092707&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java Fri
Apr 15 13:56:53 2011
@@ -16,7 +16,6 @@ package org.apache.wookie.beans;
import java.util.Collection;
-import org.apache.wookie.helpers.SharedDataHelper;
import org.apache.wookie.w3c.ILocalizedElement;
/**
@@ -218,21 +217,6 @@ public interface IWidgetInstance extends
void setTokens(Collection<IToken> tokens);
/**
- * Get shared data for widget instance.
- *
- * @return shared data
- */
- ISharedData [] getSharedData();
-
- /**
- * Get shared data with name for widget instance.
- *
- * @param name shared data name
- * @return shared data
- */
- ISharedData getSharedData(String name);
-
- /**
* Get preference with specified key for widget instance.
*
* @param key shared data key
@@ -245,28 +229,6 @@ public interface IWidgetInstance extends
*/
public static class Utilities
{
- /**
- * Get shared data for widget instance.
- *
- * @param widgetInstance widget instance
- * @return shared data array
- */
- public static ISharedData [] getSharedData(IWidgetInstance
widgetInstance)
- {
- return SharedDataHelper.findSharedData(widgetInstance);
- }
-
- /**
- * Get shared data with name for widget instance.
- *
- * @param widgetInstance widget instance
- * @param name shared data name
- * @return shared data or null
- */
- public static ISharedData getSharedData(IWidgetInstance
widgetInstance, String name)
- {
- return SharedDataHelper.findSharedData(widgetInstance, name);
- }
/**
* Get preference with specified key for widget instance.
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java?rev=1092707&r1=1092706&r2=1092707&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
Fri Apr 15 13:56:53 2011
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.ocm.mapper.
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
import org.apache.wookie.beans.IPreference;
-import org.apache.wookie.beans.ISharedData;
import org.apache.wookie.beans.IToken;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetInstance;
@@ -467,19 +466,4 @@ public class WidgetInstanceImpl implemen
return Utilities.getPreference(this, key);
}
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidgetInstance#getSharedData()
- */
- public ISharedData [] getSharedData()
- {
- return Utilities.getSharedData(this);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.beans.IWidgetInstance#getSharedData(java.lang.String)
- */
- public ISharedData getSharedData(String name)
- {
- return Utilities.getSharedData(this, name);
- }
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java?rev=1092707&r1=1092706&r2=1092707&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
Fri Apr 15 13:56:53 2011
@@ -38,7 +38,6 @@ import org.apache.openjpa.persistence.Ex
import org.apache.openjpa.persistence.Type;
import org.apache.wookie.beans.IPreference;
-import org.apache.wookie.beans.ISharedData;
import org.apache.wookie.beans.IToken;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetInstance;
@@ -393,19 +392,4 @@ public class WidgetInstanceImpl implemen
return Utilities.getPreference(this, key);
}
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidgetInstance#getSharedData()
- */
- public ISharedData [] getSharedData()
- {
- return Utilities.getSharedData(this);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.beans.IWidgetInstance#getSharedData(java.lang.String)
- */
- public ISharedData getSharedData(String name)
- {
- return Utilities.getSharedData(this, name);
- }
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java?rev=1092707&r1=1092706&r2=1092707&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java
Fri Apr 15 13:56:53 2011
@@ -92,7 +92,7 @@ public class PropertiesController extend
// We let the shared data values override.
IPreference pref = instance.getPreference(name);
if (pref != null) value = pref.getDvalue();
- ISharedData data = instance.getSharedData(name);
+ ISharedData data = SharedDataHelper.findSharedData(instance,
name);
if (data != null) value = data.getDvalue();
if (value == null) throw new ResourceNotFoundException();
PrintWriter out = response.getWriter();
Modified:
incubator/wookie/trunk/src/org/apache/wookie/feature/wave/WaveAPIImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/feature/wave/WaveAPIImpl.java?rev=1092707&r1=1092706&r2=1092707&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/feature/wave/WaveAPIImpl.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/feature/wave/WaveAPIImpl.java
Fri Apr 15 13:56:53 2011
@@ -29,6 +29,7 @@ import org.apache.wookie.controller.Prop
import org.apache.wookie.feature.IFeature;
import org.apache.wookie.helpers.Notifier;
import org.apache.wookie.helpers.ParticipantHelper;
+import org.apache.wookie.helpers.SharedDataHelper;
import org.apache.wookie.server.LocaleHandler;
import org.directwebremoting.WebContextFactory;
@@ -79,7 +80,7 @@ public class WaveAPIImpl implements IFea
return state;
}
//
- for(ISharedData data : widgetInstance.getSharedData()){
+ for(ISharedData data :
SharedDataHelper.findSharedData(widgetInstance)){
state.put(data.getDkey(), data.getDvalue());
}
return state;
