Author: dmaliarevich Date: 2009-04-08 10:14:43 -0400 (Wed, 08 Apr 2009) New Revision: 14606 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java Removed: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 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/VpeDecorateTemplate.java 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.jstl/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4109, VpeDefineContainerTemplate was moved from Facelts plugin to org.jboss.tools.vpe.editor.template, c:import, s:decorate, ui:decorate templates were updated. 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-04-08 13:51:05 UTC (rev 14605) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2009-04-08 14:14:43 UTC (rev 14606) @@ -14,6 +14,7 @@ import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeDefineContainerTemplate; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -27,7 +28,7 @@ Attr attr = ((Element)sourceNode).getAttributeNode(Facelets.ATTR_TEMPLATE); if (attr != null) { - return super.create(pageContext, sourceNode, visualDocument); + return super.createTemplate(attr.getNodeValue(), pageContext, sourceNode, visualDocument); } else { nsIDOMElement composition = visualDocument.createElement(HTML.TAG_DIV); return new VpeCreationData(composition); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java 2009-04-08 13:51:05 UTC (rev 14605) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java 2009-04-08 14:14:43 UTC (rev 14606) @@ -10,44 +10,18 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.facelets.template; -import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; -import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; +import org.jboss.tools.jsf.vpe.facelets.template.util.Facelets; +import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -public class VpeDecorateTemplate extends VpeDefineContainerTemplate { +public class VpeDecorateTemplate extends org.jboss.tools.vpe.editor.template.VpeDefineContainerTemplate{ - protected VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument) { - nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV); - container.setAttribute("style", "border: 1px dashed #2A7F00"); - VpeVisualDomBuilder.markIncludeElement(container); - - nsIDOMElement title = visualDocument.createElement(HTML.TAG_DIV); - nsIDOMElement tag = visualDocument.createElement(HTML.TAG_SPAN); - tag.setAttribute("class", "__any__tag__caption"); - tag.appendChild(visualDocument.createTextNode(sourceElement.getNodeName())); - title.appendChild(tag); - if (fileName != null) { - title.appendChild(visualDocument.createTextNode(fileName)); - } - container.appendChild(title); - - VpeCreationData creationData = new VpeCreationData(container); - - VpeChildrenInfo childrenInfo = new VpeChildrenInfo(container); - NodeList sourceChildren = sourceElement.getChildNodes(); - int len = sourceChildren.getLength(); - for (int i = 0; i < len; i++) { - Node sourceChild = sourceChildren.item(i); - if (sourceChild.getNodeType() == Node.ELEMENT_NODE && "define".equals(sourceChild.getLocalName())) { - childrenInfo.addSourceChild(sourceChild); - } - } - creationData.addChildrenInfo(childrenInfo); - return creationData; + public VpeCreationData create(VpePageContext pageContext, + Node sourceNode, nsIDOMDocument visualDocument) { + String fileName = ((Element)sourceNode).getAttribute(Facelets.ATTR_TEMPLATE); + return createTemplate(fileName, pageContext, sourceNode, visualDocument); } } Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2009-04-08 13:51:05 UTC (rev 14605) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2009-04-08 14:14:43 UTC (rev 14606) @@ -1,349 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jsf.vpe.facelets.template; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.jsf.vpe.facelets.template.util.Facelets; -import org.jboss.tools.vpe.editor.VpeIncludeInfo; -import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; -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.template.VpeCreatorUtil; -import org.jboss.tools.vpe.editor.template.VpeTemplate; -import org.jboss.tools.vpe.editor.template.VpeTemplateManager; -import org.jboss.tools.vpe.editor.util.FileUtil; -import org.jboss.tools.vpe.editor.util.HTML; -import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNamedNodeMap; -import org.mozilla.interfaces.nsIDOMNode; -import org.mozilla.interfaces.nsIDOMNodeList; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -public abstract class VpeDefineContainerTemplate extends VpeAbstractTemplate { - int count = 0; - private static Set<Node> defineContainer = new HashSet<Node>(); - - @Override - protected void init(Element templateElement) { - children = true; - modify = false; - initTemplateSections(templateElement, false, true, false, false, false); - } - - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - String fileName = ((Element)sourceNode).getAttribute(Facelets.ATTR_TEMPLATE); - VpeCreationData creationData = createTemplate(fileName, pageContext, sourceNode, visualDocument); - if (null != creationData) { - return creationData; - } - creationData = createStub(fileName, (Element)sourceNode, visualDocument); - creationData.setData(null); - return creationData; - } - - public VpeCreationData createTemplate(String fileName, VpePageContext pageContext, - Node sourceNode, nsIDOMDocument visualDocument) { - if (fileName != null && fileName.trim().length() > 0) { - IFile file = VpeCreatorUtil.getFile(fileName, pageContext); - if (file != null) { - if (!pageContext.getVisualBuilder().isFileInIncludeStack(file)) { - registerDefine(pageContext, sourceNode); - Document document = pageContext.getVisualBuilder() - .getIncludeDocuments().get(file); - if (document == null) { - document = VpeCreatorUtil.getDocumentForRead(file); - if (document != null) - pageContext.getVisualBuilder() - .getIncludeDocuments().put(file, document); - } - // Document document = - // VpeCreatorUtil.getDocumentForRead(file, pageContext); - if (document != null) { - VpeCreationData creationData = createInclude(document, - visualDocument); - creationData.setData(new TemplateFileInfo(file)); - pageContext.getVisualBuilder().pushIncludeStack( - new VpeIncludeInfo((Element) sourceNode, file, - document)); - // we should add only real nodem, sourceNode can be a - // proxy - // so - if (sourceNode.getFirstChild() != null) { - defineContainer.add(sourceNode.getFirstChild() - .getParentNode()); - } - return creationData; - } - } - } - } - return null; - } - - private String replacePattern(String origStr, String target, - String replacement) { - StringBuilder sb = new StringBuilder(); - String word = "((\\w+)([\\.\\[\\]]*))"; - Matcher m; - String variable; - String signs; - m = Pattern.compile(word).matcher(origStr); - - // everything must be found here - int endIndex = 0; - int startIndex = 0; - while (m.find()) { - variable = m.group(2); - signs = m.group(3); - startIndex = m.start(2); - - if ((startIndex != 0) && (endIndex != 0) - && (endIndex != startIndex)) { - sb.append(origStr.substring(endIndex, startIndex)); - } - - if (target.equals(variable)) { - sb.append(replacement); - } else { - sb.append(variable); - } - sb.append(signs); - endIndex = m.end(3); - } - - // append the tail - if (endIndex != origStr.length()) { - sb.append(origStr.substring(endIndex, origStr.length())); - } - - if (!"".equals(sb.toString())) { - return sb.toString(); - } - return origStr; - } - - private void updateNodeValue(nsIDOMNode node, Map<String, String> paramsMap) { - Set<String> keys = paramsMap.keySet(); - if (null != node) { - String nodeValue = node.getNodeValue(); - String curlyBracketResultPattern = "(" + Pattern.quote("#") - + "\\{(.+?)\\})+?"; - int matcherGroupWithVariable = 2; - - if ((null != nodeValue) && (!"".equals(nodeValue))) { - for (String key : keys) { - Matcher curlyBracketMatcher = Pattern.compile( - curlyBracketResultPattern).matcher(nodeValue); - - String replacement = paramsMap.get(key); - if (replacement.startsWith("#{") - && replacement.endsWith("}")) { - // remove first 2 signs '#{' - replacement = replacement.substring(2); - // remove last '}' sign - replacement = replacement.substring(0, replacement - .length() - 1); - } - - int lastPos = 0; - StringBuilder sb = new StringBuilder(); - lastPos = 0; - sb = new StringBuilder(); - curlyBracketMatcher.reset(nodeValue); - boolean firstFind = false; - boolean find = curlyBracketMatcher.find(); - while (find) { - if (!firstFind) { - firstFind = true; - } - int start = curlyBracketMatcher - .start(matcherGroupWithVariable); - int end = curlyBracketMatcher - .end(matcherGroupWithVariable); - String group = replacePattern(curlyBracketMatcher - .group(matcherGroupWithVariable), key, - replacement); - sb.append(nodeValue.substring(lastPos, start)); - sb.append(group); - lastPos = end; - find = curlyBracketMatcher.find(); - } - if (firstFind) { - sb.append(nodeValue.substring(lastPos, nodeValue - .length())); - nodeValue = sb.toString(); - node.setNodeValue(nodeValue); - } - } - } - } - } - - private void insertParam(nsIDOMNode node, Map<String, String> paramsMap) { - - // update current node value - updateNodeValue(node, paramsMap); - - nsIDOMNamedNodeMap attributes = node.getAttributes(); - if (null != attributes) { - long len = attributes.getLength(); - for (int i = 0; i < len; i++) { - nsIDOMNode item = attributes.item(i); - // update attributes node - updateNodeValue(item, paramsMap); - } - } - - nsIDOMNodeList children = node.getChildNodes(); - if (null != children) { - long len = children.getLength(); - for (int i = 0; i < len; i++) { - nsIDOMNode child = children.item(i); - // update child node - insertParam(child, paramsMap); - } - } - } - - @Override - public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData creationData) { - - Map<String, String> paramsMap = new HashMap<String, String>(); - NodeList sourceChildren = sourceNode.getChildNodes(); - int len = sourceChildren.getLength(); - for (int i = 0; i < len; i++) { - Node sourceChild = sourceChildren.item(i); - if (sourceChild.getNodeType() == Node.ELEMENT_NODE && Facelets.TAG_PARAM.equals(sourceChild.getLocalName())) { - String name = ((Element)sourceChild).getAttribute(Facelets.ATTR_NAME); - String value = ((Element)sourceChild).getAttribute(Facelets.ATTR_VALUE); - paramsMap.put(name, value); - } - } - nsIDOMNode node = creationData.getNode(); - insertParam(node, paramsMap); - - TemplateFileInfo templateFileInfo = (TemplateFileInfo)creationData.getData(); - if (templateFileInfo != null) { - VpeIncludeInfo includeInfo = pageContext.getVisualBuilder().popIncludeStack(); - if (includeInfo != null) { - // VpeCreatorUtil.releaseDocumentFromRead(includeInfo.getDocument()); - } - } - defineContainer.remove(sourceNode); - } - @Override - public void beforeRemove(VpePageContext pageContext, Node sourceNode, nsIDOMNode visualNode, Object data) { - TemplateFileInfo templateFileInfo = (TemplateFileInfo)data; - if (templateFileInfo != null && templateFileInfo.templateFile != null) { - pageContext.getEditPart().getController().getIncludeList().removeIncludeModel(templateFileInfo.templateFile); - } - } - @Override - public boolean recreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement visualNode, Object data, String name, String value) { - - return true; - } - - private void registerDefine(VpePageContext pageContext, Node defineContainer) { - VpeTemplate template = null; - NodeList sourceChildren = defineContainer.getChildNodes(); - int len = sourceChildren.getLength(); - for (int i = 0; i < len; i++) { - Node sourceChild = sourceChildren.item(i); - if (sourceChild.getNodeType() == Node.ELEMENT_NODE && Facelets.TAG_DEFINE.equals(sourceChild.getLocalName())) { - if (template == null) { - VpeTemplateManager templateManager = pageContext.getVisualBuilder().getTemplateManager(); - template = templateManager.getTemplate(pageContext, (Element)sourceChild, null); - if (template == null) { - break; - } - } - pageContext.getVisualBuilder().registerNodes(new VpeElementMapping((Element)sourceChild, null, null, template, null, null)); - } - } - } - - private VpeCreationData createInclude(Document sourceDocument, nsIDOMDocument visualDocument) { - nsIDOMElement visualNewElement = visualDocument.createElement(HTML.TAG_DIV); - VpeVisualDomBuilder.markIncludeElement(visualNewElement); - VpeCreationData creationData = new VpeCreationData(visualNewElement); - VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualNewElement); - NodeList sourceChildren = sourceDocument.getChildNodes(); - int len = sourceChildren.getLength(); - for (int i = 0; i < len; i++) { - childrenInfo.addSourceChild(sourceChildren.item(i)); - } - creationData.addChildrenInfo(childrenInfo); - return creationData; - } - @Override - public boolean containsText() { - return false; - } - - public static boolean isDefineContainer(Node sourceNode) { - - //FIX https://jira.jboss.org/jira/browse/JBIDE-3187 by sdzmitrovich - //TODO: it is necessary to refactor facelet templates -// return defineContainer.contains(sourceNode); - while (sourceNode != null) { - if (defineContainer.contains(sourceNode)) - return true; - - sourceNode = sourceNode.getParentNode(); - } - - return false; - - } - - @Override - public void openIncludeEditor(VpePageContext pageContext, - Element sourceElement, Object data) { - - if (data instanceof TemplateFileInfo) { - FileUtil.openEditor(((TemplateFileInfo) data).getTemplateFile()); - } - } - - protected abstract VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument); - - static class TemplateFileInfo { - private IFile templateFile; - - TemplateFileInfo(IFile templateFile) { - this.templateFile = templateFile; - } - - public IFile getTemplateFile() { - return templateFile; - } - - public void setTemplateFile(IFile templateFile) { - this.templateFile = templateFile; - } - } -} 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 2009-04-08 13:51:05 UTC (rev 14605) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java 2009-04-08 14:14:43 UTC (rev 14606) @@ -13,6 +13,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeDefineContainerTemplate; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF 2009-04-08 13:51:05 UTC (rev 14605) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF 2009-04-08 14:14:43 UTC (rev 14606) @@ -15,8 +15,7 @@ org.eclipse.jst.jsp.core, org.eclipse.wst.html.core, org.jboss.tools.vpe.html, - org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0", - org.jboss.tools.jsf.vpe.facelets;bundle-version="2.1.0" + org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0" Eclipse-LazyStart: true Export-Package: org.jboss.tools.jsf.vpe.jstl.template Bundle-Localization: plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java 2009-04-08 13:51:05 UTC (rev 14605) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java 2009-04-08 14:14:43 UTC (rev 14606) @@ -10,26 +10,20 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jstl.template; -import org.jboss.tools.jsf.vpe.facelets.template.VpeDecorateTemplate; import org.jboss.tools.jsf.vpe.jstl.template.util.Jstl; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeDefineContainerTemplate; import org.mozilla.interfaces.nsIDOMDocument; import org.w3c.dom.Element; import org.w3c.dom.Node; -public class JstlImportTemplate extends VpeDecorateTemplate { +public class JstlImportTemplate extends VpeDefineContainerTemplate { public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { String fileName = ((Element)sourceNode).getAttribute(Jstl.ATTR_URL); - VpeCreationData creationData = createTemplate(fileName, pageContext, sourceNode, visualDocument); - if (null != creationData) { - return creationData; - } - creationData = createStub(fileName, (Element)sourceNode, visualDocument); - creationData.setData(null); - return creationData; + return createTemplate(fileName, pageContext, sourceNode, visualDocument); } } Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java 2009-04-08 14:14:43 UTC (rev 14606) @@ -0,0 +1,20 @@ +package org.jboss.tools.jsf.vpe.seam.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeDefineContainerTemplate; +import org.mozilla.interfaces.nsIDOMDocument; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +public class SeamDecorateTemplate extends VpeDefineContainerTemplate { + + private final String ATTR_TEMPLATE = "template"; //$NON-NLS-1$ + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + String fileName = ((Element) sourceNode).getAttribute(ATTR_TEMPLATE); + return createTemplate(fileName, pageContext, sourceNode, visualDocument); + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2009-04-08 13:51:05 UTC (rev 14605) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2009-04-08 14:14:43 UTC (rev 14606) @@ -101,7 +101,8 @@ </vpe:tag> <vpe:tag name="s:decorate" case-sensitive="yes"> - <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" class="org.jboss.tools.jsf.vpe.facelets.template.VpeDecorateTemplate"> + <vpe:template children="yes" modify="yes" + class="org.jboss.tools.jsf.vpe.seam.template.SeamDecorateTemplate"> </vpe:template> </vpe:tag> Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-04-08 14:14:43 UTC (rev 14606) @@ -0,0 +1,395 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.editor.template; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.eclipse.core.resources.IFile; +import org.jboss.tools.vpe.editor.VpeIncludeInfo; +import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; +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.template.VpeCreatorUtil; +import org.jboss.tools.vpe.editor.template.VpeTemplate; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.jboss.tools.vpe.editor.util.FileUtil; +import org.jboss.tools.vpe.editor.util.HTML; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNamedNodeMap; +import org.mozilla.interfaces.nsIDOMNode; +import org.mozilla.interfaces.nsIDOMNodeList; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public abstract class VpeDefineContainerTemplate extends VpeAbstractTemplate { + int count = 0; + private static Set<Node> defineContainer = new HashSet<Node>(); + + @Override + protected void init(Element templateElement) { + children = true; + modify = false; + initTemplateSections(templateElement, false, true, false, false, false); + } + + public VpeCreationData createTemplate(String includedFileName, + VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + VpeCreationData creationData = null; + if (includedFileName != null && includedFileName.trim().length() > 0) { + IFile file = VpeCreatorUtil.getFile(includedFileName, pageContext); + if (file != null) { + if (!pageContext.getVisualBuilder().isFileInIncludeStack(file)) { + registerDefine(pageContext, sourceNode); + Document document = pageContext.getVisualBuilder() + .getIncludeDocuments().get(file); + if (document == null) { + document = VpeCreatorUtil.getDocumentForRead(file); + if (document != null) + pageContext.getVisualBuilder() + .getIncludeDocuments().put(file, document); + } + // Document document = + // VpeCreatorUtil.getDocumentForRead(file, pageContext); + if (document != null) { + creationData = createInclude(document, visualDocument); + creationData.setData(new TemplateFileInfo(file)); + pageContext.getVisualBuilder().pushIncludeStack( + new VpeIncludeInfo((Element) sourceNode, file, + document)); + /* + * we should add only real node, sourceNode can be a + * proxy so + */ + if (sourceNode.getFirstChild() != null) { + defineContainer.add(sourceNode.getFirstChild() + .getParentNode()); + } + return creationData; + } + } + } + } + /* + * Create a stub when creationData is null. + */ + creationData = createStub(includedFileName, (Element) sourceNode, + visualDocument); + creationData.setData(null); + return creationData; + } + + private String replacePattern(String origStr, String target, + String replacement) { + StringBuilder sb = new StringBuilder(); + String word = "((\\w+)([\\.\\[\\]]*))"; + Matcher m; + String variable; + String signs; + m = Pattern.compile(word).matcher(origStr); + + // everything must be found here + int endIndex = 0; + int startIndex = 0; + while (m.find()) { + variable = m.group(2); + signs = m.group(3); + startIndex = m.start(2); + + if ((startIndex != 0) && (endIndex != 0) + && (endIndex != startIndex)) { + sb.append(origStr.substring(endIndex, startIndex)); + } + + if (target.equals(variable)) { + sb.append(replacement); + } else { + sb.append(variable); + } + sb.append(signs); + endIndex = m.end(3); + } + + // append the tail + if (endIndex != origStr.length()) { + sb.append(origStr.substring(endIndex, origStr.length())); + } + + if (!"".equals(sb.toString())) { + return sb.toString(); + } + return origStr; + } + + private void updateNodeValue(nsIDOMNode node, Map<String, String> paramsMap) { + Set<String> keys = paramsMap.keySet(); + if (null != node) { + String nodeValue = node.getNodeValue(); + String curlyBracketResultPattern = "(" + Pattern.quote("#") + + "\\{(.+?)\\})+?"; + int matcherGroupWithVariable = 2; + + if ((null != nodeValue) && (!"".equals(nodeValue))) { + for (String key : keys) { + Matcher curlyBracketMatcher = Pattern.compile( + curlyBracketResultPattern).matcher(nodeValue); + + String replacement = paramsMap.get(key); + if (replacement.startsWith("#{") + && replacement.endsWith("}")) { + // remove first 2 signs '#{' + replacement = replacement.substring(2); + // remove last '}' sign + replacement = replacement.substring(0, replacement + .length() - 1); + } + + int lastPos = 0; + StringBuilder sb = new StringBuilder(); + lastPos = 0; + sb = new StringBuilder(); + curlyBracketMatcher.reset(nodeValue); + boolean firstFind = false; + boolean find = curlyBracketMatcher.find(); + while (find) { + if (!firstFind) { + firstFind = true; + } + int start = curlyBracketMatcher + .start(matcherGroupWithVariable); + int end = curlyBracketMatcher + .end(matcherGroupWithVariable); + String group = replacePattern(curlyBracketMatcher + .group(matcherGroupWithVariable), key, + replacement); + sb.append(nodeValue.substring(lastPos, start)); + sb.append(group); + lastPos = end; + find = curlyBracketMatcher.find(); + } + if (firstFind) { + sb.append(nodeValue.substring(lastPos, nodeValue + .length())); + nodeValue = sb.toString(); + node.setNodeValue(nodeValue); + } + } + } + } + } + + private void insertParam(nsIDOMNode node, Map<String, String> paramsMap) { + + // update current node value + updateNodeValue(node, paramsMap); + + nsIDOMNamedNodeMap attributes = node.getAttributes(); + if (null != attributes) { + long len = attributes.getLength(); + for (int i = 0; i < len; i++) { + nsIDOMNode item = attributes.item(i); + // update attributes node + updateNodeValue(item, paramsMap); + } + } + + nsIDOMNodeList children = node.getChildNodes(); + if (null != children) { + long len = children.getLength(); + for (int i = 0; i < len; i++) { + nsIDOMNode child = children.item(i); + // update child node + insertParam(child, paramsMap); + } + } + } + + @Override + public void validate(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument, VpeCreationData creationData) { + + Map<String, String> paramsMap = new HashMap<String, String>(); + NodeList sourceChildren = sourceNode.getChildNodes(); + int len = sourceChildren.getLength(); + for (int i = 0; i < len; i++) { + Node sourceChild = sourceChildren.item(i); + if (sourceChild.getNodeType() == Node.ELEMENT_NODE + && "param".equals(sourceChild.getLocalName())) { + String name = ((Element) sourceChild) + .getAttribute(HTML.ATTR_NAME); + String value = ((Element) sourceChild) + .getAttribute(HTML.ATTR_VALUE); + paramsMap.put(name, value); + } + } + nsIDOMNode node = creationData.getNode(); + insertParam(node, paramsMap); + + TemplateFileInfo templateFileInfo = (TemplateFileInfo) creationData + .getData(); + if (templateFileInfo != null) { + VpeIncludeInfo includeInfo = pageContext.getVisualBuilder() + .popIncludeStack(); + if (includeInfo != null) { + // VpeCreatorUtil.releaseDocumentFromRead(includeInfo.getDocument()); + } + } + defineContainer.remove(sourceNode); + } + + @Override + public void beforeRemove(VpePageContext pageContext, Node sourceNode, + nsIDOMNode visualNode, Object data) { + TemplateFileInfo templateFileInfo = (TemplateFileInfo) data; + if (templateFileInfo != null && templateFileInfo.templateFile != null) { + pageContext.getEditPart().getController().getIncludeList() + .removeIncludeModel(templateFileInfo.templateFile); + } + } + + @Override + public boolean recreateAtAttrChange(VpePageContext pageContext, + Element sourceElement, nsIDOMDocument visualDocument, + nsIDOMElement visualNode, Object data, String name, String value) { + + return true; + } + + private void registerDefine(VpePageContext pageContext, Node defineContainer) { + VpeTemplate template = null; + NodeList sourceChildren = defineContainer.getChildNodes(); + int len = sourceChildren.getLength(); + for (int i = 0; i < len; i++) { + Node sourceChild = sourceChildren.item(i); + if (sourceChild.getNodeType() == Node.ELEMENT_NODE + && "define".equals(sourceChild.getLocalName())) { + if (template == null) { + VpeTemplateManager templateManager = pageContext + .getVisualBuilder().getTemplateManager(); + template = templateManager.getTemplate(pageContext, + (Element) sourceChild, null); + if (template == null) { + break; + } + } + pageContext.getVisualBuilder().registerNodes( + new VpeElementMapping((Element) sourceChild, null, + null, template, null, null)); + } + } + } + + private VpeCreationData createInclude(Document sourceDocument, + nsIDOMDocument visualDocument) { + nsIDOMElement visualNewElement = visualDocument + .createElement(HTML.TAG_DIV); + VpeVisualDomBuilder.markIncludeElement(visualNewElement); + VpeCreationData creationData = new VpeCreationData(visualNewElement); + VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualNewElement); + NodeList sourceChildren = sourceDocument.getChildNodes(); + int len = sourceChildren.getLength(); + for (int i = 0; i < len; i++) { + childrenInfo.addSourceChild(sourceChildren.item(i)); + } + creationData.addChildrenInfo(childrenInfo); + return creationData; + } + + @Override + public boolean containsText() { + return false; + } + + public static boolean isDefineContainer(Node sourceNode) { + + // FIX https://jira.jboss.org/jira/browse/JBIDE-3187 by sdzmitrovich + // TODO: it is necessary to refactor facelet templates + // return defineContainer.contains(sourceNode); + while (sourceNode != null) { + if (defineContainer.contains(sourceNode)) + return true; + + sourceNode = sourceNode.getParentNode(); + } + + return false; + + } + + @Override + public void openIncludeEditor(VpePageContext pageContext, + Element sourceElement, Object data) { + + if (data instanceof TemplateFileInfo) { + FileUtil.openEditor(((TemplateFileInfo) data).getTemplateFile()); + } + } + + protected VpeCreationData createStub(String fileName, + Node sourceElement, nsIDOMDocument visualDocument) { + + nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV); + container.setAttribute("style", "border: 1px dashed #2A7F00"); + VpeVisualDomBuilder.markIncludeElement(container); + + nsIDOMElement title = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement tag = visualDocument.createElement(HTML.TAG_SPAN); + tag.setAttribute("class", "__any__tag__caption"); + tag.appendChild(visualDocument.createTextNode(sourceElement.getNodeName())); + title.appendChild(tag); + if (fileName != null) { + title.appendChild(visualDocument.createTextNode(fileName)); + } + container.appendChild(title); + + VpeCreationData creationData = new VpeCreationData(container); + + VpeChildrenInfo childrenInfo = new VpeChildrenInfo(container); + NodeList sourceChildren = sourceElement.getChildNodes(); + int len = sourceChildren.getLength(); + for (int i = 0; i < len; i++) { + Node sourceChild = sourceChildren.item(i); + if (sourceChild.getNodeType() == Node.ELEMENT_NODE + && "define".equals(sourceChild.getLocalName())) { + childrenInfo.addSourceChild(sourceChild); + } + } + creationData.addChildrenInfo(childrenInfo); + return creationData; + } + + static class TemplateFileInfo { + private IFile templateFile; + + TemplateFileInfo(IFile templateFile) { + this.templateFile = templateFile; + } + + public IFile getTemplateFile() { + return templateFile; + } + + public void setTemplateFile(IFile templateFile) { + this.templateFile = templateFile; + } + } +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native