ate         2005/04/21 02:03:32

  Modified:    portal/src/java/org/apache/jetspeed/services/information
                        PortletURLProviderImpl.java
  Log:
  Code cleanup.
  The PortletURLProviderImpl now is only used by Pluto for generation of a 
"normal" PortletURL.
  The other usage for generating Portal DecoratorAction urls now no longer uses 
this but directly uses the PortalURL for that.
  
  Revision  Changes    Path
  1.10      +4 -27     
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java
  
  Index: PortletURLProviderImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PortletURLProviderImpl.java       15 Oct 2004 22:58:43 -0000      1.9
  +++ PortletURLProviderImpl.java       21 Apr 2005 09:03:32 -0000      1.10
  @@ -15,8 +15,6 @@
    */
   package org.apache.jetspeed.services.information;
   
  -import java.util.HashMap;
  -import java.util.Iterator;
   import java.util.Map;
   
   import javax.portlet.PortletMode;
  @@ -41,7 +39,6 @@
       private WindowState state = null;
       private boolean action = false;
       private boolean secure = false;
  -    private boolean clearParameters = false;
       private Map parameters = null;
   
       private PortalURL url;
  @@ -74,9 +71,8 @@
       }
   
       public void clearParameters()
  -    {        
  -        // url.clearRenderParameters(portletWindow);
  -        clearParameters = true;        
  +    {
  +        // not used, handled by JetspeedNavigationalStateCodec itself
       }
   
       public void setParameters(Map parameters)
  @@ -86,25 +82,6 @@
   
       public String toString()
       {
  -        if ( clearParameters )
  -        {
  -            if (parameters != null)
  -            {
  -                Iterator names = parameters.keySet().iterator();
  -                Map map = new HashMap();
  -                while (names.hasNext())
  -                {
  -                    String name = (String) names.next();
  -                    Object value = parameters.get(name);
  -                    String[] values = value instanceof String ? new String[] 
{(String) value } : (String[]) value;
  -                    map.put(name,values);
  -                }
  -            }
  -            return 
url.createPortletURL(portletWindow,parameters,mode,state,action,secure);
  -        }
  -        else
  -        {
  -            return url.createPortletURL(portletWindow,mode,state,secure);
  -        }
  +        return 
url.createPortletURL(portletWindow,parameters,mode,state,action,secure);
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to