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 2004/03/15 15:29:09 UTC
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto PortletURLProviderImpl.java
cziegeler 2004/03/15 06:29:09
Modified: src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl
PortletWindowAspect.java
src/blocks/portal/java/org/apache/cocoon/portal/pluto
PortletURLProviderImpl.java
Log:
Really fixing bug 27518
Revision Changes Path
1.6 +13 -5 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java
Index: PortletWindowAspect.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletWindowAspect.java 15 Mar 2004 11:38:23 -0000 1.5
+++ PortletWindowAspect.java 15 Mar 2004 14:29:09 -0000 1.6
@@ -28,6 +28,8 @@
import org.apache.cocoon.portal.PortalManager;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.event.Event;
+import org.apache.cocoon.portal.event.impl.FullScreenCopletEvent;
import org.apache.cocoon.portal.impl.PortletPortalManager;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.impl.CopletLayout;
@@ -117,26 +119,32 @@
ws = WindowState.NORMAL;
}
- if ( !ws.equals(WindowState.MINIMIZED) ) {
+ Event fullScreenEvent = null;
+ if ( ws.equals(WindowState.MAXIMIZED) ) {
+ fullScreenEvent = new FullScreenCopletEvent( copletInstanceData, null );
+ }
+
+ if ( !ws.equals(WindowState.MINIMIZED) && !ws.equals(WindowState.MAXIMIZED)) {
PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
url.clearParameters();
url.setWindowState(WindowState.MINIMIZED);
- XMLUtils.createElement(contenthandler, "minimize-uri", url.toString());
+ XMLUtils.createElement(contenthandler, "minimize-uri", url.toString(fullScreenEvent));
}
if ( !ws.equals(WindowState.NORMAL)) {
PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
url.clearParameters();
url.setWindowState(WindowState.NORMAL);
- XMLUtils.createElement(contenthandler, "maximize-uri", url.toString());
+ XMLUtils.createElement(contenthandler, "maximize-uri", url.toString(fullScreenEvent));
}
if ( !ws.equals(WindowState.MAXIMIZED)) {
+ fullScreenEvent = new FullScreenCopletEvent( copletInstanceData, layout );
PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
url.clearParameters();
url.setWindowState(WindowState.MAXIMIZED);
- XMLUtils.createElement(contenthandler, "fullscreen-uri", url.toString());
+ XMLUtils.createElement(contenthandler, "fullscreen-uri", url.toString(fullScreenEvent));
}
// portlet modes
1.3 +4 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
Index: PortletURLProviderImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletURLProviderImpl.java 5 Mar 2004 13:02:14 -0000 1.2
+++ PortletURLProviderImpl.java 15 Mar 2004 14:29:09 -0000 1.3
@@ -187,7 +187,9 @@
//TODO - secure
List l = new ArrayList();
- l.add(additionalEvent);
+ if ( additionalEvent != null ) {
+ l.add(additionalEvent);
+ }
l.add(this);
return linkService.getLinkURI(l);