Author: mareshkau Date: 2008-11-13 12:24:38 -0500 (Thu, 13 Nov 2008) New Revision: 11768 Removed: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IVpeTemplateAdvice.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java Log: JBIDE-3144 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2008-11-13 16:54:24 UTC (rev 11767) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2008-11-13 17:24:38 UTC (rev 11768) @@ -18,6 +18,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; +import org.jboss.tools.vpe.editor.proxy.VpeProxyUtil; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.template.VpeTemplate; import org.jboss.tools.vpe.editor.template.VpeTemplateManager; @@ -58,17 +59,9 @@ */ @Override protected nsIDOMNode createNode(Node sourceNode, nsIDOMNode visualOldContainer) { -// boolean registerFlag = isCurrentMainDocument(); -// switch (sourceNode.getNodeType()) { -// case Node.ELEMENT_NODE: -// Map xmlnsMap = createXmlns((Element)sourceNode); - Set ifDependencySet = new HashSet(); + + Set<?> ifDependencySet = new HashSet(); - /* - * Setting current visual node was added - * to fix h:dataTable content visibility on Preview tab. - * http://jira.jboss.com/jira/browse/JBIDE-2059 - */ if(sourceNode==null||( sourceNode.getNodeType()!=Node.TEXT_NODE &&sourceNode.getNodeType()!=Node.ELEMENT_NODE @@ -82,8 +75,8 @@ //FIX FOR JBIDE-1568, added by Max Areshkau try { if (ElService.getInstance().isCloneableNode(getPageContext(), sourceNode)) { - final Node sourceNodeClone = sourceNode.cloneNode(true); - template.beforeTemplateCreated(getPageContext(), sourceNodeClone, getVisualDocument()); + final Node sourceNodeClone = VpeProxyUtil.createProxyForELExpressionNode(getPageContext(), + sourceNode); creationData = template.create(getPageContext(), sourceNodeClone, getVisualDocument()); } else { creationData = template.create(getPageContext(), sourceNode, getVisualDocument()); @@ -101,9 +94,7 @@ setTooltip((Element)sourceNode, (nsIDOMElement)visualNewNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); } -// if (!isCurrentMainDocument() && visualNewElement != null) { -// setReadOnlyElement(visualNewElement); -// } + if (template.isChildren()) { List<?> childrenInfoList = creationData.getChildrenInfoList(); @@ -124,19 +115,6 @@ getPageContext().setCurrentVisualNode(null); return visualNewNode; -// case Node.TEXT_NODE: -// return createTextNode(sourceNode, registerFlag); -// case Node.COMMENT_NODE: -// if(!YES_STRING.equals(VpePreference.SHOW_COMMENTS.getValue())) { -// return null; -// } -// nsIDOMElement visualNewComment = createComment(sourceNode); -// if (registerFlag) { -// registerNodes(new VpeNodeMapping(sourceNode, visualNewComment)); -// } -// return visualNewComment; -// } -// return null; } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-11-13 16:54:24 UTC (rev 11767) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-11-13 17:24:38 UTC (rev 11768) @@ -14,14 +14,12 @@ import java.util.HashSet; import java.util.List; -import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.eclipse.wst.xml.core.internal.document.ElementImpl; -import org.eclipse.wst.xml.core.internal.document.TextImpl; import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; @@ -37,17 +35,14 @@ import org.jboss.tools.vpe.editor.template.resize.VpeResizer; import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData; import org.jboss.tools.vpe.editor.util.Constants; -import org.jboss.tools.vpe.editor.util.ElService; import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMText; -import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; @@ -1452,49 +1447,6 @@ return false; } - - /** - * After template created. - * - * @param visualDocument the visual document - * @param sourceNode the source node - * @param pageContext the page context - */ - public void afterTemplateCreated(VpePageContext pageContext, nsIDOMElement source, nsIDOMDocument visualDocument) { - - } - - public void beforeTemplateCreated(VpePageContext pageContext, Node sourceNode, nsIDOMDocument domDocument) { - IFile file = null; - //Fix for JBIDE-3030 - if(pageContext.getVisualBuilder().getCurrentIncludeInfo()!=null) { - file = pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile(); - } - if ((file != null)) { - // Node first((Element - if (sourceNode.getNodeType() == Node.TEXT_NODE) { - sourceNode.setNodeValue( - ElService.getInstance().replaceElAndResources(pageContext, sourceNode)); - } - final NamedNodeMap nodeMap = sourceNode.getAttributes(); - - if ((nodeMap != null) && (nodeMap.getLength() > 0)) { - for (int i = 0; i < nodeMap.getLength(); i++) { - final Attr n = (Attr) nodeMap.item(i); - - n.setValue(ElService.getInstance().replaceElAndResources(pageContext,n)); - - } - if ((sourceNode.getChildNodes() != null) && (sourceNode.getChildNodes().getLength() > 0)) { - for (int j = 0; j < sourceNode.getChildNodes().getLength(); j++) { - beforeTemplateCreated(pageContext, sourceNode.getChildNodes().item(j), domDocument); - } - } - } - - } - } - public boolean isInvisible() { return invisible; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2008-11-13 16:54:24 UTC (rev 11767) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2008-11-13 17:24:38 UTC (rev 11768) @@ -20,7 +20,6 @@ import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData; -import org.jboss.tools.vpe.editor.util.IVpeTemplateAdvice; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -30,7 +29,7 @@ import org.w3c.dom.Node; -public interface VpeTemplate extends IVpeTemplateAdvice { +public interface VpeTemplate { /** * Initiates template after its creating Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IVpeTemplateAdvice.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IVpeTemplateAdvice.java 2008-11-13 16:54:24 UTC (rev 11767) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IVpeTemplateAdvice.java 2008-11-13 17:24:38 UTC (rev 11768) @@ -1,26 +0,0 @@ -package org.jboss.tools.vpe.editor.util; - -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.w3c.dom.Node; - -/** - * The Interface IVpeTemplateAdvice. - */ -public interface IVpeTemplateAdvice { - - - /** - * After template created. - * - * @param visualDocument the visual document - * @param sourceNode the source node - * @param pageContext the page context - */ - void afterTemplateCreated(VpePageContext pageContext, nsIDOMElement sourceNode, - nsIDOMDocument visualDocument); - - - void beforeTemplateCreated(VpePageContext pageContext,Node sourceNode,nsIDOMDocument domDocument); -}