[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/actions ...

[Julien Viet]

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

  Modified:    core/src/main/org/jboss/portal/core/portlet/management/actions 
                        PreferenceAction.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.13      +17 -19    jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PreferenceAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- PreferenceAction.java	23 Jun 2006 22:56:23 -0000	1.12
  +++ PreferenceAction.java	22 Aug 2006 14:08:53 -0000	1.13
  @@ -21,18 +21,16 @@
   */
   package org.jboss.portal.core.portlet.management.actions;
   
  -import org.jboss.portal.common.value.SimpleValueMap;
  +import org.jboss.portal.portlet.state.SimplePropertyMap;
   import org.jboss.portal.common.value.StringValue;
   import org.jboss.portal.common.value.Value;
  -import org.jboss.portal.common.value.ValueMap;
  +import org.jboss.portal.portlet.state.PropertyMap;
   import org.jboss.portal.core.model.instance.Instance;
   import org.jboss.portal.core.portlet.management.InstanceManagerBean;
   import org.jboss.portal.faces.matrix.AbstractCellAction;
   import org.jboss.portal.faces.matrix.Cell;
   import org.jboss.portal.faces.matrix.Row;
   import org.jboss.portal.faces.matrix.RowSetModel;
  -import org.jboss.portal.portlet.InvokerUnavailableException;
  -import org.jboss.portal.portlet.NoSuchPortletException;
   import org.jboss.portal.portlet.PortletInvokerException;
   
   import java.util.ArrayList;
  @@ -41,7 +39,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    */
   public class PreferenceAction extends AbstractCellAction
   {
  @@ -69,16 +67,16 @@
   
            //
            Instance instance = manager.getSelectedInstance();
  -         ValueMap prefs = instance.getPreferences();
  -         ValueMap newPrefs = new SimpleValueMap(prefs);
  +         PropertyMap prefs = instance.getPreferences();
  +         PropertyMap newPrefs = new SimplePropertyMap(prefs);
   
  -         Value value = newPrefs.getValue(key);
  +         Value value = newPrefs.getProperty(key);
            String[] strings = value.asStringArray();
            String[] strings2 = new String[strings.length + 1];
            System.arraycopy(strings, 0, strings2, 0, strings.length);
            strings2[strings.length] = appendedValue;
            Value value2 = new StringValue(strings2);
  -         newPrefs.setValue(key, value2);
  +         newPrefs.setProperty(key, value2);
   
            //
            instance.setPreferences(newPrefs);
  @@ -98,17 +96,17 @@
   
            //
            Instance instance = manager.getSelectedInstance();
  -         ValueMap prefs = instance.getPreferences();
  -         ValueMap newPrefs = new SimpleValueMap(prefs);
  +         PropertyMap prefs = instance.getPreferences();
  +         PropertyMap newPrefs = new SimplePropertyMap(prefs);
   
            //
  -         Value value = newPrefs.getValue(key);
  +         Value value = newPrefs.getProperty(key);
            String[] strings = value.asStringArray();
            List list = new ArrayList(Arrays.asList(strings));
            list.remove(index);
            String[] strings2 = (String[])list.toArray(new String[list.size()]);
            Value value2 = new StringValue(strings2);
  -         prefs.setValue(key, value2);
  +         prefs.setProperty(key, value2);
   
            //
            instance.setPreferences(newPrefs);
  @@ -132,9 +130,9 @@
   
            //
            Instance instance = manager.getSelectedInstance();
  -         ValueMap prefs = instance.getPreferences();
  -         ValueMap newPrefs = new SimpleValueMap(prefs);
  -         newPrefs.setValue(key, value);
  +         PropertyMap prefs = instance.getPreferences();
  +         PropertyMap newPrefs = new SimplePropertyMap(prefs);
  +         newPrefs.setProperty(key, value);
   
            //
            instance.setPreferences(newPrefs);
  @@ -160,12 +158,12 @@
         {
            //
            Instance instance = manager.getSelectedInstance();
  -         ValueMap prefs = instance.getPreferences();
  -         ValueMap newPrefs = new SimpleValueMap(prefs);
  +         PropertyMap prefs = instance.getPreferences();
  +         PropertyMap newPrefs = new SimplePropertyMap(prefs);
   
            //
            String key = row.getHandback();
  -         newPrefs.setValue(key, null);
  +         newPrefs.setProperty(key, null);
   
            //
            instance.setPreferences(newPrefs);