Author: julien(a)jboss.com Date: 2008-04-11 16:54:23 -0400 (Fri, 11 Apr 2008) New Revision: 10541 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerStateControllerContext.java Log: start to integrate a bit the public nav state Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java 2008-04-11 20:51:17 UTC (rev 10540) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java 2008-04-11 20:54:23 UTC (rev 10541) @@ -127,7 +127,7 @@ NavigationalStateContext nsContext = (NavigationalStateContext)controllerContext.getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE); // - this.stateControllerContext = new ControllerStateControllerContext(nsContext, windows); + this.stateControllerContext = new ControllerStateControllerContext(nsContext, this); this.eventControllerContext = new CoreEventControllerContext(); this.controllerContext = controllerContext; this.windows = windows; Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerStateControllerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerStateControllerContext.java 2008-04-11 20:51:17 UTC (rev 10540) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerStateControllerContext.java 2008-04-11 20:54:23 UTC (rev 10541) @@ -40,12 +40,14 @@ private final NavigationalStateContext navigationalStateContext; /** . */ - private final Map<String, Window> windows; + private final ControllerPortletControllerContext controllerContext; - public ControllerStateControllerContext(NavigationalStateContext navigationalStateContext, Map<String, Window> windows) + public ControllerStateControllerContext( + NavigationalStateContext navigationalStateContext, + ControllerPortletControllerContext controllerContext) { this.navigationalStateContext = navigationalStateContext; - this.windows = windows; + this.controllerContext = controllerContext; } public PageNavigationalState clonePageNavigationalState(PageNavigationalState pageNavigationalState, boolean mutable) @@ -55,6 +57,6 @@ public PageNavigationalState createPageNavigationalState(boolean mutable) { - return new ControllerPageNavigationalState(navigationalStateContext, windows, mutable); + return new ControllerPageNavigationalState(navigationalStateContext, controllerContext, mutable); } }