Author: mareshkau Date: 2008-12-10 08:34:53 -0500 (Wed, 10 Dec 2008) New Revision: 12537 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 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/VpeSourceDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java Log: JBIDE-883 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -202,7 +202,6 @@ // private nsIPresShell presShell; private VpeSelectionController visualSelectionController; VpeDomMapping domMapping; - private VpeTemplateManager templateManager; private VpeSourceDomBuilder sourceBuilder; private VpeVisualDomBuilder visualBuilder; /** @@ -278,15 +277,13 @@ } this.visualEditor = visualEditor; visualEditor.setController(this); - templateManager = VpeTemplateManager.getInstance(); bundle = new BundleMap(); bundle.init(sourceEditor); - pageContext = new VpePageContext(templateManager, bundle, editPart); + pageContext = new VpePageContext(bundle, editPart); domMapping = new VpeDomMapping(pageContext); sourceBuilder = new VpeSourceDomBuilder(domMapping, this, - templateManager, sourceEditor, pageContext); - visualBuilder = new VpeVisualDomBuilder(domMapping, this, - templateManager, visualEditor, pageContext); + VpeTemplateManager.getInstance(), sourceEditor, pageContext); + visualBuilder = new VpeVisualDomBuilder(domMapping, this, visualEditor, pageContext); pageContext.setSourceDomBuilder(sourceBuilder); pageContext.setVisualDomBuilder(visualBuilder); IDOMModel sourceModel = (IDOMModel) getModel(); @@ -314,7 +311,7 @@ visualBuilder.refreshExternalLinks(); visualBuilder.buildDom(sourceDocument); - templateManager.addTemplateListener(this); + VpeTemplateManager.getInstance().addTemplateListener(this); xulRunnerEditor = visualEditor.getXulRunnerEditor(); // TODO Sergey Vasilyev figure out with nsIPressShell @@ -419,10 +416,9 @@ switcher.destroyActiveEditor(); switcher = null; - if (templateManager != null) { - templateManager.removeTemplateListener(this); - templateManager = null; - } + + VpeTemplateManager.getInstance().removeTemplateListener(this); + if (visualBuilder != null) { visualBuilder.dispose(); visualBuilder = null; @@ -1504,7 +1500,7 @@ data = editAnyData(sourceEditor, isCorrectNS, data); if (data != null && data.isChanged()) - templateManager.setAnyTemplate(data); + VpeTemplateManager.getInstance().setAnyTemplate(data); } }); @@ -1977,9 +1973,9 @@ if (includeList.includesRefresh()) { visualRefresh(); } - if (templateManager != null) { - templateManager.reload(); - } + + VpeTemplateManager.getInstance().reload(); + if (bundle != null) { bundle.refresh(); if (pageContext != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 2008-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -24,14 +24,12 @@ public class VpeDomBuilder { protected VpeDomMapping domMapping; - protected VpeTemplateManager templateManager; private INodeAdapter sorceAdapter; private List sourceNodes = new ArrayList(); - public VpeDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager) { + public VpeDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter) { this.domMapping = domMapping; this.sorceAdapter = sorceAdapter; - this.templateManager = templateManager; } public VpeDomMapping getDomMapping () { @@ -39,7 +37,7 @@ } public VpeTemplateManager getTemplateManager () { - return templateManager; + return VpeTemplateManager.getInstance(); } public void registerNodes(VpeNodeMapping nodeMapping) { 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-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -46,7 +46,7 @@ * @param pageContext */ public VpePreviewDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, MozillaEditor visualEditor, VpePageContext pageContext) { - super(domMapping, sorceAdapter, templateManager, visualEditor, pageContext); + super(domMapping, sorceAdapter, visualEditor, pageContext); } /** @@ -67,7 +67,7 @@ return null; } getPageContext().setCurrentVisualNode(visualOldContainer); - VpeTemplate template = templateManager.getTemplate(getPageContext(), sourceNode, ifDependencySet); + VpeTemplate template = getTemplateManager().getTemplate(getPageContext(), sourceNode, ifDependencySet); VpeCreationData creationData; //FIX FOR JBIDE-1568, added by Max Areshkau @@ -92,7 +92,7 @@ } }catch (XPCOMException ex) { VpePlugin.getPluginLog().logError(ex); - VpeTemplate defTemplate = templateManager.getDefTemplate(); + VpeTemplate defTemplate = getTemplateManager().getDefTemplate(); creationData = defTemplate.create(getPageContext(), sourceNode, getVisualDocument()); } getPageContext().setCurrentVisualNode(null); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2008-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -58,7 +58,7 @@ private StructuredTextEditor sourceEditor; public VpeSourceDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, StructuredTextEditor sourceEditor, VpePageContext pageContext) { - super(domMapping, sorceAdapter, templateManager); + super(domMapping, sorceAdapter); this.sourceEditor = sourceEditor; structuredTextViewer = sourceEditor.getTextViewer(); outline = (IContentOutlinePage)sourceEditor.getAdapter(IContentOutlinePage.class); @@ -227,7 +227,7 @@ Set ifDependencySet = new HashSet(); //VpeVisualDomBuilder visualBuildet = pageContext.getVisualBuilder(); - VpeTemplate template = templateManager.getTemplate(pageContext, sourceNewElement, ifDependencySet); + VpeTemplate template = getTemplateManager().getTemplate(pageContext, sourceNewElement, ifDependencySet); registerNodes(new VpeElementMapping(sourceNewElement, (nsIDOMElement)visualNewNode, null, template, ifDependencySet, null)); addChildren(visualNewNode, sourceNewElement); return sourceNewElement; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -172,10 +172,10 @@ private boolean showInvisibleTags; public VpeVisualDomBuilder(VpeDomMapping domMapping, - INodeAdapter sorceAdapter, VpeTemplateManager templateManager, + INodeAdapter sorceAdapter, MozillaEditor visualEditor, VpePageContext pageContext) { - super(domMapping, sorceAdapter, templateManager); + super(domMapping, sorceAdapter); this.visualEditor = visualEditor; xulRunnerEditor = visualEditor.getXulRunnerEditor(); @@ -437,7 +437,7 @@ Set<Node> ifDependencySet = new HashSet<Node>(); pageContext.setCurrentVisualNode(visualOldContainer); - VpeTemplate template = templateManager.getTemplate(pageContext, + VpeTemplate template = getTemplateManager().getTemplate(pageContext, sourceNode, ifDependencySet); VpeCreationData creationData = null; @@ -470,7 +470,7 @@ } catch (XPCOMException ex) { VpePlugin.getPluginLog().logError(ex); - VpeTemplate defTemplate = templateManager.getDefTemplate(); + VpeTemplate defTemplate = getTemplateManager().getDefTemplate(); creationData = defTemplate.create(getPageContext(), sourceNode, getVisualDocument()); } @@ -711,7 +711,7 @@ // get template Set<Node> ifDependencySet = new HashSet<Node>(); - VpeTemplate template = templateManager.getTemplate(pageContext, node, + VpeTemplate template = getTemplateManager().getTemplate(pageContext, node, ifDependencySet); // check if invisible tag if (template.isInvisible()) @@ -892,13 +892,10 @@ } } - // if (isEmptyElement(visualContainer)) { - // addPseudoElementImpl(visualContainer); - // } } private void addPseudoElementImpl(nsIDOMNode visualParent) { - if (!templateManager.isWithoutPseudoElementContainer(visualParent + if (!getTemplateManager().isWithoutPseudoElementContainer(visualParent .getNodeName())) { if (VpeDebug.VISUAL_ADD_PSEUDO_ELEMENT) { System.out.println("-------------------- addPseudoElement: " //$NON-NLS-1$ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -65,7 +65,7 @@ WtpKbConnector connector; private nsIDOMNode currentVisualNode; - public VpePageContext(VpeTemplateManager templateManager, BundleMap bundle, VpeEditorPart editPart) { + public VpePageContext(BundleMap bundle, VpeEditorPart editPart) { this.bundle = bundle; this.editPart = editPart; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2008-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -173,7 +173,7 @@ BundleMap bundle = new BundleMap(); bundle.init(getSourceEditor()); - setPageContext(new VpePageContext(getTemplateManager(), bundle, getEditPart())); + setPageContext(new VpePageContext(bundle, getEditPart())); VpeDomMapping domMapping = new VpeDomMapping(getPageContext()); VpeSourceDomBuilder sourceBuilder = new VpeSourceDomBuilder(domMapping, null, getTemplateManager(), getSourceEditor(), getPageContext()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -21,9 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - -import javax.swing.text.Style; - import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; @@ -335,7 +332,7 @@ * @param sourceNode * @return name of template */ - private String getTemplateName(VpePageContext pageContext, Node sourceNode) { + private String getTemplateName(VpePageContext pageContext, Node sourceNode) { if(sourceNode==null) { return null; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java 2008-12-10 11:28:51 UTC (rev 12536) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java 2008-12-10 13:34:53 UTC (rev 12537) @@ -13,11 +13,18 @@ import org.w3c.dom.Node; import org.jboss.tools.vpe.editor.context.VpePageContext; - +/** + * + * @author mareshkau + * + */ public class VpeFunctionParentName extends VpeFunction { - + /** + * Returns parent node name, with changed prefix like in template*.xml File + */ public VpeValue exec(VpePageContext pageContext, Node sourceNode) { Node parentNode = sourceNode.getParentNode(); + return new VpeValue(parentNode != null ? parentNode.getNodeName() : ""); } }