[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/actions ...
Julien Viet
julien at jboss.com
Wed Aug 23 08:55:00 EDT 2006
User: julien
Date: 06/08/23 08:55:00
Modified: core/src/main/org/jboss/portal/core/portlet/management/actions
PreferenceAction.java
Log:
updated implementation of PortletInvoker.setProperties(...) to use a list of property changes instead of a PropertyMap in order to match WSRP semantics
Revision Changes Path
1.15 +12 -15 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- PreferenceAction.java 22 Aug 2006 14:51:47 -0000 1.14
+++ PreferenceAction.java 23 Aug 2006 12:55:00 -0000 1.15
@@ -25,6 +25,7 @@
import org.jboss.portal.common.value.StringValue;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.portlet.management.InstanceManagerBean;
import org.jboss.portal.faces.matrix.AbstractCellAction;
@@ -39,7 +40,7 @@
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class PreferenceAction extends AbstractCellAction
{
@@ -68,18 +69,17 @@
//
Instance instance = manager.getSelectedInstance();
PropertyMap prefs = instance.getProperties();
- PropertyMap newPrefs = new SimplePropertyMap(prefs);
- Value value = newPrefs.getProperty(key);
+ Value value = prefs.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.setProperty(key, value2);
//
- instance.setProperties(newPrefs);
+ PropertyChange change = PropertyChange.newUpdate(key, value2);
+ instance.setProperties(new PropertyChange[]{change});
}
catch (PortletInvokerException e)
{
@@ -97,19 +97,18 @@
//
Instance instance = manager.getSelectedInstance();
PropertyMap prefs = instance.getProperties();
- PropertyMap newPrefs = new SimplePropertyMap(prefs);
//
- Value value = newPrefs.getProperty(key);
+ Value value = prefs.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.setProperty(key, value2);
//
- instance.setProperties(newPrefs);
+ PropertyChange change = PropertyChange.newUpdate(key, value2);
+ instance.setProperties(new PropertyChange[]{change});
}
catch (PortletInvokerException e)
{
@@ -130,12 +129,10 @@
//
Instance instance = manager.getSelectedInstance();
- PropertyMap prefs = instance.getProperties();
- PropertyMap newPrefs = new SimplePropertyMap(prefs);
- newPrefs.setProperty(key, value);
//
- instance.setProperties(newPrefs);
+ PropertyChange change = PropertyChange.newUpdate(key, value);
+ instance.setProperties(new PropertyChange[]{change});
// Unselect the current row has we consider that the update work is done
manager.setSelectedRow(null);
@@ -163,10 +160,10 @@
//
String key = row.getHandback();
- newPrefs.setProperty(key, null);
//
- instance.setProperties(newPrefs);
+ PropertyChange change = PropertyChange.newReset(key);
+ instance.setProperties(new PropertyChange[]{change});
}
catch (PortletInvokerException e)
{
More information about the jboss-cvs-commits
mailing list