weaver      2003/10/05 17:31:51

  Modified:    portal/src/java/org/apache/jetspeed/engine/core
                        PortletActionProviderImpl.java
                        PortalContextProviderImpl.java
  Log:
  - changes due to new Pluto drop
    - method signatures changed and some removed/replaced
  
  Revision  Changes    Path
  1.3       +10 -16    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortletActionProviderImpl.java
  
  Index: PortletActionProviderImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortletActionProviderImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortletActionProviderImpl.java    29 Jul 2003 03:58:55 -0000      1.2
  +++ PortletActionProviderImpl.java    6 Oct 2003 00:31:51 -0000       1.3
  @@ -70,32 +70,29 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
    * @version $Id$
    */
  -public class PortletActionProviderImpl
  -implements PortletActionProvider
  +public class PortletActionProviderImpl implements PortletActionProvider
   {
       HttpServletRequest request = null;
       ServletConfig config = null;
  +    private PortletWindow portletWindow;
   
  -    public PortletActionProviderImpl(HttpServletRequest request,
  -                                          ServletConfig config)
  +    public PortletActionProviderImpl(HttpServletRequest request, ServletConfig 
config, PortletWindow portletWindow)
       {
           this.request = request;
           this.config = config;
  +        this.portletWindow = portletWindow;
       }
   
       /* (non-Javadoc)
        * @see 
org.apache.pluto.services.information.PortletActionProvider#changePortletMode(PortletWindow,
 PortletMode)
        */
  -    public void changePortletMode(
  -        PortletWindow portletWindow,
  -        PortletMode mode) 
  +    public void changePortletMode(PortletMode mode)
       {
           RequestContext context = JetspeedRequestContext.getRequestContext(request);
   
           PortalURL url = context.getRequestedPortalURL();
           PortalControlParameter controlURL = new PortalControlParameter(url);
  -        if (!(controlURL.getMode(portletWindow).equals(mode))
  -            && mode != null) 
  +        if (!(controlURL.getMode(portletWindow).equals(mode)) && mode != null)
           {
               controlURL.setMode(portletWindow, mode);
               context.changeRequestedPortalURL(url, controlURL);
  @@ -106,21 +103,18 @@
       /* (non-Javadoc)
        * @see 
org.apache.pluto.services.information.PortletActionProvider#changePortletWindowState(PortletWindow,
 WindowState)
        */
  -    public void changePortletWindowState(
  -        PortletWindow portletWindow,
  -        WindowState state) 
  +    public void changePortletWindowState(WindowState state)
       {
           RequestContext context = JetspeedRequestContext.getRequestContext(request);
   
           PortalURL url = context.getRequestedPortalURL();
           PortalControlParameter controlURL = new PortalControlParameter(url);
   
  -        if (!(controlURL.getState(portletWindow).equals(state))
  -            && state != null) 
  +        if (!(controlURL.getState(portletWindow).equals(state)) && state != null)
           {
               controlURL.setState(portletWindow, state);
               context.changeRequestedPortalURL(url, controlURL);
           }
       }
  -    
  +
   }
  
  
  
  1.3       +72 -1     
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java
  
  Index: PortalContextProviderImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortalContextProviderImpl.java    29 Jul 2003 03:58:54 -0000      1.2
  +++ PortalContextProviderImpl.java    6 Oct 2003 00:31:51 -0000       1.3
  @@ -53,6 +53,9 @@
    */
   package org.apache.jetspeed.engine.core;
   
  +import java.util.Collection;
  +import java.util.Collections;
  +
   import javax.portlet.PortalContext;
   import org.apache.pluto.core.impl.PortalContextImpl;
   import org.apache.pluto.services.information.PortalContextProvider;
  @@ -82,4 +85,72 @@
           return portalContext;
       }
       
  +    /** 
  +     * <p>
  +     * getPortalInfo
  +     * </p>
  +     * 
  +     * @see 
org.apache.pluto.services.information.PortalContextProvider#getPortalInfo()
  +     * @return
  +     */
  +    public String getPortalInfo()
  +    {
  +        
  +        return portalContext.getPortalInfo();
  +    }
  +
  +    /** 
  +     * <p>
  +     * getProperty
  +     * </p>
  +     * 
  +     * @see 
org.apache.pluto.services.information.PortalContextProvider#getProperty(java.lang.String)
  +     * @param arg0
  +     * @return
  +     */
  +    public String getProperty(String arg0)
  +    {        
  +        return portalContext.getProperty(arg0);
  +    }
  +
  +    /** 
  +     * <p>
  +     * getPropertyNames
  +     * </p>
  +     * 
  +     * @see 
org.apache.pluto.services.information.PortalContextProvider#getPropertyNames()
  +     * @return
  +     */
  +    public Collection getPropertyNames()
  +    {     
  +        return Collections.list(portalContext.getPropertyNames());
  +    }
  +
  +    /** 
  +     * <p>
  +     * getSupportedPortletModes
  +     * </p>
  +     * 
  +     * @see 
org.apache.pluto.services.information.PortalContextProvider#getSupportedPortletModes()
  +     * @return
  +     */
  +    public Collection getSupportedPortletModes()
  +    {
  +        
  +        return Collections.list(portalContext.getSupportedPortletModes());
  +    }
  +
  +    /** 
  +     * <p>
  +     * getSupportedWindowStates
  +     * </p>
  +     * 
  +     * @see 
org.apache.pluto.services.information.PortalContextProvider#getSupportedWindowStates()
  +     * @return
  +     */
  +    public Collection getSupportedWindowStates()
  +    {        
  +        return Collections.list(portalContext.getSupportedWindowStates());
  +    }
  +
   }
  
  
  

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

Reply via email to