Author: scabanovich Date: 2008-11-21 10:50:48 -0500 (Fri, 21 Nov 2008) New Revision: 11949 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamNamespaces.java Log: JBIDE-2957 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java 2008-11-21 15:49:34 UTC (rev 11948) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java 2008-11-21 15:50:48 UTC (rev 11949) @@ -34,7 +34,7 @@ protected String loadNamespace(Element element, XModelObject object) { NamespaceMapping namespaceMapping = SeamNamespaces.getInstance(object.getModel().getMetaData(), getVersionSuffix(object)).getNamespaceMapping(element); - object.set("namespaceMapping", namespaceMapping.toString()); //$NON-NLS-1$ + object.set(NamespaceMapping.ATTR_NAMESPACE_MAPPING, namespaceMapping.toString()); //$NON-NLS-1$ util.setNamespaceMapping(namespaceMapping); return super.loadNamespace(element, object); @@ -44,7 +44,7 @@ String rootName = getRootName(object); Element element = createRootElement(rootName, null, null); SeamNamespaces.getInstance(object.getModel().getMetaData(), getVersionSuffix(object)).validateNamespaces(object, element); - NamespaceMapping namespaceMapping = NamespaceMapping.load(object.get("namespaceMapping")); //$NON-NLS-1$ + NamespaceMapping namespaceMapping = NamespaceMapping.load(object); util.setNamespaceMapping(namespaceMapping); return serializeToElement(element, object); } Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamNamespaces.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamNamespaces.java 2008-11-21 15:49:34 UTC (rev 11948) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamNamespaces.java 2008-11-21 15:50:48 UTC (rev 11949) @@ -19,7 +19,6 @@ import org.jboss.tools.common.meta.XModelMetaData; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.NamespaceMapping; -import org.jboss.tools.seam.xml.SeamXMLMessages; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -75,7 +74,7 @@ String uri = n.getNodeValue(); String defaultNamespace = getDefaultNamespace(uri); if(defaultNamespace == null) continue; - mapping.addNamespace(defaultNamespace, actualNamespace); + mapping.addNamespace(defaultNamespace, actualNamespace, uri); } } return mapping; @@ -94,7 +93,7 @@ } public void validateNamespaces(XModelObject object, Element element) { - NamespaceMapping namespaceMapping = NamespaceMapping.load(object.get("namespaceMapping")); //$NON-NLS-1$ + NamespaceMapping namespaceMapping = NamespaceMapping.load(object); if(namespaceMapping == null) namespaceMapping = new NamespaceMapping(); StringBuffer loc = new StringBuffer(); loc.append(object.getAttributeValue("xsi:schemaLocation")); //$NON-NLS-1$