Author: dvinnichek Date: 2010-07-07 08:58:34 -0400 (Wed, 07 Jul 2010) New Revision: 23274 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java Log: fix templates for facelets according to JBIDE-6542 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java 2010-07-07 12:55:44 UTC (rev 23273) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java 2010-07-07 12:58:34 UTC (rev 23274) @@ -62,10 +62,10 @@ private VpeCreationData createStub(Element sourceElement, nsIDOMDocument visualDocument) { nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV); container.setAttribute(HTML.ATTR_STYLE, "border: 1px solid gray"); //$NON-NLS-1$ - - String name = sourceElement.getAttribute(Facelets.ATTR_NAME); + final String message; - if (name != null) { + if (sourceElement.hasAttribute(Facelets.ATTR_NAME)) { + String name = sourceElement.getAttribute(Facelets.ATTR_NAME); message = NLS.bind(Messages.UNKNOWN_NAME, name); } else { message = Messages.NAME_NOT_SPECIFIED; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2010-07-07 12:55:44 UTC (rev 23273) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2010-07-07 12:58:34 UTC (rev 23274) @@ -20,6 +20,7 @@ import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -38,20 +39,19 @@ protected void init(Element templateElement) { children = true; modify = false; - this.defineElementName = templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM)!=null?templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM):Facelets.TAG_DEFINE; + this.defineElementName = templateElement.hasAttribute(DEFINE_ELEMENT_NAME_PARAM) ? + templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM) : Facelets.TAG_DEFINE; initTemplateSections(templateElement, false, true, false, false, false); } public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { VpeVisualDomBuilder visualBuilder = pageContext.getVisualBuilder(); VpeIncludeInfo includeInfo = visualBuilder.getCurrentIncludeInfo(); + Element sourceElement = (Element)sourceNode; if (includeInfo != null && includeInfo.getElement() != null) { - String name = ((Element)sourceNode).getAttribute(Facelets.ATTR_NAME); - if (name != null) { - name = name.trim(); - if (name.length() <= 0) name = null; - } - if (name != null) { + String name = sourceElement.hasAttribute(Facelets.ATTR_NAME) ? + sourceElement.getAttribute(Facelets.ATTR_NAME).trim() : Constants.EMPTY; + if (name.length() > 0) { Element defineElement = findDefineElement(includeInfo.getElement(), name); if (defineElement != null) { VpeCreationData creationData = createInsert(defineElement, visualDocument); @@ -72,7 +72,7 @@ return creationData; } } - VpeCreationData creationData = createStub((Element)sourceNode, visualDocument); + VpeCreationData creationData = createStub(sourceElement, visualDocument); creationData.setData(null); return creationData; }