Author: akazakov Date: 2009-05-26 19:31:10 -0400 (Tue, 26 May 2009) New Revision: 15527 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IPageContext.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java Log: https://jira.jboss.org/jira/browse/JBIDE-2808 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IPageContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IPageContext.java 2009-05-26 22:26:25 UTC (rev 15526) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IPageContext.java 2009-05-26 23:31:10 UTC (rev 15527) @@ -51,6 +51,7 @@ /** * Returns map of name spaces which are set in particular offset. + * Key is URI of name space. * @return */ Map<String, INameSpace> getNameSpaces(int offset); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-05-26 22:26:25 UTC (rev 15526) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-05-26 23:31:10 UTC (rev 15527) @@ -99,6 +99,6 @@ Map<String, INameSpace> nameSpaceMap = new HashMap<String, INameSpace>(); nameSpaces.put(region, nameSpaceMap); } - nameSpaces.get(region).put(nameSpace.getPrefix(), nameSpace); + nameSpaces.get(region).put(nameSpace.getURI(), nameSpace); } } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2009-05-26 22:26:25 UTC (rev 15526) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2009-05-26 23:31:10 UTC (rev 15527) @@ -27,7 +27,6 @@ import org.jboss.tools.jst.web.kb.internal.KbXMLStoreConstants; import org.jboss.tools.jst.web.kb.taglib.IAttribute; import org.jboss.tools.jst.web.kb.taglib.IComponent; -import org.jboss.tools.jst.web.kb.taglib.INameSpace; import org.w3c.dom.Element; /** Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-05-26 22:26:25 UTC (rev 15526) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-05-26 23:31:10 UTC (rev 15527) @@ -178,6 +178,14 @@ * @see org.jboss.tools.jst.web.kb.ProposalProcessor#getProposals(org.jboss.tools.jst.web.kb.KbQuery, org.jboss.tools.jst.web.kb.PageContext) */ public TextProposal[] getProposals(KbQuery query, IPageContext context) { + String prefix = null; + Map<String, INameSpace> nameSpaces = context.getNameSpaces(query.getOffset()); + if(nameSpaces!=null) { + INameSpace nameSpace = nameSpaces.get(getURI()); + if(nameSpace!=null) { + prefix = nameSpace.getPrefix(); + } + } List<TextProposal> proposals = new ArrayList<TextProposal>(); IComponent[] components = getComponents(query, context); if(query.getType() == KbQuery.Type.TAG_NAME) { @@ -185,7 +193,7 @@ TextProposal proposal = new TextProposal(); proposal.setContextInfo(components[i].getDescription()); StringBuffer label = new StringBuffer(); - if(query.getPrefix()!=null) { + if(prefix!=null) { label.append(query.getPrefix() + KbQuery.PREFIX_SEPARATOR); } label.append(components[i].getName());