Author: julien(a)jboss.com Date: 2008-04-14 08:18:16 -0400 (Mon, 14 Apr 2008) New Revision: 10577 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java Log: move the inital window state and mode in ControllerPageNavigationalState Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-04-14 12:13:34 UTC (rev 10576) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-04-14 12:18:16 UTC (rev 10577) @@ -182,6 +182,10 @@ { return new WindowNavigationalState(wns.getContentState(), wns.getMode(), wns.getWindowState()); } + else + { + return new WindowNavigationalState(null, window.getInitialMode(), window.getInitialWindowState()); + } } // Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-04-14 12:13:34 UTC (rev 10576) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-04-14 12:18:16 UTC (rev 10577) @@ -177,12 +177,6 @@ WindowNavigationalState windowNS = rendererContext.getNavigationalState(); // - if (windowNS == null) - { - windowNS = new WindowNavigationalState(null, window.getInitialMode(), window.getInitialWindowState()); - } - - // Map<String, String> windowProps = new HashMap<String, String>(window.getProperties()); Mode mode = windowNS.getMode(); WindowState windowState = windowNS.getWindowState();