You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/04/12 21:47:33 UTC

svn commit: r393585 - in /cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal: coplet/adapter/ layout/renderer/aspect/impl/ pluto/ pluto/adapter/ pluto/om/ pluto/servlet/ wsrp/adapter/

Author: cziegeler
Date: Wed Apr 12 12:47:30 2006
New Revision: 393585

URL: http://svn.apache.org/viewcvs?rev=393585&view=rev
Log:
Implement coplet decorator for portlets and wsrp

Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java Wed Apr 12 12:47:30 2006
@@ -30,11 +30,11 @@
      * Returns a list of {@link DecorationAction}.
      * @return List of possible window states, might be empty.
      */
-    List getPossibleWindowStates();
+    List getPossibleWindowStates(CopletInstanceData coplet);
 
     /**
      * Returns a list of {@link DecorationAction}.
      * @return List of possible coplet modes, might be empty.
      */
-    List getPossibleCopletModes();
+    List getPossibleCopletModes(CopletInstanceData coplet);
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java Wed Apr 12 12:47:30 2006
@@ -15,34 +15,24 @@
  */
 package org.apache.cocoon.portal.coplet.adapter;
 
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.cocoon.portal.event.Event;
-
 /**
  * @version $Id$
  */
 public final class DecorationAction {
 
     protected String name;
-    protected List   events;
-
-    public DecorationAction(String name, List events) {
-        this.name = name;
-        this.events = events;
-    }
+    protected String url;
 
-    public DecorationAction(String name, Event event) {
+    public DecorationAction(String name, String url) {
         this.name = name;
-        this.events = Collections.singletonList(event);
+        this.url = url;
     }
 
     public String getName() {
         return this.name;
     }
 
-    public List getEvents() {
-        return this.events;
+    public String getUrl() {
+        return this.url;
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java Wed Apr 12 12:47:30 2006
@@ -19,6 +19,8 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.portal.PortalService;
 import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
+import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
 import org.apache.cocoon.portal.layout.Layout;
 import org.apache.cocoon.portal.layout.impl.CopletLayout;
 import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
@@ -57,9 +59,9 @@
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
      */
     public void toSAX(RendererAspectContext context,
-                      Layout layout,
-                      PortalService service,
-                      ContentHandler contenthandler)
+                      Layout                layout,
+                      PortalService         service,
+                      ContentHandler        contenthandler)
     throws SAXException {
         final PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
         final CopletInstanceData copletInstanceData = ((CopletLayout)layout).getCopletInstanceData();
@@ -67,7 +69,15 @@
         if ( config.rootTag ) {
             XMLUtils.startElement(contenthandler, config.tagName);
         }
-        XMLUtils.createElement(contenthandler, "title", copletInstanceData.getTitle());
+        final CopletAdapter adapter = service.getCopletAdapter(copletInstanceData.getCopletData().getCopletBaseData().getCopletAdapterName());
+        String title = null;
+        if ( adapter instanceof CopletDecorationProvider ) {
+            title = ((CopletDecorationProvider)adapter).getTitle(copletInstanceData);
+        }
+        if ( title == null ) {
+            title = copletInstanceData.getTitle();
+        }
+        XMLUtils.createElement(contenthandler, "title", title);
         XMLUtils.createElement(contenthandler, "instance-id", copletInstanceData.getId());
 
         context.invokeNext( layout, service, contenthandler );

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java Wed Apr 12 12:47:30 2006
@@ -31,7 +31,6 @@
 import org.apache.cocoon.portal.coplet.CopletInstanceData;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 import org.apache.cocoon.portal.event.ConvertableEvent;
-import org.apache.cocoon.portal.layout.impl.CopletLayout;
 import org.apache.cocoon.portal.pluto.om.PortletEntityImpl;
 import org.apache.cocoon.portal.pluto.om.PortletWindowImpl;
 import org.apache.pluto.om.window.PortletWindow;
@@ -237,11 +236,7 @@
     public String asString() {
 
         final PortletWindowImpl impl = (PortletWindowImpl) this.portletWindow;
-        final CopletLayout cl = impl.getLayout();
-        if (cl == null) {
-            return "";
-        }
-        final CopletInstanceData cid = cl.getCopletInstanceData();
+        final CopletInstanceData cid = impl.getCopletInstanceData();
         PortletURLConverter urlConverter = new PortletURLConverter(cid);
 
         if (this.mode != null) {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Wed Apr 12 12:47:30 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.cocoon.portal.pluto.adapter;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -41,6 +42,7 @@
 import org.apache.cocoon.portal.PortalService;
 import org.apache.cocoon.portal.coplet.CopletInstanceData;
 import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
+import org.apache.cocoon.portal.coplet.adapter.DecorationAction;
 import org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter;
 import org.apache.cocoon.portal.event.Receiver;
 import org.apache.cocoon.portal.pluto.PortletActionProviderImpl;
@@ -138,7 +140,7 @@
 
         if ( portletEntity.getPortletDefinition() != null ) {
             // create the window
-            PortletWindow portletWindow = new PortletWindowImpl(portletEntityId);                
+            PortletWindow portletWindow = new PortletWindowImpl(coplet, portletEntityId);                
             ((PortletWindowCtrl)portletWindow).setId(coplet.getId());
             ((PortletWindowCtrl)portletWindow).setPortletEntity(portletEntity);
             PortletWindowList windowList = portletEntity.getPortletWindowList();        
@@ -401,19 +403,88 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleCopletModes()
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleCopletModes(CopletInstanceData)
      */
-    public List getPossibleCopletModes() {
-        // TODO Auto-generated method stub
-        return null;
+    public List getPossibleCopletModes(CopletInstanceData copletInstanceData) {
+        final List modes = new ArrayList();
+        final PortletWindow window = (PortletWindow)copletInstanceData.getTemporaryAttribute("window");
+        if ( window != null && this.portletContainerEnvironment != null) {
+            InformationProviderService ips = (InformationProviderService) this.portletContainerEnvironment.getContainerService(InformationProviderService.class);
+            DynamicInformationProvider dip = ips.getDynamicProvider((HttpServletRequest) ContextHelper.getObjectModel(this.context).get("portlet-request"));
+
+            // portlet modes
+            final String pmString = (String)copletInstanceData.getTemporaryAttribute("portlet-mode");
+            final PortletMode pm; 
+            if ( pmString == null ) {
+                pm = PortletMode.VIEW;
+            } else {
+                pm = new PortletMode(pmString);
+            }
+            if ( !pm.equals(PortletMode.EDIT) ) {
+                PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
+                url.clearParameters();
+                url.setPortletMode(PortletMode.EDIT);
+                modes.add(new DecorationAction("edit", url.toString()));
+            }
+            if ( !pm.equals(PortletMode.HELP) ) {
+                PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
+                url.clearParameters();
+                url.setPortletMode(PortletMode.HELP);
+                modes.add(new DecorationAction("help", url.toString()));
+            }                
+            if ( !pm.equals(PortletMode.VIEW) ) {
+                PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
+                url.clearParameters();
+                url.setPortletMode(PortletMode.VIEW);
+                modes.add(new DecorationAction("view", url.toString()));
+            }                
+        }
+
+        return modes;
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleWindowStates()
-     */
-    public List getPossibleWindowStates() {
-        // TODO Auto-generated method stub
-        return null;
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleWindowStates(CopletInstanceData)
+     */
+    public List getPossibleWindowStates(CopletInstanceData copletInstanceData) {
+        final List states = new ArrayList();
+        final PortletWindow window = (PortletWindow)copletInstanceData.getTemporaryAttribute("window");
+        if ( window != null && this.portletContainerEnvironment != null) {
+            InformationProviderService ips = (InformationProviderService) this.portletContainerEnvironment.getContainerService(InformationProviderService.class);
+            DynamicInformationProvider dip = ips.getDynamicProvider((HttpServletRequest) ContextHelper.getObjectModel(this.context).get("portlet-request"));
+
+            // Sizing
+            final String wsString = (String)copletInstanceData.getTemporaryAttribute("window-state");
+            final WindowState ws; 
+            if ( wsString == null ) {
+                ws = WindowState.NORMAL;
+            } else {
+                ws = new WindowState(wsString);
+            }
+
+            if ( !ws.equals(WindowState.MINIMIZED) && !ws.equals(WindowState.MAXIMIZED)) {
+                PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
+                url.clearParameters();
+                url.setWindowState(WindowState.MINIMIZED);
+                states.add(new DecorationAction("minimize", url.toString()));
+            }
+
+            if ( !ws.equals(WindowState.NORMAL)) {
+                PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
+                url.clearParameters();
+                url.setWindowState(WindowState.NORMAL);
+                states.add(new DecorationAction("normal", url.toString()));
+            }
+
+            if ( !ws.equals(WindowState.MAXIMIZED)) {
+                PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
+                url.clearParameters();
+                url.setWindowState(WindowState.MAXIMIZED);
+                states.add(new DecorationAction("maximize", url.toString()));
+            }
+        }
+
+        return states;
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java Wed Apr 12 12:47:30 2006
@@ -29,7 +29,6 @@
 import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
 import org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractAspect;
 import org.apache.cocoon.portal.pluto.PortletURLProviderImpl;
-import org.apache.cocoon.portal.pluto.om.PortletWindowImpl;
 import org.apache.cocoon.xml.XMLUtils;
 import org.apache.pluto.om.portlet.PortletDefinition;
 import org.apache.pluto.om.window.PortletWindow;
@@ -125,10 +124,6 @@
                 XMLUtils.createElement(contenthandler, "title", copletInstanceData.getTitle());
             }
         } else {
-            if ( ((PortletWindowImpl)window).getLayout() == null ) {
-                ((PortletWindowImpl)window).setLayout((CopletLayout)layout);
-            }
-
             String title = (String) copletInstanceData.getTemporaryAttribute("dynamic-title");
             if ( title == null ) {
                 final PortletDefinition def = window.getPortletEntity().getPortletDefinition();

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java Wed Apr 12 12:47:30 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.pluto.om;
 
-import org.apache.cocoon.portal.layout.impl.CopletLayout;
+import org.apache.cocoon.portal.coplet.CopletInstanceData;
 import org.apache.pluto.om.common.ObjectID;
 import org.apache.pluto.om.entity.PortletEntity;
 import org.apache.pluto.om.window.PortletWindow;
@@ -30,10 +30,11 @@
     private ObjectID objectId;
     private String id;
     private PortletEntity portletEntity;
-    private CopletLayout layout;
+    private final CopletInstanceData coplet;
 
-    public PortletWindowImpl(String id) {
+    public PortletWindowImpl(CopletInstanceData coplet, String id) {
         this.id = id;
+        this.coplet = coplet;
     }
 
     // PortletWindow implementation.
@@ -79,11 +80,7 @@
         this.portletEntity = portletEntity;
     }
 
-    public CopletLayout getLayout() {
-        return this.layout;
-    }
-
-    public void setLayout(CopletLayout layout) {
-        this.layout = layout;
+    public CopletInstanceData getCopletInstanceData() {
+        return this.coplet;
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java Wed Apr 12 12:47:30 2006
@@ -151,9 +151,8 @@
                 }
             } else {
                 // provider is null or different window, use stored render parameters
-                // check for NP - FIXME we should ensure that the layout is always set
-                if ( window != null && ((PortletWindowImpl)this.window).getLayout() != null) {
-                    final CopletInstanceData cid = ((PortletWindowImpl)this.window).getLayout().getCopletInstanceData();
+                if ( window != null ) {
+                    final CopletInstanceData cid = ((PortletWindowImpl)this.window).getCopletInstanceData();
                     this.portletParameterMap = (Map)cid.getTemporaryAttribute("render-parameters");
                 }
             }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java Wed Apr 12 12:47:30 2006
@@ -16,6 +16,7 @@
 package org.apache.cocoon.portal.wsrp.adapter;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
@@ -54,7 +55,9 @@
 import org.apache.cocoon.portal.PortalService;
 import org.apache.cocoon.portal.coplet.CopletData;
 import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstanceDataFeatures;
 import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
+import org.apache.cocoon.portal.coplet.adapter.DecorationAction;
 import org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter;
 import org.apache.cocoon.portal.event.Event;
 import org.apache.cocoon.portal.event.Receiver;
@@ -81,6 +84,7 @@
 import org.apache.cocoon.xml.AbstractXMLPipe;
 import org.apache.cocoon.xml.AttributesImpl;
 import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.wsrp4j.consumer.GroupSession;
@@ -89,6 +93,7 @@
 import org.apache.wsrp4j.consumer.PortletSession;
 import org.apache.wsrp4j.consumer.Producer;
 import org.apache.wsrp4j.consumer.SessionHandler;
+import org.apache.wsrp4j.consumer.URLGenerator;
 import org.apache.wsrp4j.consumer.User;
 import org.apache.wsrp4j.consumer.UserSession;
 import org.apache.wsrp4j.consumer.WSRPPortlet;
@@ -99,6 +104,7 @@
 import org.apache.wsrp4j.exception.WSRPException;
 import org.apache.wsrp4j.log.LogManager;
 import org.apache.wsrp4j.util.Constants;
+import org.apache.wsrp4j.util.Modes;
 import org.apache.wsrp4j.util.WindowStates;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -131,9 +137,6 @@
     /** Key to store the wsrp user into the coplet instance data object as a temporary attribute. */
     public static final String ATTRIBUTE_NAME_USER = "wsrp-user";
 
-    /** Key to store the layout for the wsrp portlet into the coplet instance data object as a temporary attribute. */
-    public static final String ATTRIBUTE_NAME_LAYOUT = "wsrp-layout";
-
     /** Key to store the wsrp title into the coplet instance data object as a temporary attribute. */
     public static final String ATTRIBUTE_NAME_PORTLET_TITLE = "wsrp-title";
 
@@ -636,8 +639,9 @@
             }
             if (windowState != null) {
                 if ( !windowState.equals(windowSession.getWindowState()) ) {
-                    final Layout layout = (Layout)coplet.getTemporaryAttribute(ATTRIBUTE_NAME_LAYOUT);
+                    
                     final Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
+                    final Layout layout = CopletInstanceDataFeatures.searchLayout(coplet.getId(), rootLayout);
                     final Layout fullScreenLayout = LayoutFeatures.getFullScreenInfo(rootLayout);
                     if ( fullScreenLayout != null 
                          && fullScreenLayout.equals( layout )
@@ -856,19 +860,124 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleCopletModes()
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleCopletModes(CopletInstanceData)
      */
-    public List getPossibleCopletModes() {
-        // TODO Auto-generated method stub
-        return null;
+    public List getPossibleCopletModes(CopletInstanceData copletInstanceData) {
+        final List modes = new ArrayList();
+        final PortletKey portletKey = (PortletKey)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_KEY);
+
+        if ( portletKey != null && this.consumerEnvironment != null ) {
+            final String portletInstanceKey = (String)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_INSTANCE_KEY);
+            final User user = (User)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_USER);
+
+            final WSRPPortlet portlet = this.consumerEnvironment.getPortletRegistry().getPortlet(portletKey);
+            try {
+                SimplePortletWindowSession windowSession = this.getSimplePortletWindowSession(portlet, portletInstanceKey, user);
+                if (  windowSession != null ) {
+                    this.setCurrentCopletInstanceData(copletInstanceData);
+                    final URLGenerator urlGenerator = this.consumerEnvironment.getURLGenerator();
+
+                    final String[] supportedModes = (String[])copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_MODES);
+                    String pm = windowSession.getMode();
+                    if ( pm == null ) {
+                        pm = Modes._view;
+                    }
+                    if ( !pm.equals(Modes._edit) 
+                         && ArrayUtils.contains(supportedModes, Modes._edit) ) {
+                        final Map p = new HashMap();
+                        p.put(Constants.URL_TYPE, Constants.URL_TYPE_RENDER);
+                        p.put(Constants.PORTLET_MODE, Modes._edit);
+
+                        final String link = urlGenerator.getRenderURL(p);
+                        modes.add(new DecorationAction("edit", link));
+                    }
+                    if ( !pm.equals(Modes._help)
+                        && ArrayUtils.contains(supportedModes, Modes._help) ) {
+                        final Map p = new HashMap();
+                        p.put(Constants.URL_TYPE, Constants.URL_TYPE_RENDER);
+                        p.put(Constants.PORTLET_MODE, Modes._help);
+
+                        final String link = urlGenerator.getRenderURL(p);                        
+                        modes.add(new DecorationAction("help", link));
+                    }                
+                    if ( !pm.equals(Modes._view)
+                        && ArrayUtils.contains(supportedModes, Modes._view) ) {
+                        final Map p = new HashMap();
+                        p.put(Constants.URL_TYPE, Constants.URL_TYPE_RENDER);
+                        p.put(Constants.PORTLET_MODE, Modes._view);
+
+                        final String link = urlGenerator.getRenderURL(p);                        
+                        modes.add(new DecorationAction("view", link));
+                    } 
+                }
+            } catch (WSRPException ignore) {
+                // we ignore this
+            } finally {
+                this.setCurrentCopletInstanceData(null);                
+            }
+        }
+        return modes;
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleWindowStates()
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleWindowStates(CopletInstanceData)
      */
-    public List getPossibleWindowStates() {
-        // TODO Auto-generated method stub
-        return null;
+    public List getPossibleWindowStates(CopletInstanceData copletInstanceData) {
+        final List states = new ArrayList();
+        final PortletKey portletKey = (PortletKey)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_KEY);
+
+        if ( portletKey != null && this.consumerEnvironment != null ) {
+            final String portletInstanceKey = (String)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_INSTANCE_KEY);
+            final User user = (User)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_USER);
+
+            final WSRPPortlet portlet = this.consumerEnvironment.getPortletRegistry().getPortlet(portletKey);
+            try {
+                SimplePortletWindowSession windowSession = this.getSimplePortletWindowSession(portlet, portletInstanceKey, user);
+                if (  windowSession != null ) {
+                    this.setCurrentCopletInstanceData(copletInstanceData);
+                    final URLGenerator urlGenerator = this.consumerEnvironment.getURLGenerator();
+
+                    final String[] supportedWindowStates = (String[])copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_WINDOWSTATES);
+                    String ws = windowSession.getWindowState();
+                    if ( ws == null ) {
+                        ws = WindowStates._normal;
+                    }
+
+                    if ( !ws.equals(WindowStates._minimized) 
+                         && ArrayUtils.contains(supportedWindowStates, WindowStates._minimized)) {
+                        final Map p = new HashMap();
+                        p.put(Constants.URL_TYPE, Constants.URL_TYPE_RENDER);
+                        p.put(Constants.WINDOW_STATE, WindowStates._minimized);
+
+                        final String link = urlGenerator.getRenderURL(p);
+                        states.add(new DecorationAction("minimize", link));
+                    }
+                    if ( !ws.equals(WindowStates._normal)
+                          && ArrayUtils.contains(supportedWindowStates, WindowStates._normal)) {
+                        final Map p = new HashMap();
+                        p.put(Constants.URL_TYPE, Constants.URL_TYPE_RENDER);
+                        p.put(Constants.WINDOW_STATE, WindowStates._normal);
+
+                        final String link = urlGenerator.getRenderURL(p);
+                        states.add(new DecorationAction("normal", link));
+                    } 
+                    if ( !ws.equals(WindowStates._maximized)
+                          && ArrayUtils.contains(supportedWindowStates, WindowStates._maximized)) {
+                        final Map p = new HashMap();
+                        p.put(Constants.URL_TYPE, Constants.URL_TYPE_RENDER);
+                        p.put(Constants.WINDOW_STATE, WindowStates._maximized);
+
+                        final String link = urlGenerator.getRenderURL(p);                    
+                        states.add(new DecorationAction("maximize", link));
+                    }
+                }
+            } catch (WSRPException ignore) {
+                // we ignore this
+            } finally {
+                this.setCurrentCopletInstanceData(null);                
+            }
+        }
+        return states;
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java?rev=393585&r1=393584&r2=393585&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java Wed Apr 12 12:47:30 2006
@@ -130,7 +130,6 @@
             // no portlet window, so use a default behaviour
             XMLUtils.createElement(contenthandler, "title", copletInstanceData.getTitle());
         } else {
-            copletInstanceData.setTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_LAYOUT, layout);
             LocalizedString localizedTitle = (LocalizedString)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_TITLE);
             String title;
             if ( localizedTitle == null ) {