Author: julien(a)jboss.com
Date: 2007-04-27 05:42:02 -0400 (Fri, 27 Apr 2007)
New Revision: 7101
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
trunk/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java
trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java
Log:
- fixed nav state bug
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-04-27
09:02:56 UTC (rev 7100)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-04-27
09:42:02 UTC (rev 7101)
@@ -177,18 +177,18 @@
WindowNavigationalState navigationalState =
(WindowNavigationalState)nsResolver.getAttribute(nsKey);
//
- boolean update = true;
- if (navigationalState != null && navigationalState.getState() instanceof
PortletParametersStateString)
- {
- PortletParametersStateString state =
(PortletParametersStateString)navigationalState.getState();
- if (content.getURI().equals(state.getValue("uri")))
- {
- update = false;
- }
- }
+// boolean update = true;
+// if (navigationalState != null && navigationalState.getState() instanceof
PortletParametersStateString)
+// {
+// PortletParametersStateString state =
(PortletParametersStateString)navigationalState.getState();
+// if (content.getURI().equals(state.getValue("uri")))
+// {
+// update = false;
+// }
+// }
//
- if (update)
+ if (navigationalState == null)
{
PortletParametersStateString state = new PortletParametersStateString();
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java 2007-04-27
09:02:56 UTC (rev 7100)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java 2007-04-27
09:42:02 UTC (rev 7101)
@@ -92,8 +92,8 @@
//
StateString newState = oldNS != null ? oldNS.getState() : null;
- WindowState newWindowState = oldNS != null ? oldNS.getWindowState() : null;
- Mode newMode = oldNS != null ? oldNS.getMode() : null;
+ WindowState newWindowState = oldNS != null ? oldNS.getWindowState() :
WindowState.NORMAL;
+ Mode newMode = oldNS != null ? oldNS.getMode() : Mode.VIEW;
//
if (navigationalState != null)
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2007-04-27
09:02:56 UTC (rev 7100)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2007-04-27
09:42:02 UTC (rev 7101)
@@ -54,6 +54,14 @@
public WindowNavigationalState(WindowState windowState, Mode mode, StateString
navigationalState)
{
+ if (windowState == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (windowState == null)
+ {
+ throw new IllegalArgumentException();
+ }
this.windowState = windowState;
this.mode = mode;
this.state = navigationalState;
Show replies by date