Author: vrubezhny Date: 2009-12-04 11:03:56 -0500 (Fri, 04 Dec 2009) New Revision: 19058 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java Log: JBIDE-4877: completion in xhtml should not require namespace to match on tag CA proposal for the tag names calculation is extended Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-12-04 15:59:52 UTC (rev 19057) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-12-04 16:03:56 UTC (rev 19058) @@ -599,7 +599,8 @@ */ /** - * Returns the <code>org.jboss.tools.jst.web.kb.KbQuery</code> instance + * Returns the <code>org.jboss.tools.jst.web.kb.KbQuery</code> instance. The prefix and URI for the tags + * are calculated from the current node * * @param type One of the <code>org.jboss.tools.jst.web.kb.KbQuery.Type</code> values * @param query The value for query @@ -610,6 +611,18 @@ abstract protected KbQuery createKbQuery(Type type, String query, String stringQuery); /** + * Returns the <code>org.jboss.tools.jst.web.kb.KbQuery</code> instance + * + * @param type One of the <code>org.jboss.tools.jst.web.kb.KbQuery.Type</code> values + * @param query The value for query + * @param prefix the prefix for the tag + * @param uri the URI for the tag + * + * @return The <code>org.jboss.tools.jst.web.kb.KbQuery</code> instance + */ + abstract protected KbQuery createKbQuery(Type type, String query, String stringQuery, String prefix, String uri); + + /** * Returns the <code>org.jboss.tools.common.el.core.resolver.ELContext</code> instance * * @return @@ -646,8 +659,7 @@ if (sModel != null) { String baseLocation = sModel.getBaseLocation(); IPath location = new Path(baseLocation).makeAbsolute(); - IFile resource = FileBuffers.getWorkspaceFileAtLocation(location); - return resource; + return FileBuffers.getWorkspaceFileAtLocation(location); } } finally {