[jbosstools-commits] JBoss Tools SVN: r4200 - branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template.

Author: mareshkau Date: 2007-10-15 11:54:33 -0400 (Mon, 15 Oct 2007) New Revision: 4200 Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java Log: http://jira.jboss.com/jira/browse/JBIDE-743, also bug when in facelet page after changing attribute on source page on visual page contentd doesn't changed was fixed. Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2007-10-15 15:54:22 UTC (rev 4199) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2007-10-15 15:54:33 UTC (rev 4200) @@ -16,7 +16,6 @@ import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; -import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -39,8 +38,8 @@ return new VpeCreationData(container); } - - public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, Document visualDocument, Node visualNode, Object data, String name, String value) { + @Override + public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument,nsIDOMElement visualNode, Object data, String name, String value) { return true; } } Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2007-10-15 15:54:22 UTC (rev 4199) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2007-10-15 15:54:33 UTC (rev 4200) @@ -12,14 +12,12 @@ import java.util.HashSet; import java.util.Set; - import org.eclipse.core.resources.IFile; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - import org.jboss.tools.vpe.editor.VpeIncludeInfo; import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; import org.jboss.tools.vpe.editor.context.VpePageContext; @@ -36,8 +34,9 @@ public abstract class VpeDefineContainerTemplate extends VpeAbstractTemplate { private static final String ATTR_TEMPLATE = "template"; - private static Set defineContainer = new HashSet(); + private static Set<Node> defineContainer = new HashSet<Node>(); + @Override protected void init(Element templateElement) { children = true; modify = false; @@ -67,8 +66,8 @@ creationData.setData(null); return creationData; } - - public void validate(VpePageContext pageContext, Node sourceNode, Document visualDocument, VpeCreationData creationData) { + @Override + public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData creationData) { TemplateFileInfo templateFileInfo = (TemplateFileInfo)creationData.getData(); if (templateFileInfo != null) { VpeIncludeInfo includeInfo = pageContext.getVisualBuilder().popIncludeStack(); @@ -85,8 +84,9 @@ pageContext.getEditPart().getController().getIncludeList().removeIncludeModel(templateFileInfo.templateFile); } } + @Override + public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement visualNode, Object data, String name, String value) { - public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, Document visualDocument, Node visualNode, Object data, String name, String value) { return true; } @@ -122,7 +122,7 @@ creationData.addChildrenInfo(childrenInfo); return creationData; } - + @Override public boolean containsText() { return false; }