JBoss Tools SVN: r22113 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces: utill and 1 other directory.
4:29 a.m.
Author: mareshkau
Date: 2010-05-17 05:29:51 -0400 (Mon, 17 May 2010)
New Revision: 22113
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java
Log:
Code has been refactored,https://jira.jboss.org/browse/JBIDE-4710
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-17
08:53:42 UTC (rev 22112)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-17
09:29:51 UTC (rev 22113)
@@ -12,18 +12,13 @@
import javax.faces.render.Renderer;
-import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUICommand;
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.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -35,26 +30,11 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.component.ext.renderkit.ButtonRenderer();
VpeUICommand uiComponent = new VpeUICommand(
(Element) sourceNode);
- Node result = VpeRendererUtil.processRenderer(render, uiComponent);
- nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
- result, visualDocument);
- if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
- nsIDOMElement domElement = VisualDomUtil
- .createBorderlessContainer(visualDocument);
- domElement.appendChild(resultVisualNode);
- resultVisualNode = domElement;
- }
- return new VpeCreationData(resultVisualNode);
- } catch (Throwable th) {
- IceFacesActivator.getDefault().logError(th);
- }
- return VpeTemplateManager.getInstance().getDefTemplate().create(
- pageContext, sourceNode, visualDocument);
+ return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-17
08:53:42 UTC (rev 22112)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-17
09:29:51 UTC (rev 22113)
@@ -12,18 +12,13 @@
import javax.faces.render.Renderer;
-import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent;
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.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,26 +31,11 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.TextRenderer();
VpeUIComponent uiComponent = new VpeUIComponent(
(Element) sourceNode);
- Node result = VpeRendererUtil.processRenderer(render, uiComponent);
- nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
- result, visualDocument);
- if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
- nsIDOMElement domElement = VisualDomUtil
- .createBorderlessContainer(visualDocument);
- domElement.appendChild(resultVisualNode);
- resultVisualNode = domElement;
- }
- return new VpeCreationData(resultVisualNode);
- } catch (Throwable th) {
- IceFacesActivator.getDefault().logError(th);
- }
- return VpeTemplateManager.getInstance().getDefTemplate().create(
- pageContext, sourceNode, visualDocument);
+ return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010-05-17
08:53:42 UTC (rev 22112)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010-05-17
09:29:51 UTC (rev 22113)
@@ -12,18 +12,13 @@
import javax.faces.render.Renderer;
-import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent;
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.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -35,26 +30,11 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.CheckboxRenderer();
VpeUIComponent uiComponent = new VpeUIComponent(
(Element) sourceNode);
- Node result = VpeRendererUtil.processRenderer(render, uiComponent);
- nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
- result, visualDocument);
- if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
- nsIDOMElement domElement = VisualDomUtil
- .createBorderlessContainer(visualDocument);
- domElement.appendChild(resultVisualNode);
- resultVisualNode = domElement;
- }
- return new VpeCreationData(resultVisualNode);
- } catch (Throwable th) {
- IceFacesActivator.getDefault().logError(th);
- }
- return VpeTemplateManager.getInstance().getDefTemplate().create(
- pageContext, sourceNode, visualDocument);
+ return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17
08:53:42 UTC (rev 22112)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17
09:29:51 UTC (rev 22113)
@@ -12,18 +12,13 @@
import javax.faces.render.Renderer;
-import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText;
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.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -35,26 +30,11 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.component.ext.renderkit.InputTextRenderer();
VpeHtmlInputText uiComponent = new VpeHtmlInputText(
(Element) sourceNode);
- Node result = VpeRendererUtil.processRenderer(render, uiComponent);
- nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
- result, visualDocument);
- if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
- nsIDOMElement domElement = VisualDomUtil
- .createBorderlessContainer(visualDocument);
- domElement.appendChild(resultVisualNode);
- resultVisualNode = domElement;
- }
- return new VpeCreationData(resultVisualNode);
- } catch (Throwable th) {
- IceFacesActivator.getDefault().logError(th);
- }
- return VpeTemplateManager.getInstance().getDefTemplate().create(
- pageContext, sourceNode, visualDocument);
+ return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument,
render, uiComponent);
}
}
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java
===================================================================
---
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17
08:53:42 UTC (rev 22112)
+++
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17
09:29:51 UTC (rev 22113)
@@ -12,8 +12,13 @@
import javax.faces.component.UIComponent;
import javax.faces.render.Renderer;
+
import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -21,45 +26,77 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import com.icesoft.faces.context.DOMContext;
/**
* Util class for calling real renderers and obtain information from them
*
* @author mareshkau
- *
+ *
*/
public class VpeRendererUtil {
-
-
- public static Node processRenderer(final Renderer render, final UIComponent
uiComponent){
-
-
+
+ public static final VpeCreationData createVisualEditorDate(
+ VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument, final Renderer render,
+ final UIComponent uiComponent) {
try {
+ // VpeFacesContext.getInstance().setResponseWriter(null);
+ // Renderer render = new
+ // com.icesoft.faces.renderkit.dom_html_basic.TextRenderer();
+ // VpeUIComponent uiComponent = new VpeUIComponent(
+ // (Element) sourceNode);
+ Node result = VpeRendererUtil.processRenderer(render, uiComponent);
+ nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
+ result, visualDocument);
+ if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
+ nsIDOMElement domElement = VisualDomUtil
+ .createBorderlessContainer(visualDocument);
+ domElement.appendChild(resultVisualNode);
+ resultVisualNode = domElement;
+ }
+ return new VpeCreationData(resultVisualNode);
+ } catch (Throwable th) {
+ IceFacesActivator.getDefault().logError(th);
+ }
+ return VpeTemplateManager.getInstance().getDefTemplate().create(
+ pageContext, sourceNode, visualDocument);
+ }
+
+ private static Node processRenderer(final Renderer render,
+ final UIComponent uiComponent) {
+
+ try {
render.encodeBegin(VpeFacesContext.getInstance(), uiComponent);
render.encodeEnd(VpeFacesContext.getInstance(), uiComponent);
} catch (Throwable e) {
IceFacesActivator.getDefault().logError(e);
}
- DOMContext domContext = DOMContext.getDOMContext(VpeFacesContext.getInstance(),
uiComponent);
- return
domContext.getRootNode()!=null?domContext.getRootNode():domContext.getCursorParent().getFirstChild();
+ DOMContext domContext = DOMContext.getDOMContext(VpeFacesContext
+ .getInstance(), uiComponent);
+ return domContext.getRootNode() != null ? domContext.getRootNode()
+ : domContext.getCursorParent().getFirstChild();
}
-
- public static final nsIDOMNode createVisualNode(Node srcNode,nsIDOMDocument
visualDocument){
-
+
+ private static final nsIDOMNode createVisualNode(Node srcNode,
+ nsIDOMDocument visualDocument) {
+
nsIDOMNode resultNode = null;
- switch(srcNode.getNodeType()) {
- case Node.TEXT_NODE:{
+ switch (srcNode.getNodeType()) {
+ case Node.TEXT_NODE: {
resultNode = visualDocument.createTextNode(srcNode.getNodeValue());
break;
}
- case Node.ELEMENT_NODE:{
+ case Node.ELEMENT_NODE: {
resultNode = visualDocument.createElement(srcNode.getNodeName());
- copyAttributes((Element)srcNode,
(nsIDOMElement)resultNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
+ copyAttributes((Element) srcNode, (nsIDOMElement) resultNode
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
NodeList chieldNodes = srcNode.getChildNodes();
- for(int i=0;i<chieldNodes.getLength();i++){
- nsIDOMNode chield = createVisualNode(chieldNodes.item(i), visualDocument);
- if(chield!=null) {
+ for (int i = 0; i < chieldNodes.getLength(); i++) {
+ nsIDOMNode chield = createVisualNode(chieldNodes.item(i),
+ visualDocument);
+ if (chield != null) {
resultNode.appendChild(chield);
}
}
@@ -67,13 +104,14 @@
}
return resultNode;
}
-
- private static final void copyAttributes(Element srcElement, nsIDOMElement
visualElement) {
+
+ private static final void copyAttributes(Element srcElement,
+ nsIDOMElement visualElement) {
NamedNodeMap attributeMap = srcElement.getAttributes();
- for(int i=0; i< attributeMap.getLength();i++){
+ for (int i = 0; i < attributeMap.getLength(); i++) {
Node attr = attributeMap.item(i);
visualElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
}
}
-
+
}
5818
days inactive
5818
days old
jbosstools-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbosstools-commits＠lists.jboss.org