[portal-commits] JBoss Portal SVN: r11559 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: model/portal/command/view and 1 other directories.

Author: julien(a)jboss.com Date: 2008-07-23 09:54:37 -0400 (Wed, 23 Jul 2008) New Revision: 11559 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/command/view/ViewPageCommand.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java Log: use directly empty namespace and remove explicit namespace declaration 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-23 13:52:37 UTC (rev 11558) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-07-23 13:54:37 UTC (rev 11559) @@ -36,6 +36,7 @@ import org.jboss.portal.core.controller.coordination.CoordinationStrategy; import javax.xml.namespace.QName; +import javax.xml.XMLConstants; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -362,7 +363,7 @@ // If this window/qname is binded several times with different updated params value will be unpredictable... for (String binding : bindings) { - explicitParameterValue = getPublicNavigationalState(new QName(PageNavigationalState.NAMESPACE_EXPLICIT, binding)); + explicitParameterValue = getPublicNavigationalState(new QName(XMLConstants.DEFAULT_NS_PREFIX, binding)); } // @@ -482,7 +483,7 @@ for (String binding : bindings) { - setPublicNavigationalState(new QName(PageNavigationalState.NAMESPACE_EXPLICIT, binding), value); + setPublicNavigationalState(new QName(XMLConstants.DEFAULT_NS_PREFIX, binding), value); } } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2008-07-23 13:52:37 UTC (rev 11558) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2008-07-23 13:54:37 UTC (rev 11559) @@ -36,6 +36,7 @@ import org.jboss.portal.common.util.ParameterMap; import javax.xml.namespace.QName; +import javax.xml.XMLConstants; import java.util.Map; import java.util.Collections; import java.util.HashMap; @@ -114,7 +115,7 @@ // for (Map.Entry<String, String[]> entry : parameters.entrySet()) { - state.put(new QName(PageNavigationalState.NAMESPACE_EXPLICIT, entry.getKey()), entry.getValue()); + state.put(new QName(XMLConstants.DEFAULT_NS_PREFIX, entry.getKey()), entry.getValue()); } // 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-23 13:52:37 UTC (rev 11558) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java 2008-07-23 13:54:37 UTC (rev 11559) @@ -23,7 +23,6 @@ package org.jboss.portal.core.model.portal.navstate; import javax.xml.namespace.QName; -import javax.xml.XMLConstants; import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -38,9 +37,6 @@ { /** . */ - public static final String NAMESPACE_EXPLICIT = XMLConstants.NULL_NS_URI; // "urn:jboss:portal:coordination:explicit"; - - /** . */ private final HashMap<QName, String[]> parameters; public PageNavigationalState(Map<QName, String[]> parameters)