[portal-commits] JBoss Portal SVN: r6974 - in trunk: portlet/src/main/org/jboss/portal/portlet/aspects/portlet and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2007-04-12 07:41:31 -0400 (Thu, 12 Apr 2007)
New Revision: 6974
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java
Log:
Quick fix for keeping the window maximized when triggering a link in a maximized window.
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2007-04-11
18:28:52 UTC (rev 6973)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2007-04-12
11:41:31 UTC (rev 6974)
@@ -129,11 +129,12 @@
//
WindowState windowState = decoder.getWindowState();
+/*
if (windowState == null)
{
windowState = windowNavState.getWindowState();
}
-
+*/
//
Mode mode = decoder.getMode();
if (mode == null)
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java 2007-04-11
18:28:52 UTC (rev 6973)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java 2007-04-12
11:41:31 UTC (rev 6974)
@@ -40,10 +40,12 @@
protected Object invoke(PortletInvocation invocation) throws Exception,
InvocationException
{
+ /*
if (invocation.getPortletContext().getWindowState() == null)
{
throw new InvocationException("No window state has been provided");
}
+ */
// Compute the supported window states
Set windowStates = getWindowStates(invocation);