Introduced multi-value support in the client

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/webclient.properties

@@ -1,13 +1,13 @@
 # I18N message properties
 
 # Date Pattern
-date_pattern=MMMM, d yyyy
+date_pattern=d MMMM yyyy
-date_time_pattern=MMMM, d yyyy HH:mm
+date_time_pattern=d MMMM yyyy HH:mm
 time_pattern=HH:mm
 
 # General UI
 product_name=Alfresco
-view_description=This view allows you to browse the items in your space.
+view_description=This view allows you to browse the items in this space.
 search_description=This view allows you to see the results from your search.
 checkinfile_description=Check in your working copy for other team members to work with.
 checkoutfilelink_description=Edit the checked out file, undo the check out or carry on working.

source/java/org/alfresco/web/bean/MultiValueEditorBean.java

@@ -0,0 +1,23 @@
+package org.alfresco.web.bean;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Helper bean used to temporarily store the last item added in a multi
+ * value editor component.
+ * 
+ * A Map is used so that multiple components on the same page can use the
+ * same backing bean.
+ * 
+ * @author gavinc
+ */
+public class MultiValueEditorBean
+{
+   private Map<String, Object> lastItemsAdded = new HashMap<String, Object>(10);
+   
+   public Map<String, Object> getLastItemsAdded()
+   {
+      return lastItemsAdded;
+   }
+}

source/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java

@@ -5,6 +5,7 @@ import javax.faces.component.UIComponent;
 import javax.faces.component.UIOutput;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
+import javax.faces.el.ValueBinding;
 
 import org.alfresco.service.cmr.dictionary.AssociationDefinition;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -13,9 +14,8 @@ import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.repository.DataDictionary;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.ui.common.ComponentConstants;
+import org.alfresco.web.ui.repo.RepoConstants;
 import org.alfresco.web.ui.repo.component.property.PropertySheetItem;
-import org.alfresco.web.ui.repo.component.property.UIAssociation;
-import org.alfresco.web.ui.repo.component.property.UIChildAssociation;
 import org.alfresco.web.ui.repo.component.property.UIProperty;
 import org.alfresco.web.ui.repo.component.property.UIPropertySheet;
 import org.apache.commons.logging.Log;
@@ -55,35 +55,57 @@ public abstract class BaseComponentGenerator implements IComponentGenerator
    }
    
    /**
-    * Disables the given component if the item is read only or is defined in the 
+    * Creates a wrapper component around the given component to enable the user
-    * model as protected
+    * to edit multiple values.
     * 
     * @param context FacesContext
     * @param propertySheet The property sheet being generated
     * @param item The item being generated
-    * @param component The component to disable
+    * @param component The component to wrap if necessary
+    * @param field true if the property being enabled is a field style 
+    *        component i.e. text field or checkbox. false if the component
+    *        is a selector style component i.e. category selector
     */
-   protected void disableIfReadOnlyOrProtected(FacesContext context, UIPropertySheet propertySheet, 
+   protected UIComponent enableForMultiValue(FacesContext context, UIPropertySheet propertySheet,
-         PropertySheetItem item, UIComponent component)
+         PropertySheetItem item, UIComponent component, boolean field)
    {
+      UIComponent multiValueComponent = component;
+      
+      // NOTE: Associations have built in support for multiple values so we only deal
+      //       with UIProperty instances in here currently
+      
       if (item instanceof UIProperty)
       {
-         PropertyDefinition propertyDef = getPropertyDefinition(context,
+         // if the property is multi-valued create a multi value editor wrapper component
-               propertySheet.getNode(), item.getName());
+         String id = "multi_" + item.getName();
-         if (item.isReadOnly() || (propertyDef != null && propertyDef.isProtected()))
+         multiValueComponent = context.getApplication().createComponent(
+               RepoConstants.ALFRESCO_FACES_MULTIVALUE_EDITOR);
+         FacesHelper.setupComponentId(context, multiValueComponent, id);
+            
+         // set the renderer depending on whether the item is a 'field' or a 'selector'
+         if (field)
          {
-            component.getAttributes().put("disabled", Boolean.TRUE);
+            multiValueComponent.setRendererType(RepoConstants.ALFRESCO_FACES_FIELD_RENDERER);
          }
-      }
+         else
-      else if (item instanceof UIAssociation || item instanceof UIChildAssociation)
          {
-         AssociationDefinition assocDef = getAssociationDefinition(context, 
+            multiValueComponent.setRendererType(RepoConstants.ALFRESCO_FACES_SELECTOR_RENDERER);
-               propertySheet.getNode(), item.getName());
+            
-         if (item.isReadOnly() || (assocDef != null && assocDef.isProtected()))
+            // set the value binding for the wrapped component and the lastItemAdded attribute of
-         {
+            // the multi select component, needs to point somewhere that can hold any object, it
-            component.getAttributes().put("disabled", Boolean.TRUE);
+            // will store the item last added by the user.
+            String expr = "#{MultiValueEditorBean.lastItemsAdded['" +
+                  item.getName() + "']}";
+            ValueBinding vb = context.getApplication().createValueBinding(expr);
+            multiValueComponent.setValueBinding("lastItemAdded", vb);
+            component.setValueBinding("value", vb);
          }
+         
+         // add the original component as a child of the wrapper
+         multiValueComponent.getChildren().add(component);
       }
+      
+      return multiValueComponent;
    }
    
    /**

source/java/org/alfresco/web/bean/generator/CategoryPickerGenerator.java

@@ -3,6 +3,7 @@ package org.alfresco.web.bean.generator;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.ui.repo.RepoConstants;
 import org.alfresco.web.ui.repo.component.UICategorySelector;
@@ -29,10 +30,25 @@ public class CategoryPickerGenerator extends BaseComponentGenerator
          PropertySheetItem item)
    {
       // create the standard component
-      UICategorySelector component = (UICategorySelector)generate(context, item.getName());
+      UIComponent component = generate(context, item.getName());
       
-      // make sure the property is not read only or protected
+      // get the property definition
-      disableIfReadOnlyOrProtected(context, propertySheet, item, component);
+      PropertyDefinition propertyDef = getPropertyDefinition(context,
+               propertySheet.getNode(), item.getName());
+      
+      if (propertySheet.inEditMode() && propertyDef != null && propertyDef.isMultiValued())
+      {
+         // if the item is multi valued we need to wrap the standard component
+         // but only when the property sheet is in edit mode
+         component = enableForMultiValue(context, propertySheet, item, component, false);
+      }
+      else if (propertySheet.inEditMode() == false || item.isReadOnly() || 
+              (propertyDef != null && propertyDef.isProtected())) 
+      {
+         // disable the component if it is read only or protected
+         // or if the property sheet is in view mode
+         component.getAttributes().put("disabled", Boolean.TRUE);
+      }
       
       // setup the converter if one was specified
       setupConverter(context, propertySheet, item, component);

source/java/org/alfresco/web/bean/generator/CheckboxGenerator.java

@@ -1,11 +1,17 @@
 package org.alfresco.web.bean.generator;
 
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIOutput;
 import javax.faces.component.UISelectBoolean;
 import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
 
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.ui.common.ComponentConstants;
+import org.alfresco.web.ui.common.converter.XMLDateConverter;
+import org.alfresco.web.ui.repo.RepoConstants;
 import org.alfresco.web.ui.repo.component.property.PropertySheetItem;
 import org.alfresco.web.ui.repo.component.property.UIPropertySheet;
 
@@ -31,18 +37,48 @@ public class CheckboxGenerator extends BaseComponentGenerator
    {
       UIComponent component = null;
       
+      // get the property definition
+      PropertyDefinition propertyDef = getPropertyDefinition(context,
+            propertySheet.getNode(), item.getName());
+         
       if (propertySheet.inEditMode())
       {
          // use the standard component in edit mode
          component = generate(context, item.getName());
          
-         // make sure the property is not read only or protected
+         // disable the component if it is read only or protected
-         disableIfReadOnlyOrProtected(context, propertySheet, item, component);
+         if (item.isReadOnly() || (propertyDef != null && propertyDef.isProtected()))
+         {
+            component.getAttributes().put("disabled", Boolean.TRUE);
+         }
+         else
+         {
+            // if the item is multi valued we need to wrap the standard component
+            if (propertyDef != null && propertyDef.isMultiValued())
+            {
+               component = enableForMultiValue(context, propertySheet, item, component, true);
+            }
+         }
       }
       else
       {
          // create an output text component in view mode
          component = createOutputTextComponent(context, item.getName());
+         
+         // if there is no overridden converter add a default
+         if (item.getConverter() == null)
+         {
+            if (propertyDef != null && propertyDef.isMultiValued())
+            {
+               // add multi-value converter if property is such
+               item.setConverter(RepoConstants.ALFRESCO_FACES_MULTIVALUE_CONVERTER);
+            }
+            else
+            {
+               // add the default boolean label converter
+               item.setConverter(RepoConstants.ALFRESCO_FACES_BOOLEAN_CONVERTER);
+            }
+         }
       }
       
       // setup the converter if one was specified

source/java/org/alfresco/web/bean/generator/DatePickerGenerator.java

@@ -6,6 +6,7 @@ import javax.faces.component.UIOutput;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.ui.common.ComponentConstants;
@@ -45,8 +46,23 @@ public class DatePickerGenerator extends BaseComponentGenerator
          // use the standard date picker component
          component = generate(context, item.getName());
          
-         // make sure the property is not read only or protected
+         // get the property definition
-         disableIfReadOnlyOrProtected(context, propertySheet, item, component);
+         PropertyDefinition propertyDef = getPropertyDefinition(context,
+               propertySheet.getNode(), item.getName());
+         
+         // disable the component if it is read only or protected
+         if (item.isReadOnly() || (propertyDef != null && propertyDef.isProtected()))
+         {
+            component.getAttributes().put("disabled", Boolean.TRUE);
+         }
+         else
+         {
+            // if the item is multi valued we need to wrap the standard component
+            if (propertyDef != null && propertyDef.isMultiValued())
+            {
+               component = enableForMultiValue(context, propertySheet, item, component, true);
+            }
+         }
       }
       else
       {
@@ -54,31 +70,31 @@ public class DatePickerGenerator extends BaseComponentGenerator
          component = createOutputTextComponent(context, item.getName());
       }
       
+      if (item.getConverter() != null)
+      {
          // setup the converter if one was specified
          setupConverter(context, propertySheet, item, component);
+      }
+      else
+      {
+         // use the default converter for the date component
+         // we can cast this as we know it is an UIOutput type
+         ((UIOutput)component).setConverter(getDefaultConverter(context));
+      }
       
       return component;
    }
 
-   @Override
+   /**
-   protected void setupConverter(FacesContext context, UIPropertySheet propertySheet, 
+    * Retrieves the default converter for the date component
-         PropertySheetItem item, UIComponent component)
+    * 
-   {
+    * @param context FacesContext
-      if (item.getConverter() != null)
+    * @return XMLDateConverter
-      {
+    */
-         super.setupConverter(context, propertySheet, item, component);
+   protected Converter getDefaultConverter(FacesContext context)
-      }
-      else
-      {
-         // we can cast this as we know it is an UIOutput type
-         ((UIOutput)component).setConverter(getConverter(context));
-      }
-   }
-
-   protected Converter getConverter(FacesContext context)
    {
       XMLDateConverter converter = (XMLDateConverter)context.getApplication().
-            createConverter(RepoConstants.ALFRESCO_FACES_XMLDATA_CONVERTER);
+            createConverter(RepoConstants.ALFRESCO_FACES_XMLDATE_CONVERTER);
       converter.setType("date");
       converter.setPattern(Application.getMessage(context, MSG_DATE));
       return converter;

source/java/org/alfresco/web/bean/generator/DateTimePickerGenerator.java

@@ -23,15 +23,21 @@ public class DateTimePickerGenerator extends DatePickerGenerator
       UIComponent component = super.generate(context, id);
       
       // add the attribute to show the time
-      component.getAttributes().put("showTime", Boolean.valueOf(true));
+      component.getAttributes().put("showTime", Boolean.TRUE);
       
       return component;
    }
    
-   protected Converter getConverter(FacesContext context)
+   /**
+    * Retrieves the default converter for the date time component
+    * 
+    * @param context FacesContext
+    * @return XMLDateConverter
+    */
+   protected Converter getDefaultConverter(FacesContext context)
    {
       XMLDateConverter converter = (XMLDateConverter)context.getApplication().
-            createConverter(RepoConstants.ALFRESCO_FACES_XMLDATA_CONVERTER);
+            createConverter(RepoConstants.ALFRESCO_FACES_XMLDATE_CONVERTER);
       converter.setType("both");
       converter.setPattern(Application.getMessage(context, MSG_DATE_TIME));
       return converter;

source/java/org/alfresco/web/bean/generator/LabelGenerator.java

@@ -24,7 +24,6 @@ public class LabelGenerator extends BaseComponentGenerator
       UIComponent component = generate(context, "label_" + item.getName());
       
       // TODO: Turn the label red if the field is required
-      //       set the label id to be label_<var>_<name>
       //       setup the 'for' attribute to associate with it the control
       
       return component;

source/java/org/alfresco/web/bean/generator/SpaceIconPickerGenerator.java

@@ -1,13 +1,11 @@
 package org.alfresco.web.bean.generator;
 
 import javax.faces.component.UIComponent;
-import javax.faces.component.UIOutput;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.web.app.servlet.FacesHelper;
-import org.alfresco.web.ui.common.ComponentConstants;
-import org.alfresco.web.ui.common.component.UIImagePicker;
 import org.alfresco.web.ui.common.component.UIListItems;
 import org.alfresco.web.ui.repo.RepoConstants;
 import org.alfresco.web.ui.repo.component.property.PropertySheetItem;
@@ -41,12 +39,16 @@ public class SpaceIconPickerGenerator extends BaseComponentGenerator
    public UIComponent generate(FacesContext context, UIPropertySheet propertySheet,
          PropertySheetItem item)
    {
-      UIOutput component = null;
+      UIComponent component = null;
+      
+      // get the property definition
+      PropertyDefinition propertyDef = getPropertyDefinition(context,
+            propertySheet.getNode(), item.getName());
          
       if (propertySheet.inEditMode())
       {
          // use the standard component in edit mode
-         component = (UIImagePicker)generate(context, item.getName());
+         component = generate(context, item.getName());
       
          // create the list items child component
          UIListItems items = (UIListItems)context.getApplication().
@@ -75,13 +77,31 @@ public class SpaceIconPickerGenerator extends BaseComponentGenerator
          // add the list items component to the image picker component
          component.getChildren().add(items);
          
-         // make sure the property is not read only or protected
+         // disable the component if it is read only or protected
-         disableIfReadOnlyOrProtected(context, propertySheet, item, component);
+         if (item.isReadOnly() || (propertyDef != null && propertyDef.isProtected()))
+         {
+            component.getAttributes().put("disabled", Boolean.TRUE);
+         }
+         else
+         {
+            // if the item is multi valued we need to wrap the standard component
+            if (propertyDef != null && propertyDef.isMultiValued())
+            {
+               component = enableForMultiValue(context, propertySheet, item, component, true);
+            }
+         }
       }
       else
       {
          // create an output text component in view mode
          component = createOutputTextComponent(context, item.getName());
+         
+         // if the property is multi-valued and there isn't a custom converter 
+         // specified, add the MultiValue converter as a default
+         if (propertyDef.isMultiValued() && item.getConverter() == null)
+         {
+            item.setConverter(RepoConstants.ALFRESCO_FACES_MULTIVALUE_CONVERTER);
+         }
       }
       
       // setup the converter if one was specified

source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java

@@ -5,8 +5,10 @@ import javax.faces.component.UIInput;
 import javax.faces.component.UIOutput;
 import javax.faces.context.FacesContext;
 
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.ui.common.ComponentConstants;
+import org.alfresco.web.ui.repo.RepoConstants;
 import org.alfresco.web.ui.repo.component.property.PropertySheetItem;
 import org.alfresco.web.ui.repo.component.property.UIPropertySheet;
 
@@ -34,18 +36,40 @@ public class TextFieldGenerator extends BaseComponentGenerator
    {
       UIComponent component = null;
       
+      // get the property definition
+      PropertyDefinition propertyDef = getPropertyDefinition(context,
+            propertySheet.getNode(), item.getName());
+         
       if (propertySheet.inEditMode())
       {
          // use the standard component in edit mode
          component = generate(context, item.getName());
          
-         // make sure the property is not read only or protected
+         // disable the component if it is read only or protected
-         disableIfReadOnlyOrProtected(context, propertySheet, item, component);
+         if (item.isReadOnly() || (propertyDef != null && propertyDef.isProtected()))
+         {
+            component.getAttributes().put("disabled", Boolean.TRUE);
+         }
+         else
+         {
+            // if the item is multi valued we need to wrap the standard component
+            if (propertyDef != null && propertyDef.isMultiValued())
+            {
+               component = enableForMultiValue(context, propertySheet, item, component, true);
+            }
+         }
       }
       else
       {
          // create an output text component in view mode
          component = createOutputTextComponent(context, item.getName());
+         
+         // if the property is multi-valued and there isn't a custom converter 
+         // specified, add the MultiValue converter as a default
+         if (propertyDef != null && propertyDef.isMultiValued() && item.getConverter() == null)
+         {
+            item.setConverter(RepoConstants.ALFRESCO_FACES_MULTIVALUE_CONVERTER);
+         }
       }
       
       // setup the converter if one was specified

source/java/org/alfresco/web/ui/common/converter/MultiValueConverter.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.converter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.ui.repo.RepoConstants;
+
+/**
+ * Converter class to convert a List of multiple values into a comma
+ * separated list.
+ * 
+ * @author gavinc
+ */
+public class MultiValueConverter implements Converter
+{
+   /**
+    * <p>The standard converter id for this converter.</p>
+    */
+   public static final String CONVERTER_ID = "org.alfresco.faces.MultiValueConverter";
+   
+   /**
+    * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
+    */
+   public Object getAsObject(FacesContext context, UIComponent component, String value)
+         throws ConverterException
+   {
+      List<String> items = new ArrayList<String>();
+      StringTokenizer tokenizer = new StringTokenizer(value, ",");
+      while (tokenizer.hasMoreTokens())
+      {
+         items.add(tokenizer.nextToken());
+      }
+      
+      return items;
+   }
+
+   /**
+    * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
+    */
+   public String getAsString(FacesContext context, UIComponent component, Object value)
+         throws ConverterException
+   {
+      String result = null;
+      
+      if (value instanceof Collection)
+      {
+         StringBuilder buffer = new StringBuilder();
+         for (Object obj : (Collection)value)
+         {
+            if (buffer.length() != 0)
+            {
+               buffer.append(", ");
+            }
+            
+            if (obj instanceof Boolean)
+            {
+               Converter boolLabel = context.getApplication().createConverter(
+                     RepoConstants.ALFRESCO_FACES_BOOLEAN_CONVERTER);
+               buffer.append(boolLabel.getAsString(context, component, obj));
+            }
+            else
+            {
+               buffer.append(obj.toString());
+            }
+         }
+         
+         result = buffer.toString();
+      }
+      else if (value != null)
+      {
+         result = value.toString();
+      }
+      
+      return result;
+   }
+}

source/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java

@@ -17,6 +17,7 @@
 package org.alfresco.web.ui.common.converter;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -36,7 +37,7 @@ public class XMLDateConverter extends DateTimeConverter
    /**
     * <p>The standard converter id for this converter.</p>
     */
-   public static final String CONVERTER_ID = "org.alfresco.faces.XMLDataConverter";
+   public static final String CONVERTER_ID = "org.alfresco.faces.XMLDateConverter";
 
    /**
     * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
@@ -58,6 +59,21 @@ public class XMLDateConverter extends DateTimeConverter
          Date date = ISO8601DateFormat.parse((String)value);
          str = super.getAsString(context, component, date);
       }
+      else if (value instanceof List)
+      {
+         StringBuilder buffer = new StringBuilder();
+         for (Object date : ((List)value))
+         {
+            if (buffer.length() != 0)
+            {
+               buffer.append(", ");
+            }
+            
+            buffer.append(super.getAsString(context, component, date));
+         }
+         
+         str = buffer.toString();
+      }
       else
       {
          str = super.getAsString(context, component, value);

source/java/org/alfresco/web/ui/repo/RepoConstants.java

@@ -21,6 +21,8 @@ package org.alfresco.web.ui.repo;
  */
 public final class RepoConstants
 {
+   // TODO: move these into the respective components as static members - as per JSF spec
+   
    public static final String ALFRESCO_FACES_ASSOCIATION          = "org.alfresco.faces.Association";
    public static final String ALFRESCO_FACES_CHILD_ASSOCIATION    = "org.alfresco.faces.ChildAssociation";
    public static final String ALFRESCO_FACES_PROPERTY             = "org.alfresco.faces.Property";
@@ -31,8 +33,13 @@ public final class RepoConstants
    public static final String ALFRESCO_FACES_CATEGORY_SELECTOR    = "org.alfresco.faces.CategorySelector";
    public static final String ALFRESCO_FACES_IMAGE_PICKER         = "org.alfresco.faces.ImagePicker";
    public static final String ALFRESCO_FACES_LIST_ITEMS           = "org.alfresco.faces.ListItems";
+   public static final String ALFRESCO_FACES_MULTIVALUE_EDITOR    = "org.alfresco.faces.MultiValueEditor";
+   public static final String ALFRESCO_FACES_FIELD_RENDERER       = "org.alfresco.faces.Field";
+   public static final String ALFRESCO_FACES_SELECTOR_RENDERER    = "org.alfresco.faces.Selector";
    public static final String ALFRESCO_FACES_RADIO_PANEL_RENDERER = "org.alfresco.faces.RadioPanel";
-   public static final String ALFRESCO_FACES_XMLDATA_CONVERTER    = "org.alfresco.faces.XMLDataConverter";
+   public static final String ALFRESCO_FACES_XMLDATE_CONVERTER    = "org.alfresco.faces.XMLDateConverter";
+   public static final String ALFRESCO_FACES_MULTIVALUE_CONVERTER = "org.alfresco.faces.MultiValueConverter";
+   public static final String ALFRESCO_FACES_BOOLEAN_CONVERTER    = "org.alfresco.faces.BooleanLabelConverter";
    
    public static final String GENERATOR_LABEL = "LabelGenerator";
    public static final String GENERATOR_TEXT_FIELD = "TextFieldGenerator";

source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java

@@ -18,6 +18,7 @@ package org.alfresco.web.ui.repo.component;
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 import javax.faces.component.EditableValueHolder;
@@ -262,6 +263,31 @@ public abstract class AbstractItemSelector extends UIInput
             {
                nodeRef = new NodeRef((String)val);
             }
+            else if (val instanceof List)
+            {
+               // build a comma separated list of node names
+               List nodes = (List)val;
+               StringBuilder buffer = new StringBuilder();
+               for (Object obj : nodes)
+               {
+                  if (buffer.length() != 0)
+                  {
+                     buffer.append(", ");
+                  }
+                  
+                  if (obj instanceof NodeRef)
+                  {
+                     buffer.append(Repository.getNameForNode(service, (NodeRef)obj));
+                  }
+                  else
+                  {
+                     buffer.append(obj.toString());
+                  }
+               }
+               
+               // write out to response
+               out.write(buffer.toString());
+            }
          }
          
          // if there is a value show it's name

source/java/org/alfresco/web/ui/repo/component/UIMultiValueEditor.java

@@ -18,8 +18,9 @@
 package org.alfresco.web.ui.repo.component;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.List;
-import java.util.Map;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -30,8 +31,9 @@ import javax.faces.event.ActionEvent;
 import javax.faces.event.FacesEvent;
 
 import org.alfresco.web.app.Application;
-import org.apache.commons.logging.Log;
+import org.alfresco.web.app.servlet.FacesHelper;
-import org.apache.commons.logging.LogFactory;
+import org.alfresco.web.ui.common.renderer.DatePickerRenderer;
+import org.alfresco.web.ui.repo.RepoConstants;
 
 /**
  * This component wraps a standard component to give it multi value capabilities.
@@ -44,12 +46,10 @@ import org.apache.commons.logging.LogFactory;
  */
 public class UIMultiValueEditor extends UIInput
 {
-   private static final Log logger = LogFactory.getLog(UIMultiValueEditor.class);
    private static final String MSG_SELECTED_ITEMS = "selected_items";
    private static final String MSG_NO_SELECTED_ITEMS = "no_selected_items";
    private static final String MSG_SELECT_ITEM = "select_an_item";
 
-   
    public final static String ACTION_SEPARATOR = ";";
    public final static int ACTION_NONE   = -1;
    public final static int ACTION_REMOVE = 0;
@@ -71,7 +71,7 @@ public class UIMultiValueEditor extends UIInput
     */
    public UIMultiValueEditor()
    {
-      setRendererType("org.alfresco.faces.List");
+      setRendererType(RepoConstants.ALFRESCO_FACES_SELECTOR_RENDERER);
    }
    
    /**
@@ -79,7 +79,7 @@ public class UIMultiValueEditor extends UIInput
     */
    public String getFamily()
    {
-      return "org.alfresco.faces.MultiValueEditor";
+      return RepoConstants.ALFRESCO_FACES_MULTIVALUE_EDITOR;
    }
    
    /**
@@ -303,7 +303,34 @@ public class UIMultiValueEditor extends UIInput
                   setSubmittedValue(items);
                }
                
-               items.add(getLastItemAdded());
+               Object addedItem = null;
+               
+               if (getRendererType().equals(RepoConstants.ALFRESCO_FACES_FIELD_RENDERER))
+               {
+                  UIInput childComponent = (UIInput)this.getChildren().get(0);
+                  
+                  // as the 'field' is being submitted in the same request we can go
+                  // directly to the submitted value to find the entered value
+                  addedItem = childComponent.getSubmittedValue();
+                  
+                  if (childComponent.getRendererType() != null &&
+                      childComponent.getRendererType().equals(
+                      RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER))
+                  {
+                     // the submitted value for the date is in it's raw form, convert to date
+                     int[] parts = (int[])addedItem;
+                     Calendar date = new GregorianCalendar(parts[0], parts[1], parts[2], 
+                           parts[3], parts[4]);
+                     addedItem = date.getTime();
+                  }
+                  
+                  // conversely, we can erase the submitted value
+                  childComponent.setSubmittedValue(null);
+               }
+               else
+               {
+                  addedItem = getLastItemAdded();
+                  
                   this.addingNewItem = Boolean.FALSE;
                
                   // get hold of the value binding for the lastItemAdded property
@@ -313,6 +340,12 @@ public class UIMultiValueEditor extends UIInput
                   {
                      vb.setValue(FacesContext.getCurrentInstance(), null);
                   }
+               }
+               
+               if (addedItem != null)
+               {
+                  items.add(addedItem);
+               }
                
                break;
             }
@@ -334,11 +367,18 @@ public class UIMultiValueEditor extends UIInput
     * @see javax.faces.component.UIComponent#getRendersChildren()
     */
    public boolean getRendersChildren()
+   {
+      if (getRendererType().equals(RepoConstants.ALFRESCO_FACES_FIELD_RENDERER))
+      {
+         // if we are using the field renderer always render the childre
+         return false;
+      }
+      else
       {
          // only show the wrapped component when the add button has been clicked 
-      
          return !this.addingNewItem.booleanValue();
       }
+   }
    
    // ------------------------------------------------------------------------------
    // Inner classes

source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java

@@ -180,14 +180,6 @@ public class UIProperty extends PropertySheetItem
             logger.warn("Setting property " + propDef.getName().toString() + " to read-only as it can not be edited");
             control.getAttributes().put("disabled", Boolean.TRUE);
          }         
-         
-         // for now we can not handle multi valued properties in the client so if the property
-         // is defined as such make sure it is rendered as disabled
-         if (propDef.isMultiValued())
-         {
-            logger.warn("Setting property " + propDef.getName().toString() + " to read-only, it can not be edited as it is defined as multi-valued");
-            control.getAttributes().put("disabled", Boolean.TRUE);
-         }
       }
       
       // create and set the value binding

source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java

@@ -17,40 +17,48 @@
 package org.alfresco.web.ui.repo.renderer;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
+import javax.faces.convert.Converter;
+import javax.faces.convert.DateTimeConverter;
 
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.util.ISO8601DateFormat;
 import org.alfresco.web.app.Application;
+import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.converter.XMLDateConverter;
 import org.alfresco.web.ui.common.renderer.BaseRenderer;
+import org.alfresco.web.ui.repo.RepoConstants;
 import org.alfresco.web.ui.repo.component.UIMultiValueEditor;
 import org.alfresco.web.ui.repo.component.UIMultiValueEditor.MultiValueEditorEvent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Renders the MultiValueEditor component as a list of options that can be
+ * Base class for renderers of the MultiValueEditor component.
- * removed using a Remove button
+ * The current items are displayed as a list of options that can be
+ * removed using a Remove button.
  * 
  * @author gavinc
  */
-public class MultiValueListEditorRenderer extends BaseRenderer
+public abstract class BaseMultiValueRenderer extends BaseRenderer
 {
-   private static Log logger = LogFactory.getLog(MultiValueListEditorRenderer.class);
+   private static Log logger = LogFactory.getLog(BaseMultiValueRenderer.class);
    
    /** I18N message strings */
-   private final static String MSG_REMOVE = "remove";
+   protected final static String MSG_REMOVE = "remove";
-   private final static String MSG_SELECT_BUTTON = "select_button";
+   protected final static String MSG_SELECT_BUTTON = "select_button";
-   private final static String MSG_ADD_TO_LIST_BUTTON = "add_to_list_button";
+   protected final static String MSG_ADD_TO_LIST_BUTTON = "add_to_list_button";
    
-   private boolean highlightedRow;
+   protected boolean highlightedRow;
    
    // ------------------------------------------------------------------------------
    // Renderer implemenation
@@ -60,6 +68,8 @@ public class MultiValueListEditorRenderer extends BaseRenderer
     */
    public void decode(FacesContext context, UIComponent component)
    {
+      Object obj = FacesHelper.getManagedBean(context, "MultiValueEditorBean");
+      
       Map requestMap = context.getExternalContext().getRequestParameterMap();
       Map valuesMap = context.getExternalContext().getRequestParameterValuesMap();
       String fieldId = getHiddenFieldName(component);
@@ -112,29 +122,13 @@ public class MultiValueListEditorRenderer extends BaseRenderer
          UIMultiValueEditor editor = (UIMultiValueEditor)component;
          
          // start outer table
-         out.write("<table border='0' cellspacing='4' cellpadding='4' class='selector'");
+         out.write("<table border='0' cellspacing='3' cellpadding='3' class='selector'");
          this.outputAttribute(out, attrs.get("style"), "style");
          this.outputAttribute(out, attrs.get("styleClass"), "styleClass");
          out.write(">");
          
-         // show the select an item message
+         // render the area before the wrapped component
-         out.write("<tr><td>");
+         renderPreWrappedComponent(context, out, editor);
-         out.write("1. ");
-         out.write(editor.getSelectItemMsg());
-         out.write("</td></tr>");
-         
-         if (editor.getAddingNewItem())
-         {
-            out.write("<tr><td style='padding-left:8px'>");
-         }
-         else
-         {
-            out.write("<tr><td style='padding-left:8px;'><input type='submit' value='");
-            out.write(Application.getMessage(context, MSG_SELECT_BUTTON));
-            out.write("' onclick=\"");
-            out.write(generateFormSubmit(context, component, Integer.toString(UIMultiValueEditor.ACTION_SELECT)));
-            out.write("\"/></td></tr>");
-         }
       }
    }
    
@@ -151,35 +145,20 @@ public class MultiValueListEditorRenderer extends BaseRenderer
          // get hold of the node service
          NodeService nodeService = Repository.getServiceRegistry(context).getNodeService();
          
-         if (editor.getAddingNewItem())
+         // render the area between the component and current items list
-         {
+         renderPostWrappedComponent(context, out, editor);
-            out.write("</td></tr>");
-         }
-         
-         // show the add to list button but only if something has been selected
-         out.write("<tr><td>2. <input type='submit'");
-         if (editor.getAddingNewItem() == false && editor.getLastItemAdded() != null || 
-             editor.getLastItemAdded() == null)
-         {
-            out.write(" disabled='true'");
-         }
-         out.write(" value='");
-         out.write(Application.getMessage(context, MSG_ADD_TO_LIST_BUTTON));
-         out.write("' onclick=\"");
-         out.write(generateFormSubmit(context, component, Integer.toString(UIMultiValueEditor.ACTION_ADD)));
-         out.write("\"/></td></tr>");
 
+         // show the currently selected items
          out.write("<tr><td style='padding-top:8px'>");
          out.write(editor.getSelectedItemsMsg());
          out.write("</td></tr>");
 
-         // show the current items
          out.write("<tr><td><table cellspacing='0' cellpadding='2' border='0' class='selectedItems'>");
          out.write("<tr><td colspan='2' class='selectedItemsHeader'>");
          out.write(Application.getMessage(context, "name"));
          out.write("</td></tr>");
          
-         List currentItems = (List)editor.getValue();
+         List currentItems = (List)editor.getValue();;
          if (currentItems != null && currentItems.size() > 0)
          {
             for (int x = 0; x < currentItems.size(); x++)
@@ -218,6 +197,27 @@ public class MultiValueListEditorRenderer extends BaseRenderer
       }
    }
 
+   /**
+    * Renders the area of the component before the wrapped component appears.
+    * 
+    * @param context FacesContext
+    * @param out The ResponseWriter to write to
+    * @param editor The multi value editor component
+    */
+   protected abstract void renderPreWrappedComponent(FacesContext context, 
+         ResponseWriter out, UIMultiValueEditor editor) throws IOException;
+         
+   /**
+    * Renders the area of the component after the wrapped component but before the list
+    * of currently selected values.
+    * 
+    * @param context FacesContext
+    * @param out The ResponseWriter to write to
+    * @param editor The multi value editor component
+    */      
+   protected abstract void renderPostWrappedComponent(FacesContext context, 
+         ResponseWriter out, UIMultiValueEditor editor) throws IOException; 
+         
    /**
     * Renders an existing item with a remove button
     * 
@@ -247,6 +247,30 @@ public class MultiValueListEditorRenderer extends BaseRenderer
       {
          out.write(Repository.getNameForNode(nodeService, (NodeRef)value));
       }
+      else if (value instanceof Date)
+      {
+         XMLDateConverter converter = (XMLDateConverter)context.getApplication().
+               createConverter(RepoConstants.ALFRESCO_FACES_XMLDATE_CONVERTER);
+         UIComponent childComponent = (UIComponent)component.getChildren().get(0);
+         Boolean showTime = (Boolean)childComponent.getAttributes().get("showTime");
+         if (showTime != null && showTime.booleanValue())
+         {
+            converter.setPattern(Application.getMessage(context, "date_time_pattern"));
+         }
+         else
+         {
+            converter.setPattern(Application.getMessage(context, "date_pattern"));
+         }
+         
+         out.write(converter.getAsString(context, childComponent, value));
+      }
+      else if (value instanceof Boolean)
+      {
+         Converter converter = context.getApplication().createConverter(
+               RepoConstants.ALFRESCO_FACES_BOOLEAN_CONVERTER);
+         out.write(converter.getAsString(context, 
+               (UIComponent)component.getChildren().get(0), value));
+      }
       else
       {
          out.write(value.toString());
@@ -278,7 +302,7 @@ public class MultiValueListEditorRenderer extends BaseRenderer
     * 
     * @return hidden field name
     */
-   private String getHiddenFieldName(UIComponent component)
+   protected String getHiddenFieldName(UIComponent component)
    {
       return component.getClientId(FacesContext.getCurrentInstance());
    }
@@ -292,7 +316,7 @@ public class MultiValueListEditorRenderer extends BaseRenderer
     * 
     * @return FORM submit JavaScript
     */
-   private String generateFormSubmit(FacesContext context, UIComponent component, String action)
+   protected String generateFormSubmit(FacesContext context, UIComponent component, String action)
    {
       return Utils.generateFormSubmit(context, component, getHiddenFieldName(component), action);
    }

source/java/org/alfresco/web/ui/repo/renderer/MultiValueFieldRenderer.java

@@ -0,0 +1,41 @@
+package org.alfresco.web.ui.repo.renderer;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.ui.repo.component.UIMultiValueEditor;
+
+/**
+ * Renders the MultiValueEditor component for use with field components
+ * i.e. text, checkboxes, lists etc.
+ * 
+ * This renderer does not show a "select item" message or a select button,
+ * the wrapped component is shown immediately with an add to list button
+ * after it.
+ * 
+ * @author gavinc
+ */
+public class MultiValueFieldRenderer extends BaseMultiValueRenderer
+{
+   @Override
+   protected void renderPreWrappedComponent(FacesContext context, ResponseWriter out, 
+         UIMultiValueEditor editor) throws IOException
+   {
+      out.write("<tr><td>");
+   }
+
+   @Override
+   protected void renderPostWrappedComponent(FacesContext context, ResponseWriter out, 
+         UIMultiValueEditor editor) throws IOException
+   {
+      out.write("&nbsp;<input type='submit' value='");
+      out.write(Application.getMessage(context, MSG_ADD_TO_LIST_BUTTON));
+      out.write("' onclick=\"");
+      out.write(generateFormSubmit(context, editor, Integer.toString(UIMultiValueEditor.ACTION_ADD)));
+      out.write("\"/></td></tr>");
+   }
+}

source/java/org/alfresco/web/ui/repo/renderer/MultiValueSelectorRenderer.java

@@ -0,0 +1,68 @@
+package org.alfresco.web.ui.repo.renderer;
+
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.ui.repo.component.UIMultiValueEditor;
+
+/**
+ * Renders the MultiValueEditor component for use with picker components.
+ * 
+ * This renderer shows a "select items" message and a select button. When
+ * the select button is pressed the wrapped component will appear and the
+ * add to list button will be enabled.
+ * 
+ * @author gavinc
+ */
+public class MultiValueSelectorRenderer extends BaseMultiValueRenderer
+{
+   @Override
+   protected void renderPreWrappedComponent(FacesContext context, ResponseWriter out,
+         UIMultiValueEditor editor) throws IOException
+   {
+      // show the select an item message
+      out.write("<tr><td>");
+      out.write("1. ");
+      out.write(editor.getSelectItemMsg());
+      out.write("</td></tr>");
+      
+      if (editor.getAddingNewItem())
+      {
+         out.write("<tr><td style='padding-left:8px'>");
+      }
+      else
+      {
+         out.write("<tr><td style='padding-left:8px;'><input type='submit' value='");
+         out.write(Application.getMessage(context, MSG_SELECT_BUTTON));
+         out.write("' onclick=\"");
+         out.write(generateFormSubmit(context, editor, Integer.toString(UIMultiValueEditor.ACTION_SELECT)));
+         out.write("\"/></td></tr>");
+      }
+   }
+   
+   @Override
+   protected void renderPostWrappedComponent(FacesContext context, ResponseWriter out,
+         UIMultiValueEditor editor) throws IOException
+   {
+      if (editor.getAddingNewItem())
+      {
+         out.write("</td></tr>");
+      }
+      
+      // show the add to list button but only if something has been selected
+      out.write("<tr><td>2. <input type='submit'");
+      if (editor.getAddingNewItem() == false && editor.getLastItemAdded() != null || 
+          editor.getLastItemAdded() == null)
+      {
+         out.write(" disabled='true'");
+      }
+      out.write(" value='");
+      out.write(Application.getMessage(context, MSG_ADD_TO_LIST_BUTTON));
+      out.write("' onclick=\"");
+      out.write(generateFormSubmit(context, editor, Integer.toString(UIMultiValueEditor.ACTION_ADD)));
+      out.write("\"/></td></tr>");
+   }
+}

source/java/org/alfresco/web/ui/repo/tag/BaseMultiValueTag.java

@@ -19,13 +19,15 @@ package org.alfresco.web.ui.repo.tag;
 import javax.faces.component.UIComponent;
 
 import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+import org.alfresco.web.ui.repo.RepoConstants;
 
 /**
- * Tag to combine the multi value component and list renderer
+ * Base class for all tags that combine the multi value component
+ * and renderers
  * 
  * @author gavinc
  */
-public class MultiValueListEditorTag extends HtmlComponentTag
+public abstract class BaseMultiValueTag extends HtmlComponentTag
 {
    private String value;
    private String lastItemAdded;
@@ -39,15 +41,7 @@ public class MultiValueListEditorTag extends HtmlComponentTag
     */
    public String getComponentType()
    {
-      return "org.alfresco.faces.MultiValueEditor";
+      return RepoConstants.ALFRESCO_FACES_MULTIVALUE_EDITOR;
-   }
-
-   /**
-    * @see javax.faces.webapp.UIComponentTag#getRendererType()
-    */
-   public String getRendererType()
-   {
-      return "org.alfresco.faces.List";
    }
    
    /**

source/java/org/alfresco/web/ui/repo/tag/MultiValueFieldTag.java

@@ -0,0 +1,21 @@
+package org.alfresco.web.ui.repo.tag;
+
+import org.alfresco.web.ui.repo.RepoConstants;
+
+/**
+ * Tag that combines the multi value editor component and 
+ * the field renderer.
+ * 
+ * @author gavinc
+ *
+ */
+public class MultiValueFieldTag extends BaseMultiValueTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return RepoConstants.ALFRESCO_FACES_FIELD_RENDERER;
+   }
+}

source/java/org/alfresco/web/ui/repo/tag/MultiValueSelectorTag.java

@@ -0,0 +1,20 @@
+package org.alfresco.web.ui.repo.tag;
+
+import org.alfresco.web.ui.repo.RepoConstants;
+
+/**
+ * Tag that combines the multi value editor component and 
+ * the selector renderer.
+ * 
+ * @author gavinc
+ */
+public class MultiValueSelectorTag extends BaseMultiValueTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return RepoConstants.ALFRESCO_FACES_SELECTOR_RENDERER;
+   }
+}

source/web/WEB-INF/faces-config-beans.xml

@@ -1390,6 +1390,16 @@
       </managed-property>
    </managed-bean>
    
+   <managed-bean>
+      <description>
+         Helper bean that caches the last item added to a multi
+         value editor component
+      </description>
+      <managed-bean-name>MultiValueEditorBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.MultiValueEditorBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+   </managed-bean>
+   
    <!-- ==================== COMPONENT GENERATOR BEANS ==================== -->
    
    <managed-bean>

source/web/WEB-INF/faces-config-common.xml

@@ -147,7 +147,7 @@
    
    <!-- ==================== CONVERTERS ==================== -->
    <converter>
-      <converter-id>org.alfresco.faces.XMLDataConverter</converter-id>
+      <converter-id>org.alfresco.faces.XMLDateConverter</converter-id>
       <converter-class>org.alfresco.web.ui.common.converter.XMLDateConverter</converter-class>
    </converter>
    

source/web/WEB-INF/faces-config-repo.xml

@@ -171,8 +171,14 @@
       
       <renderer>
          <component-family>org.alfresco.faces.MultiValueEditor</component-family>
-         <renderer-type>org.alfresco.faces.List</renderer-type>
+         <renderer-type>org.alfresco.faces.Selector</renderer-type>
-         <renderer-class>org.alfresco.web.ui.repo.renderer.MultiValueListEditorRenderer</renderer-class>
+         <renderer-class>org.alfresco.web.ui.repo.renderer.MultiValueSelectorRenderer</renderer-class>
+      </renderer>
+      
+      <renderer>
+         <component-family>org.alfresco.faces.MultiValueEditor</component-family>
+         <renderer-type>org.alfresco.faces.Field</renderer-type>
+         <renderer-class>org.alfresco.web.ui.repo.renderer.MultiValueFieldRenderer</renderer-class>
       </renderer>
    </render-kit>
       

source/web/WEB-INF/repo.tld

@@ -1208,8 +1208,74 @@
    </tag>
    
    <tag>
-      <name>multiValueListEditor</name>
+      <name>multiValueSelector</name>
-      <tag-class>org.alfresco.web.ui.repo.tag.MultiValueListEditorTag</tag-class>
+      <tag-class>org.alfresco.web.ui.repo.tag.MultiValueSelectorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>lastItemAdded</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>readOnly</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectItemMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectedItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>noSelectedItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>multiValueField</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.MultiValueFieldTag</tag-class>
       <body-content>JSP</body-content>
       
       <attribute>

source/web/jsp/dialog/edit-category.jsp

@@ -99,7 +99,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.categories}" />:</td>
                                     <td width="98%">
-                                       <r:multiValueListEditor id="multi-category-selector"
+                                       <r:multiValueSelector id="multi-category-selector"
                                                                value="#{DocumentDetailsBean.categories}"
                                                                lastItemAdded="#{DocumentDetailsBean.addedCategory}" 
                                                                selectItemMsg="#{msg.select_category}"
@@ -109,7 +109,7 @@
                                           <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}" 
                                                               styleClass="selector"
                                                               value="#{DocumentDetailsBean.addedCategory}"/>
-                                       </r:multiValueListEditor>
+                                       </r:multiValueSelector>
                                     </td>
                                  </tr>
                                  <tr><td colspan="2" class="paddingRow"></td></tr>