cvs commit: jakarta-pluto/sandbox/kuiper/src/java/org/apache/pluto/impl ActionResponseImpl.java RenderRequestImpl.java

[dd...@apache.org]

ddewolf     2004/04/01 18:38:30

  Modified:    sandbox/kuiper/src/java/org/apache/pluto/impl
                        ActionResponseImpl.java RenderRequestImpl.java
  Log:
  Adding support for optional service factory.
  
  Revision  Changes    Path
  1.4       +7 -2      jakarta-pluto/sandbox/kuiper/src/java/org/apache/pluto/impl/ActionResponseImpl.java
  
  Index: ActionResponseImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-pluto/sandbox/kuiper/src/java/org/apache/pluto/impl/ActionResponseImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ActionResponseImpl.java	26 Mar 2004 03:38:17 -0000	1.3
  +++ ActionResponseImpl.java	2 Apr 2004 02:38:30 -0000	1.4
  @@ -50,10 +50,11 @@
   
       /** Default Constructor. */
       public ActionResponseImpl(PortletWindow window,
  -                              HttpServletResponse response) {
  +                              HttpServletResponse response,
  +                              Map renderParameters) {
           super(response);
           this.window = window;
  -        this.renderParameters = new java.util.HashMap();
  +        this.renderParameters = renderParameters;
       }
   
       /** Update the window state by utilizing
  @@ -116,6 +117,10 @@
        */
       public void setRenderParameter(String key, String[] values) {
           renderParameters.put(key, values);
  +    }
  +
  +    public Map getRenderParameters() {
  +        return renderParameters;
       }
   
       /** Determine whther the response has been commited.
  
  
  
  1.3       +58 -1     jakarta-pluto/sandbox/kuiper/src/java/org/apache/pluto/impl/RenderRequestImpl.java
  
  Index: RenderRequestImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-pluto/sandbox/kuiper/src/java/org/apache/pluto/impl/RenderRequestImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RenderRequestImpl.java	25 Mar 2004 05:27:10 -0000	1.2
  +++ RenderRequestImpl.java	2 Apr 2004 02:38:30 -0000	1.3
  @@ -23,6 +23,9 @@
   import javax.portlet.PortletContext;
   import javax.portlet.PortalContext;
   import javax.servlet.http.HttpServletRequest;
  +import java.util.Map;
  +import java.util.Enumeration;
  +import java.util.Vector;
   
   /**
    * 
  @@ -33,11 +36,65 @@
   public class RenderRequestImpl extends PortletRequestImpl
       implements RenderRequest {
   
  +    //private Map renderParameters;
  +    /** renderParameters MAY be null if action
  +     *  did not preceed this render request.
  +     * @param env
  +     * @param context
  +     * @param window
  +     * @param request
  +     * @param renderParameters
  +     */
       public RenderRequestImpl(PlutoEnvironment env,
                                PortletContext context,
                                PortletWindow window,
  -                             HttpServletRequest request) {
  +                             HttpServletRequest request,
  +                             Map renderParameters) {
           super(env, context, window, request);
  +        //this.renderParameters = renderParameters;
       }
   
  +    /*
  +
  +    Eventually we need to handle parameters per the spec.
  +    This means if an action request no render parameters except
  +    for those that have been set by setRenderParameter are visible.
  +
  +    Here's a possible method to do that. . .but it's not 100% flushed
  +    out.
  +
  +    public String getParameter(String key) {
  +        if(renderParameters==null) {
  +            return super.getParameter(key);
  +        }
  +        String[] strs = getParameterValues(key);
  +        if(strs!=null && strs.length>0) {
  +            return strs[0];
  +        }
  +        else {
  +            return null;
  +        }
  +    }
  +
  +    public String[] getParameterValues(String key) {
  +        if(renderParameters==null) {
  +            super.getParameterValues(key);
  +        }
  +        return (String[])this.renderParameters.get(key);
  +    }
  +
  +    public Enumeration getParameterNames() {
  +        if(renderParameters==null) {
  +            return super.getParameterNames();
  +        }
  +        return new Vector(renderParameters.keySet()).elements();
  +    }
  +
  +    public Map getParameterMap() {
  +        if(renderParameters==null) {
  +            return super.getParameterMap();
  +        }
  +        return renderParameters;
  +    }
  +    */
   }