Author: akazakov Date: 2009-03-17 12:04:18 -0400 (Tue, 17 Mar 2009) New Revision: 14238 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteTaglibInserter.java Log: https://jira.jboss.org/jira/browse/JBIDE-4035 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteTaglibInserter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteTaglibInserter.java 2009-03-17 15:41:21 UTC (rev 14237) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteTaglibInserter.java 2009-03-17 16:04:18 UTC (rev 14238) @@ -189,17 +189,18 @@ Properties tl = getPrefixes(v); if(tl == null) tl = PaletteInsertHelper.getPrefixes(d.get()); Element root = xmlDocument.getDocumentElement(); - // for xhtml facelets - if (root != null && xmlDocument.getDoctype() != null /* && tagLibListConainsFacelet(tl)*/ ) { - String publicId = xmlDocument.getDoctype().getPublicId(); - if (publicId!=null && publicId.toUpperCase().startsWith("-//W3C//DTD XHTML")) { // && root.getNodeName().equalsIgnoreCase(HTML_SOURCE_ROOT_ELEMENT)) { + if(root != null) { + // for xhtml and jsp:root + if (xmlDocument.getDoctype() != null /* && tagLibListConainsFacelet(tl)*/ ) { + String publicId = xmlDocument.getDoctype().getPublicId(); + if (publicId!=null && publicId.toUpperCase().startsWith("-//W3C//DTD XHTML")) { // && root.getNodeName().equalsIgnoreCase(HTML_SOURCE_ROOT_ELEMENT)) { + checkTL(root, v, p, d); + return true; + } + } else if(xmlDocument.isXMLType() || root.getNodeName().equals(JSP_SOURCE_ROOT_ELEMENT)) { checkTL(root, v, p, d); return true; } - // for jsp:root - } else if (root != null && root.getNodeName().equals(JSP_SOURCE_ROOT_ELEMENT)) { - checkTL(root, v, p, d); - return true; } } finally { if (model != null) model.releaseFromRead();