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

[Julien Viet]

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

  Modified:    portlet/src/main/org/jboss/portal/portlet   Parameters.java
                        PortletInvoker.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       +4 -4      jboss-portal/portlet/src/main/org/jboss/portal/portlet/Parameters.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Parameters.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/Parameters.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Parameters.java	31 Jul 2006 00:20:50 -0000	1.1
  +++ Parameters.java	22 Aug 2006 14:08:53 -0000	1.2
  @@ -34,7 +34,7 @@
    * A set of parameters.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class Parameters extends ParameterMap implements Serializable
   {
  @@ -151,7 +151,7 @@
         {
            throw new IllegalArgumentException("name must not be null");
         }
  -      assertValue(values);
  +      getInternalValue(values);
         map.put(name, values);
      }
   
  @@ -346,8 +346,8 @@
         for (Iterator i = that.entrySet().iterator(); i.hasNext();)
         {
            Entry entry = (Entry)i.next();
  -         assertKey(entry.getKey());
  -         assertValue(entry.getValue());
  +         assertKeyValidity(entry.getKey());
  +         getInternalValue(entry.getValue());
         }
      }
   }
  
  
  
  1.17      +4 -4      jboss-portal/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- PortletInvoker.java	10 Aug 2006 08:02:34 -0000	1.16
  +++ PortletInvoker.java	22 Aug 2006 14:08:53 -0000	1.17
  @@ -21,7 +21,7 @@
   */
   package org.jboss.portal.portlet;
   
  -import org.jboss.portal.common.value.ValueMap;
  +import org.jboss.portal.portlet.state.PropertyMap;
   import org.jboss.portal.portlet.invocation.PortletInvocation;
   
   import java.util.Set;
  @@ -31,7 +31,7 @@
    * operations are possible on a particular portlet among the set.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   public interface PortletInvoker
   {
  @@ -85,7 +85,7 @@
       * @throws IllegalArgumentException if the portletId is null
       * @throws UnsupportedOperationException if the invoker does not support this operation
       */
  -   ValueMap getProperties(String portletId) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
  +   PropertyMap getProperties(String portletId) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
   
      /**
       * Set the properties on the specified portlet.
  @@ -95,5 +95,5 @@
       * @throws IllegalArgumentException if the portletId or the properties is null
       * @throws UnsupportedOperationException if the invoker does not support this operation
       */
  -   void setProperties(String portletId, ValueMap properties) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
  +   void setProperties(String portletId, PropertyMap properties) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
   }