[jbosstools-commits] JBoss Tools SVN: r3003 - in branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets: src/org/jboss/tools/jsf/vpe/facelets/template and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Aug 9 05:23:59 EDT 2007
Author: svasilyev
Date: 2007-08-09 05:23:59 -0400 (Thu, 09 Aug 2007)
New Revision: 3003
Modified:
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
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/VpeDecorateTemplate.java
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/VpeDefineTemplate.java
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java
Log:
http://jira.jboss.org/jira/browse/EXIN-235 old nsIDOM* interfaces were replaced
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2007-08-09 09:23:59 UTC (rev 3003)
@@ -12,7 +12,8 @@
org.jboss.tools.common,
org.jboss.tools.vpe,
org.eclipse.core.resources,
- org.jboss.tools.jst.jsp
+ org.jboss.tools.jst.jsp,
+ org.mozilla.xpcom
Export-Package: org.jboss.tools.jsf.vpe.facelets
Bundle-Version: 2.0.0
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-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -10,23 +10,25 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
+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.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;
-import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
-import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.template.VpeCreationData;
-
public class VpeCompositionTemplate extends VpeDefineContainerTemplate {
- protected VpeCreationData createStub(String fileName, Node sourceElement, Document visualDocument) {
- Element container = visualDocument.createElement("div");
+ 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);
- Element title = visualDocument.createElement("div");
- Element tag = visualDocument.createElement("span");
+ 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);
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -10,24 +10,24 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
-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.VpeVisualDomBuilder;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
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.Node;
+import org.w3c.dom.NodeList;
public class VpeDecorateTemplate extends VpeDefineContainerTemplate {
- protected VpeCreationData createStub(String fileName, Node sourceElement, Document visualDocument) {
- Element container = visualDocument.createElement("div");
+ 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);
- Element title = visualDocument.createElement("div");
- Element tag = visualDocument.createElement("span");
+ 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);
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-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -30,6 +30,9 @@
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.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
public abstract class VpeDefineContainerTemplate extends VpeAbstractTemplate {
private static final String ATTR_TEMPLATE = "template";
@@ -42,7 +45,7 @@
}
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode, Document visualDocument) {
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
String fileName = null;
Attr attr = ((Element)sourceNode).getAttributeNode(ATTR_TEMPLATE);
if (attr != null && attr.getNodeValue().trim().length() > 0) {
@@ -106,8 +109,8 @@
}
}
- private VpeCreationData createInclude(Document sourceDocument, Document visualDocument) {
- Element visualNewElement = visualDocument.createElement("div");
+ 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);
@@ -129,7 +132,7 @@
}
- protected abstract VpeCreationData createStub(String fileName, Node sourceElement, Document visualDocument);
+ protected abstract VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument);
static class TemplateFileInfo {
IFile templateFile;
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -10,16 +10,16 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
+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.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;
-import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
-import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
-import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
-import org.jboss.tools.vpe.editor.template.VpeCreationData;
-
public class VpeDefineTemplate extends VpeAbstractTemplate {
protected void init(Element templateElement) {
@@ -28,9 +28,9 @@
initTemplateSections(templateElement, true, true, true, true, true);
}
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode, Document visualDocument) {
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
if (VpeDefineContainerTemplate.isDefineContainer(sourceNode.getParentNode())) {
- Element visualNewElement = visualDocument.createElement("div");
+ nsIDOMElement visualNewElement = visualDocument.createElement(HTML.TAG_DIV);
return new VpeCreationData(visualNewElement);
}
return createStub((Element)sourceNode, visualDocument);
@@ -44,12 +44,12 @@
return true;
}
- private VpeCreationData createStub(Element sourceElement, Document visualDocument) {
- Element container = visualDocument.createElement("div");
+ private VpeCreationData createStub(Element sourceElement, nsIDOMDocument visualDocument) {
+ nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV);
container.setAttribute("style", "border: 1px solid gray");
- Element title = visualDocument.createElement("div");
- Element tag = visualDocument.createElement("span");
+ 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);
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -10,17 +10,19 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
-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;
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.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;
+import org.w3c.dom.NodeList;
public class VpeInsertTemplate extends VpeAbstractTemplate {
@@ -30,7 +32,7 @@
initTemplateSections(templateElement, false, true, false, false, false);
}
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode, Document visualDocument) {
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
VpeVisualDomBuilder visualBuilder = pageContext.getVisualBuilder();
VpeIncludeInfo includeInfo = visualBuilder.getCurrentIncludeInfo();
if (includeInfo != null && includeInfo.getElement() != null) {
@@ -79,7 +81,7 @@
return defineElement;
}
- private VpeCreationData createInsert(Element defineElement, Document visualDocument) {
+ private VpeCreationData createInsert(Element defineElement, nsIDOMDocument visualDocument) {
VpeCreationData creationData = new VpeCreationData(null);
VpeChildrenInfo childrenInfo = new VpeChildrenInfo(null);
childrenInfo.addSourceChild(defineElement);
@@ -87,8 +89,8 @@
return creationData;
}
- private VpeCreationData createStub(Element element, Document visualDocument) {
- Element visualNewElement = visualDocument.createElement("div");
+ private VpeCreationData createStub(Element element, nsIDOMDocument visualDocument) {
+ nsIDOMElement visualNewElement = visualDocument.createElement(HTML.TAG_DIV);
return new VpeCreationData(visualNewElement);
}
}
More information about the jbosstools-commits
mailing list