Author: bdaw Date: 2008-07-22 13:44:50 -0400 (Tue, 22 Jul 2008) New Revision: 11545 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/model/portal/navstate/PageNavigationalState.java Log: - merge maps in PageNavigationalState and 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-07-22 16:57:35 UTC (rev 11544) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-07-22 17:44:50 UTC (rev 11545) @@ -31,6 +31,7 @@ import org.jboss.portal.core.CoreConstants; import org.jboss.portal.core.navstate.NavigationalStateContext; import org.jboss.portal.core.model.portal.Window; +import org.jboss.portal.core.model.portal.navstate.PageNavigationalState; import org.jboss.portal.core.controller.coordination.CoordinationManager; import org.jboss.portal.core.controller.coordination.CoordinationStrategy; @@ -69,9 +70,6 @@ private Map<QName, String[]> pageUpdates; /** . */ - private Map<String, String[]> explicitPageUpdates; - - /** . */ private Map<String, HashMap<QName, String[]>> windowPublicNavigationalStateUpdate; public ControllerPageNavigationalState( @@ -180,41 +178,9 @@ } - // + navigationalStateContext.setPageNavigationalState(controllerContext.getPageId(), new org.jboss.portal.core.model.portal.navstate.PageNavigationalState(parameters)); - Map<String, String[]> explicitBindings; - if (storedPNS != null) - { - explicitBindings = new HashMap<String, String[]>(storedPNS.getExplicitBindings()); - } - else - { - explicitBindings = new HashMap<String, String[]>(); - } - if (explicitPageUpdates != null) - { - for (Map.Entry<String, String[]> explicitUpdate : explicitPageUpdates.entrySet()) - { - String[] value = explicitUpdate.getValue(); - - // - if (value.length == 0) - { - explicitBindings.remove(explicitUpdate.getKey()); - } - else - { - explicitBindings.put(explicitUpdate.getKey(), value); - } - } - - // - - } - navigationalStateContext.setPageNavigationalState(controllerContext.getPageId(), new org.jboss.portal.core.model.portal.navstate.PageNavigationalState(parameters, explicitBindings)); - - // pageUpdates.clear(); } @@ -399,7 +365,7 @@ // If this window/qname is binded several times with different updated params value will be unpredictable... for (String binding : bindings) { - explicitParameterValue = getPublicExplicitNavigationalState(binding); + explicitParameterValue = getPublicNavigationalState(new QName(PageNavigationalState.NAMESPACE_EXPLICIT, binding)); } @@ -418,7 +384,7 @@ } else { - //If it is DISABLED strategy check if this is not window publishing the param + //If it is EXPLICIT strategy check if this is not window publishing the param } } @@ -523,14 +489,9 @@ // Explicit bindings Collection<String> bindings = manager.getBindingNames(getWindow(windowName), name); - if (bindings.size() > 0 && explicitPageUpdates == null) - { - explicitPageUpdates = new HashMap<String, String[]>(); - } - for (String binding : bindings) { - explicitPageUpdates.put(binding, value); + setPublicNavigationalState(new QName(PageNavigationalState.NAMESPACE_EXPLICIT, binding), value); } } } @@ -582,35 +543,6 @@ } /** - * - */ - public String[] getPublicExplicitNavigationalState(String name) throws IllegalArgumentException - { - String[] value = null; - - // - if (explicitPageUpdates != null) - { - value = explicitPageUpdates.get(name); - } - - // - if (value == null) - { - org.jboss.portal.core.model.portal.navstate.PageNavigationalState storedPNS = navigationalStateContext.getPageNavigationalState(controllerContext.getPageId()); - - // - if (storedPNS != null) - { - value = storedPNS.getExplicitBinding(name); - } - } - - // - return value != null && value.length > 0 ? value : null; - } - - /** * */ public void setPublicNavigationalState(QName name, String[] value) throws IllegalArgumentException, IllegalStateException Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java 2008-07-22 16:57:35 UTC (rev 11544) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java 2008-07-22 17:44:50 UTC (rev 11545) @@ -36,23 +36,16 @@ public class PageNavigationalState implements Serializable { + public static final String NAMESPACE_EXPLICIT = "org.jboss.portal.core.model.portal.navstate.PageNavigationalState.EXPLICIT"; + /** . */ private final HashMap<QName, String[]> parameters; - private final HashMap<String, String[]> explicitBindings; - public PageNavigationalState(Map<QName, String[]> parameters) { this.parameters = new HashMap<QName, String[]>(parameters); - this.explicitBindings = new HashMap<String, String[]>(); } - public PageNavigationalState(Map<QName, String[]> parameters, Map<String, String[]> explicitBindings) - { - this.parameters = new HashMap<QName, String[]>(parameters); - this.explicitBindings = new HashMap<String, String[]>(explicitBindings); - } - public String[] getParameter(QName name) { return parameters.get(name); @@ -63,13 +56,4 @@ return Collections.unmodifiableMap(parameters); } - public String[] getExplicitBinding(String name) - { - return explicitBindings.get(name); - } - - public Map<String, String[]> getExplicitBindings() - { - return Collections.unmodifiableMap(explicitBindings); - } }