Author: scabanovich Date: 2009-09-25 10:07:44 -0400 (Fri, 25 Sep 2009) New Revision: 17743 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2009-09-25 14:07:01 UTC (rev 17742) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2009-09-25 14:07:44 UTC (rev 17743) @@ -10,6 +10,7 @@ org.jboss.tools.common, org.jboss.tools.vpe, org.mozilla.xpcom, + org.jboss.tools.jst.web, org.jboss.tools.jst.jsp, org.eclipse.wst.sse.core, org.eclipse.jst.jsp.core, Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java 2009-09-25 14:07:01 UTC (rev 17742) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java 2009-09-25 14:07:44 UTC (rev 17743) @@ -12,7 +12,6 @@ import java.util.List; -import org.jboss.tools.jst.web.tld.TaglibData; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; @@ -53,12 +52,8 @@ for (int i = 0; i < children.getLength(); i++) { Node child = children.item(i); String sourcePrefix = child.getPrefix(); - List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode, - pageContext); - TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix( - sourcePrefix, taglibs); - if (null != sourceNodeTaglib) { - String sourceNodeUri = sourceNodeTaglib.getUri(); + if (XmlUtil.hasTaglib(sourceNode, pageContext, sourcePrefix)) { + String sourceNodeUri = XmlUtil.getTaglibUri(sourceNode, pageContext, sourcePrefix); if ((child.getNodeType() == Node.ELEMENT_NODE) && (VisualDomUtil.JSF_CORE_URI.equalsIgnoreCase(sourceNodeUri) || VisualDomUtil.JSF_HTML_URI.equalsIgnoreCase(sourceNodeUri)