Author: yradtsevich Date: 2009-08-21 12:05:00 -0400 (Fri, 21 Aug 2009) New Revision: 17225 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/messages/Messages.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/messages/messages.properties Log: FIXED - issue JBIDE-4800: template for s:decorate is broken after changing ui:composition https://jira.jboss.org/jira/browse/JBIDE-4800 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2009-08-21 15:10:28 UTC (rev 17224) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2009-08-21 16:05:00 UTC (rev 17225) @@ -45,18 +45,15 @@ protected VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument) { nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV); - container.setAttribute(HTML.ATTR_STYLE, "border: 1px dashed #2A7F00"); //$NON-NLS-1$ VpeVisualDomBuilder.markIncludeElement(container); - final String message; - if (fileName == null) { - message = Messages.TEMPLATE_NOT_SPECIFIED; - } else { - message = NLS.bind(Messages.TEMPLATE_NOT_FOUND, fileName); + if (fileName != null) { + container.setAttribute(HTML.ATTR_STYLE, "border: 1px dashed #2A7F00"); //$NON-NLS-1$ + String message = NLS.bind(Messages.TEMPLATE_NOT_FOUND, fileName); + container.appendChild(FaceletsUtil.createErrorMessageElement( + visualDocument, sourceElement.getNodeName(), message)); } - container.appendChild(FaceletsUtil.createErrorMessageElement( - visualDocument, sourceElement.getNodeName(), message)); return new VpeCreationData(container); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/messages/Messages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/messages/Messages.java 2009-08-21 15:10:28 UTC (rev 17224) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/messages/Messages.java 2009-08-21 16:05:00 UTC (rev 17225) @@ -25,7 +25,6 @@ } private Messages(){} - public static String TEMPLATE_NOT_SPECIFIED; public static String TEMPLATE_NOT_FOUND; public static String UNKNOWN_NAME; public static String NAME_NOT_SPECIFIED; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/messages/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/messages/messages.properties 2009-08-21 15:10:28 UTC (rev 17224) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/messages/messages.properties 2009-08-21 16:05:00 UTC (rev 17225) @@ -1,4 +1,3 @@ -TEMPLATE_NOT_SPECIFIED=Template file is not specified. TEMPLATE_NOT_FOUND=Template file is not found: "{0}" UNKNOWN_NAME=Unknown name: "{0}" NAME_NOT_SPECIFIED=Name is not specified.