[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/support/state ...

[Julien Viet]

  User: julien  
  Date: 06/08/22 10:08:54

  Modified:    portlet/src/main/org/jboss/portal/portlet/test/support/state  
                        StateStoreSupport.java StateSupport.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.2       +13 -13    jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateStoreSupport.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- StateStoreSupport.java	30 Jul 2006 12:36:24 -0000	1.1
  +++ StateStoreSupport.java	22 Aug 2006 14:08:54 -0000	1.2
  @@ -22,8 +22,8 @@
   package org.jboss.portal.portlet.test.support.state;
   
   import org.jboss.portal.common.system.AbstractJBossService;
  -import org.jboss.portal.common.value.SimpleValueMap;
  -import org.jboss.portal.common.value.ValueMap;
  +import org.jboss.portal.portlet.state.SimplePropertyMap;
  +import org.jboss.portal.portlet.state.PropertyMap;
   import org.jboss.portal.portlet.state.producer.StateStore;
   import org.jboss.portal.portlet.state.producer.State;
   import org.jboss.portal.portlet.state.producer.NoSuchStateException;
  @@ -34,7 +34,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class StateStoreSupport extends AbstractJBossService implements StateStore
   {
  @@ -67,45 +67,45 @@
         return state;
      }
   
  -   public synchronized String createState(String portletId, ValueMap valueMap)
  +   public synchronized String createState(String portletId, PropertyMap propertyMap)
      {
         if (portletId == null)
         {
            throw new IllegalArgumentException("No null portlet id accepted");
         }
  -      if (valueMap == null)
  +      if (propertyMap == null)
         {
            throw new IllegalArgumentException("No null value map accepted");
         }
  -      StateSupport state = new StateSupport(Integer.toString(counter++), portletId, new SimpleValueMap(valueMap));
  +      StateSupport state = new StateSupport(Integer.toString(counter++), portletId, new SimplePropertyMap(propertyMap));
         store.put(state.getId(), state);
         return state.getId();
      }
   
  -   public synchronized String cloneState(String stateId, ValueMap valueMap) throws NoSuchStateException, InvalidStateIdException
  +   public synchronized String cloneState(String stateId, PropertyMap propertyMap) throws NoSuchStateException, InvalidStateIdException
      {
  -      if (valueMap == null)
  +      if (propertyMap == null)
         {
            throw new IllegalArgumentException();
         }
         StateSupport state = (StateSupport)loadState(stateId);
  -      return createState(state.getPortletId(), valueMap);
  +      return createState(state.getPortletId(), propertyMap);
      }
   
      public String cloneState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
      {
         StateSupport state = (StateSupport)loadState(stateId);
  -      return createState(state.getPortletId(), new SimpleValueMap(state.getProperties()));
  +      return createState(state.getPortletId(), new SimplePropertyMap(state.getProperties()));
      }
   
  -   public synchronized void updateState(String stateId, ValueMap valueMap) throws NoSuchStateException, InvalidStateIdException
  +   public synchronized void updateState(String stateId, PropertyMap propertyMap) throws NoSuchStateException, InvalidStateIdException
      {
  -      if (valueMap == null)
  +      if (propertyMap == null)
         {
            throw new IllegalArgumentException("No null value map");
         }
         StateSupport state = (StateSupport)loadState(stateId);
  -      state.setValue(new SimpleValueMap(valueMap));
  +      state.setValue(new SimplePropertyMap(propertyMap));
      }
   
      public synchronized void destroyState(String stateId) throws InvalidStateIdException, NoSuchStateException
  
  
  
  1.2       +10 -10    jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateSupport.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateSupport.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateSupport.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- StateSupport.java	30 Jul 2006 12:36:24 -0000	1.1
  +++ StateSupport.java	22 Aug 2006 14:08:54 -0000	1.2
  @@ -22,14 +22,14 @@
   package org.jboss.portal.portlet.test.support.state;
   
   import org.jboss.portal.portlet.state.producer.State;
  -import org.jboss.portal.common.value.ValueMap;
  -import org.jboss.portal.common.value.SimpleValueMap;
  +import org.jboss.portal.portlet.state.PropertyMap;
  +import org.jboss.portal.portlet.state.SimplePropertyMap;
   
   import java.util.Date;
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class StateSupport implements State
   {
  @@ -41,16 +41,16 @@
      private String portletId;
   
      /** . */
  -   private ValueMap value;
  +   private PropertyMap property;
   
      /** . */
      private Date terminationTime;
   
  -   public StateSupport(String id, String portletId, ValueMap value)
  +   public StateSupport(String id, String portletId, PropertyMap property)
      {
         this.id = id;
         this.portletId = portletId;
  -      this.value = value;
  +      this.property = property;
         this.terminationTime = null;
      }
   
  @@ -58,7 +58,7 @@
      {
         this.id = id;
         this.portletId = that.portletId;
  -      this.value = new SimpleValueMap(that.value);
  +      this.property = new SimplePropertyMap(that.property);
         this.terminationTime = null;
      }
   
  @@ -77,14 +77,14 @@
         this.portletId = portletId;
      }
   
  -   public ValueMap getProperties()
  +   public PropertyMap getProperties()
      {
  -      return value;
  +      return property;
      }
   
  -   public void setValue(ValueMap value)
  +   public void setValue(PropertyMap property)
      {
  -      this.value = value;
  +      this.property = property;
      }
   
      public Date getTerminationTime()