Author: julien(a)jboss.com
Date: 2007-04-03 08:27:57 -0400 (Tue, 03 Apr 2007)
New Revision: 6907
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java
trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowRenderCommand.java
trunk/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowMarkupResponse.java
Log:
remove unnecessary state in UpdateWindowMarkupResponse as it may lead to incorrect usage
Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java 2007-04-03
12:23:07 UTC (rev 6906)
+++
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java 2007-04-03
12:27:57 UTC (rev 6907)
@@ -48,7 +48,6 @@
import org.jboss.portal.theme.page.WindowResult;
import org.jboss.portal.theme.page.PageResult;
import org.jboss.portal.theme.render.RenderContext;
-import org.jboss.portal.theme.render.PageRenderContext;
import org.jboss.portal.theme.render.WindowRenderContext;
import org.jboss.portal.theme.render.DecorationRenderContext;
import org.jboss.portal.theme.render.PortletRenderContext;
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowRenderCommand.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowRenderCommand.java 2007-04-03
12:23:07 UTC (rev 6906)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowRenderCommand.java 2007-04-03
12:27:57 UTC (rev 6907)
@@ -119,6 +119,6 @@
//
- return new UpdateWindowMarkupResponse(windowId, oldNS, newNS);
+ return new UpdateWindowMarkupResponse(windowId);
}
}
\ No newline at end of file
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowMarkupResponse.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowMarkupResponse.java 2007-04-03
12:23:07 UTC (rev 6906)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowMarkupResponse.java 2007-04-03
12:27:57 UTC (rev 6907)
@@ -23,9 +23,6 @@
package org.jboss.portal.core.model.portal.command.response;
import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.portal.core.model.portal.ns.WindowNavigationalState;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -37,46 +34,18 @@
/** . */
private final PortalObjectId windowId;
- /** If not null indicate the previous state. */
- private final WindowNavigationalState oldNavigationalState;
- /** Indicate the current state. */
- private final WindowNavigationalState newNavigationalState;
-
-
- public UpdateWindowMarkupResponse(PortalObjectId windowId, WindowNavigationalState
oldNavigationalState, WindowNavigationalState newNavigationalState)
+ public UpdateWindowMarkupResponse(PortalObjectId windowId)
{
if (windowId == null)
{
throw new IllegalArgumentException();
}
this.windowId = windowId;
- this.oldNavigationalState = oldNavigationalState;
- this.newNavigationalState = newNavigationalState;
}
public PortalObjectId getWindowId()
{
return windowId;
}
-
- public WindowState getOldWindowState()
- {
- return oldNavigationalState != null ? oldNavigationalState.getWindowState() :
null;
- }
-
- public WindowState getNewWindowState()
- {
- return newNavigationalState.getWindowState();
- }
-
- public Mode getOldMode()
- {
- return oldNavigationalState != null ? oldNavigationalState.getMode() : null;
- }
-
- public Mode getNewMode()
- {
- return newNavigationalState.getMode();
- }
}
Show replies by date