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

[Julien Viet]

  User: julien  
  Date: 06/07/30 20:05:40

  Modified:    portlet/src/main/org/jboss/portal/portlet 
                        ParametersStateString.java
  Log:
  - Make Parameters extend ParameterMap
  
  Revision  Changes    Path
  1.7       +6 -10     jboss-portal/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ParametersStateString.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ParametersStateString.java	22 Jun 2006 02:11:13 -0000	1.6
  +++ ParametersStateString.java	31 Jul 2006 00:05:40 -0000	1.7
  @@ -38,7 +38,7 @@
    * A set of parameters.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class ParametersStateString extends StateString implements Serializable
   {
  @@ -155,17 +155,14 @@
      /** Return the a map containing the values. */
      public Map getMap()
      {
  -      return parameters.getMap();
  +      return parameters;
      }
   
      /** Clear all the parameters. */
      public void clear()
      {
  -      if (parameters != null)
  -      {
            parameters.clear();
         }
  -   }
   
      /**
       * Replace all the parameters.
  @@ -215,7 +212,7 @@
      /** Return the size. */
      public int getSize()
      {
  -      return parameters.getSize();
  +      return parameters.size();
      }
   
      /**
  @@ -235,14 +232,13 @@
       */
      public String getStringValue()
      {
  -      if (parameters != null && parameters.getSize() != 0)
  +      if (parameters != null && parameters.size() != 0)
         {
            try
            {
               ByteArrayOutputStream baos = new ByteArrayOutputStream();
               ObjectOutputStream oos = new ObjectOutputStream(baos);
  -            Map params = parameters.getMap();
  -            for (Iterator entries = params.entrySet().iterator(); entries.hasNext();)
  +            for (Iterator entries = parameters.entrySet().iterator(); entries.hasNext();)
               {
                  Map.Entry entry = (Map.Entry)entries.next();
                  String name = (String)entry.getKey();