[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/impl/portlet/state ...
Julien Viet
julien at jboss.com
Tue Aug 22 10:08:52 EDT 2006
User: julien
Date: 06/08/22 10:08:52
Modified: core/src/main/org/jboss/portal/core/impl/portlet/state
PersistentState.java PersistentStateStore.java
Log:
- refactored the ValueMap to PropertyMap and moved it in org.jboss.portal.portlet.state package
- introduced TypedMap that is super type of ParameterMap and is reused for the PropertyMap
Revision Changes Path
1.9 +16 -20 jboss-portal/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PersistentState.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PersistentState.java 30 Jul 2006 12:36:21 -0000 1.8
+++ PersistentState.java 22 Aug 2006 14:08:52 -0000 1.9
@@ -22,7 +22,8 @@
package org.jboss.portal.core.impl.portlet.state;
import org.jboss.portal.portlet.state.producer.State;
-import org.jboss.portal.common.value.ValueMap;
+import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.state.AbstractPropertyMap;
import org.jboss.portal.common.value.Value;
import java.util.Map;
@@ -35,7 +36,7 @@
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class PersistentState implements State
{
@@ -76,7 +77,7 @@
this.parent = null;
}
- public PersistentState(String portletId, ValueMap valueMap)
+ public PersistentState(String portletId, PropertyMap propertyMap)
{
this.key = null;
this.portletId = portletId;
@@ -88,10 +89,10 @@
this.parent = null;
//
- for (Iterator i = valueMap.getKeys().iterator(); i.hasNext();)
+ for (Iterator i = propertyMap.keySet().iterator(); i.hasNext();)
{
String key = (String)i.next();
- Value value = valueMap.getValue(key);
+ Value value = propertyMap.getProperty(key);
entries.put(key, new PersistentStateEntry(key, value));
}
}
@@ -131,30 +132,25 @@
this.entries = entries;
}
- public ValueMap getProperties()
+ public PropertyMap getProperties()
{
- return new ValueMap()
+ PropertyMap props = new AbstractPropertyMap()
{
- public Set getKeys()
+ protected Map getDelegate()
{
- return entries.keySet();
+ return entries;
}
- public Value getValue(String key) throws IllegalArgumentException
- {
- PersistentStateEntry entry = (PersistentStateEntry)entries.get(key);
- if (entry == null)
+ protected Object getInternalValue(Object value)
{
- return null;
+ throw new IllegalArgumentException("Immutable");
}
- else
+ protected Object getExternalValue(Object value)
{
+ PersistentStateEntry entry = (PersistentStateEntry)value;
return entry.getValue();
}
- }
- public void setValue(String key, Value value) throws IllegalArgumentException, UnsupportedOperationException
- {
- }
};
+ return props;
}
public Date getCreationTime()
1.8 +13 -13 jboss-portal/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PersistentStateStore.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PersistentStateStore.java 30 Jul 2006 12:36:21 -0000 1.7
+++ PersistentStateStore.java 22 Aug 2006 14:08:52 -0000 1.8
@@ -25,9 +25,9 @@
import org.jboss.portal.portlet.state.producer.State;
import org.jboss.portal.portlet.state.producer.NoSuchStateException;
import org.jboss.portal.portlet.state.producer.InvalidStateIdException;
-import org.jboss.portal.common.value.ValueMap;
+import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.common.value.Value;
-import org.jboss.portal.common.value.SimpleValueMap;
+import org.jboss.portal.portlet.state.SimplePropertyMap;
import org.jboss.portal.common.system.AbstractJBossService;
import org.hibernate.SessionFactory;
import org.hibernate.Session;
@@ -38,7 +38,7 @@
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class PersistentStateStore extends AbstractJBossService implements StateStore
{
@@ -73,13 +73,13 @@
return lookup(session, id);
}
- public String createState(String portletId, ValueMap valueMap)
+ public String createState(String portletId, PropertyMap propertyMap)
{
if(portletId == null)
{
throw new IllegalArgumentException("id cannot be null");
}
- if (valueMap == null)
+ if (propertyMap == null)
{
throw new IllegalArgumentException("No null value map accepted");
}
@@ -88,7 +88,7 @@
Session session = getCurrentSession();
// Create the persistent state
- PersistentState state = new PersistentState(portletId, valueMap);
+ PersistentState state = new PersistentState(portletId, propertyMap);
session.save(state);
session.flush();
@@ -96,13 +96,13 @@
return state.getId();
}
- public String cloneState(String stateId, ValueMap valueMap) throws InvalidStateIdException, NoSuchStateException
+ public String cloneState(String stateId, PropertyMap propertyMap) throws InvalidStateIdException, NoSuchStateException
{
if(stateId == null)
{
throw new IllegalArgumentException("id cannot be null");
}
- if (valueMap == null)
+ if (propertyMap == null)
{
throw new IllegalArgumentException("value map cannot be null");
}
@@ -114,7 +114,7 @@
PersistentState parentState = (PersistentState)loadState(stateId);
// Create the persistent state
- PersistentState state = new PersistentState(parentState.getPortletId(), valueMap);
+ PersistentState state = new PersistentState(parentState.getPortletId(), propertyMap);
session.persist(state);
// Make the association
@@ -144,7 +144,7 @@
//
// Create the persistent state
- PersistentState state = new PersistentState(parentState.getPortletId(), new SimpleValueMap(parentState.getProperties()));
+ PersistentState state = new PersistentState(parentState.getPortletId(), new SimplePropertyMap(parentState.getProperties()));
session.persist(state);
// Make the association
@@ -159,7 +159,7 @@
return state.getId();
}
- public void updateState(String stateId, ValueMap valueMap) throws InvalidStateIdException, NoSuchStateException
+ public void updateState(String stateId, PropertyMap propertyMap) throws InvalidStateIdException, NoSuchStateException
{
Session session = getCurrentSession();
@@ -168,10 +168,10 @@
//
state.entries.clear();
- for (Iterator i = valueMap.getKeys().iterator(); i.hasNext();)
+ for (Iterator i = propertyMap.keySet().iterator(); i.hasNext();)
{
String key = (String)i.next();
- Value value = valueMap.getValue(key);
+ Value value = propertyMap.getProperty(key);
PersistentStateEntry entry = new PersistentStateEntry(key, value);
state.entries.put(key, entry);
}
More information about the jboss-cvs-commits
mailing list