cziegeler 2004/03/15 03:38:23
Modified: . status.xml
src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl
PortletWindowAspect.java
Log:
<action dev="CZ" type="fix" fixes-bug="27518" due-to="Michal Durdina"
due-to-email="[EMAIL PROTECTED]">
Portal: Fix problems with minimizing/maximizing of portlets.
</action>
Revision Changes Path
1.280 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- status.xml 15 Mar 2004 10:31:37 -0000 1.279
+++ status.xml 15 Mar 2004 11:38:23 -0000 1.280
@@ -212,6 +212,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="fix" fixes-bug="27518" due-to="Michal Durdina"
due-to-email="[EMAIL PROTECTED]">
+ Portal: Fix problems with minimizing/maximizing of portlets.
+ </action>
<action dev="CZ" type="fix" fixes-bug="26566" due-to="Simon Mieth"
due-to-email="[EMAIL PROTECTED]">
Portal: Fix problems with the portal block and using the CLI.
</action>
1.5 +8 -24
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletWindowAspect.java 15 Mar 2004 10:31:37 -0000 1.4
+++ PortletWindowAspect.java 15 Mar 2004 11:38:23 -0000 1.5
@@ -28,10 +28,6 @@
import org.apache.cocoon.portal.PortalManager;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.coplet.status.SizingStatus;
-import org.apache.cocoon.portal.event.Event;
-import
org.apache.cocoon.portal.event.impl.ChangeCopletInstanceAspectDataEvent;
-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;
@@ -115,46 +111,34 @@
InformationProviderService ips =
(InformationProviderService)
this.environment.getContainerService(InformationProviderService.class);
DynamicInformationProvider dip =
ips.getDynamicProvider((HttpServletRequest)
context.getObjectModel().get("portlet-request"));
- Event event;
-
// Sizing
WindowState ws =
(WindowState)copletInstanceData.getAttribute("window-state");
if ( ws == null ) {
ws = WindowState.NORMAL;
}
- if ( ws.equals(WindowState.NORMAL) ) {
- event = new
ChangeCopletInstanceAspectDataEvent(copletInstanceData, "size",
SizingStatus.STATUS_MINIMIZED);
+ if ( !ws.equals(WindowState.MINIMIZED) ) {
PortletURLProviderImpl url =
(PortletURLProviderImpl)dip.getPortletURLProvider(window);
url.clearParameters();
url.setWindowState(WindowState.MINIMIZED);
- XMLUtils.createElement(contenthandler, "minimize-uri",
url.toString(event));
+ XMLUtils.createElement(contenthandler, "minimize-uri",
url.toString());
}
- if ( ws.equals(WindowState.MINIMIZED)) {
- event = new
ChangeCopletInstanceAspectDataEvent(copletInstanceData, "size",
SizingStatus.STATUS_MAXIMIZED);
+ if ( !ws.equals(WindowState.NORMAL)) {
PortletURLProviderImpl url =
(PortletURLProviderImpl)dip.getPortletURLProvider(window);
url.clearParameters();
url.setWindowState(WindowState.NORMAL);
- XMLUtils.createElement(contenthandler, "maximize-uri",
url.toString(event));
+ XMLUtils.createElement(contenthandler, "maximize-uri",
url.toString());
}
- final Layout fullScreenLayout =
service.getComponentManager().getProfileManager().getEntryLayout();
- if ( fullScreenLayout != null && fullScreenLayout.equals(
layout )) {
- event = new FullScreenCopletEvent( copletInstanceData,
null );
- PortletURLProviderImpl url =
(PortletURLProviderImpl)dip.getPortletURLProvider(window);
- url.clearParameters();
- url.setWindowState(WindowState.NORMAL);
- XMLUtils.createElement(contenthandler, "fullscreen-uri",
url.toString(event));
- } else {
- event = new FullScreenCopletEvent( copletInstanceData,
layout );
+ if ( !ws.equals(WindowState.MAXIMIZED)) {
PortletURLProviderImpl url =
(PortletURLProviderImpl)dip.getPortletURLProvider(window);
url.clearParameters();
url.setWindowState(WindowState.MAXIMIZED);
- XMLUtils.createElement(contenthandler, "fullscreen-uri",
url.toString(event));
+ XMLUtils.createElement(contenthandler, "fullscreen-uri",
url.toString());
}
-
+
// portlet modes
PortletMode pm =
(PortletMode)copletInstanceData.getAttribute("portlet-mode");
if ( pm == null ) {
