[jbosstools-commits] JBoss Tools SVN: r18310 - branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.

Author: vrubezhny Date: 2009-10-27 12:27:07 -0400 (Tue, 27 Oct 2009) New Revision: 18310 Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java Log: JBIDE-5097: Content assist does not support multiple namespaces with the same uri Issue is fixed for 3.1.0.M4 Modified: branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java =================================================================== --- branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-27 16:20:40 UTC (rev 18309) +++ branches/jbosstools-3.1.0.M4/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2009-10-27 16:27:07 UTC (rev 18310) @@ -19,6 +19,8 @@ public class XmlContextImpl extends ELContextImpl implements IPageContext { protected IDocument document; protected ITagLibrary[] libs; + + // Fix for JBIDE-5097: It must be a map of <IRegion to Map of <NS-Prefix to NS>> protected Map<IRegion, Map<String, INameSpace>> nameSpaces = new HashMap<IRegion, Map<String, INameSpace>>(); protected IResourceBundle[] bundles; private IIncludedContextSupport parentContext = null; @@ -147,7 +149,7 @@ Map<String, INameSpace> nameSpaceMap = new HashMap<String, INameSpace>(); nameSpaces.put(region, nameSpaceMap); } - nameSpaces.get(region).put(nameSpace.getURI(), nameSpace); + nameSpaces.get(region).put(nameSpace.getPrefix(), nameSpace); // Fix for JBIDE-5097 } /**