Author: ezheleznyakov Date: 2007-08-14 09:22:42 -0400 (Tue, 14 Aug 2007) New Revision: 3118 Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeTemplate.java Log: http://jira.jboss.com/jira/browse/EXIN-435 change using Node to nsIDOMNode and Element to nsIDOMElement for classes: RichFacesToggleControlTemplate RichFacesTreeTemplate Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2007-08-14 13:12:54 UTC (rev 3117) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2007-08-14 13:22:42 UTC (rev 3118) @@ -146,19 +146,7 @@ throw new RuntimeException("Can't get path for " + resourcePathInPlugin); } } - - // TDOD: Evgeny Zheleznyakov delete after work all components - /** - * Adds image as attribute to IMG tag - * - * @param img - * @param fileImageName - */ - public static void setImg(Element img, String fileImageName) { - img.setAttribute("src", "file://" + getAbsoluteResourcePath(fileImageName)); - } - // TDOD: Evgeny Zheleznyakov Do not delete /** * Adds image as attribute to IMG tag * @@ -225,25 +213,11 @@ return getChildren(visualElement, false); } - //TODO: Evgeny zheleznyakov remove or not references /** * Copies all attributes from source node to visual node. * @param sourceNode * @param visualNode */ - public static void copyAttributes(Node sourceNode, Element visualElement) { - NamedNodeMap namedNodeMap = sourceNode.getAttributes(); - for (int i = 0; i < namedNodeMap.getLength(); i++) { - Node attribute = namedNodeMap.item(i); - visualElement.setAttribute(attribute.getNodeName(), attribute.getNodeValue()); - } - } - - /** - * Copies all attributes from source node to visual node. - * @param sourceNode - * @param visualNode - */ public static void copyAttributes(Node sourceNode, nsIDOMElement visualElement) { NamedNodeMap namedNodeMap = sourceNode.getAttributes(); for (int i = 0; i < namedNodeMap.getLength(); i++) { @@ -335,26 +309,6 @@ String s = style.trim(); return style + (s.length() == 0 || s.endsWith(";") ? "" : ";") + element; } - - //TODO: Evgeny zheleznyakov remove or not references - /** Adds image as attribute to IMG tag from users worcpace - * @param pageContext Page Context - * @param img img element to which set picture - * @param fileImageName image name - * @param undefinedImgName default image when image is undefined - */ - public static void setImgFromResources(VpePageContext pageContext,Element img, String fileImageName, String undefinedImgName) { - IEditorInput input = pageContext.getEditPart().getEditorInput(); - IPath inputPath = getInputParentPath(input); - File file=new File(inputPath.toOSString()+File.separator+fileImageName); - if(file.exists()){ - img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, - HtmlComponentUtil.FILE_PROTOCOL+inputPath.toOSString()+ - File.separator+fileImageName); - } else { - img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, undefinedImgName); - } - } /** Adds image as attribute to IMG tag from users worcpace * @param pageContext Page Context Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java 2007-08-14 13:12:54 UTC (rev 3117) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java 2007-08-14 13:22:42 UTC (rev 3118) @@ -19,10 +19,8 @@ import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMNodeList; -import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * Template for Rich Faces separator Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java 2007-08-14 13:12:54 UTC (rev 3117) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java 2007-08-14 13:22:42 UTC (rev 3118) @@ -27,7 +27,8 @@ import org.jboss.tools.vpe.editor.template.VpeTemplate; import org.jboss.tools.vpe.editor.template.VpeToggableTemplate; import org.mozilla.interfaces.nsIDOMDocument; -import org.w3c.dom.Document; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -35,24 +36,16 @@ public class RichFacesToggleControlTemplate extends VpeAbstractTemplate implements VpeToggableTemplate { private static Map toggleMap = new HashMap(); - private static Element storedSwitchSpan = null; - - // TODO A. Yukhovich please fix it - /* - @Override - public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, Document visualDocument, Node visualNode, Object data, String name, String value) { - return true; - } - */ + private static nsIDOMElement storedSwitchSpan = null; - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, Document visualDocument) { + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { Element sourceElement = (Element)sourceNode; - Element span = visualDocument.createElement("span"); + nsIDOMElement span = visualDocument.createElement("span"); storedSwitchSpan = span; - // TODO A. Yukhovich please fix it - VpeCreationData creationData = new VpeCreationData(null/*span*/); + + VpeCreationData creationData = new VpeCreationData(span); String forIds = sourceElement.getAttribute("for"); String value = sourceElement.getAttribute("value"); @@ -69,13 +62,12 @@ span.setAttribute("vpe-user-toggle-id", (switchToState == null ? "" : switchToState.trim())); List<Node> children = ComponentUtil.getChildren(sourceElement); - // TODO A. Yukhovich please fix it - VpeChildrenInfo bodyInfo = new VpeChildrenInfo(null/*span*/); + VpeChildrenInfo bodyInfo = new VpeChildrenInfo(span); //string shoudn't be null, if then it's crash application if(value==null){ value=""; } - Node valueText = visualDocument.createTextNode(value); + nsIDOMNode valueText = visualDocument.createTextNode(value); span.appendChild(valueText); for (Node child : children) { @@ -93,9 +85,9 @@ * @param visualDocument The document of the visual tree. * @param data Object <code>VpeCreationData</code>, built by a method <code>create</code> */ - public void validate(VpePageContext pageContext, Node sourceNode, Document visualDocument, VpeCreationData data) { - // TODO A. Yukhovich please fix it - // super.validate(pageContext, sourceNode, visualDocument, data); + public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData data) { + + super.validate(pageContext, sourceNode, visualDocument, data); if (storedSwitchSpan == null) return; String value = storedSwitchSpan.getAttribute("vpe-user-toggle-id"); @@ -103,12 +95,13 @@ applyAttributeValueOnChildren("vpe-user-toggle-lookup-parent", "true", ComponentUtil.getChildren(storedSwitchSpan)); } - private void applyAttributeValueOnChildren(String attrName, String attrValue, List<Node> children) { + private void applyAttributeValueOnChildren(String attrName, String attrValue, List<nsIDOMNode> children) { if (children == null || attrName == null || attrValue == null) return; - for (Node child : children) { - if (child instanceof Element) { - Element childElement = (Element)child; + for (nsIDOMNode child : children) { + if (child instanceof nsIDOMElement) { + nsIDOMElement childElement = (nsIDOMElement)child + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); childElement.setAttribute(attrName, attrValue); applyAttributeValueOnChildren(attrName, attrValue, ComponentUtil.getChildren(childElement)); } @@ -145,8 +138,6 @@ } } } - - } private List<Element> findElementsById (Element root, String id) { @@ -173,11 +164,4 @@ public void stopToggling(Node sourceNode) { toggleMap.remove(sourceNode); } - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - nsIDOMDocument visualDocument) { - // TODO Auto-generated method stub - return null; - } - } \ No newline at end of file Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java 2007-08-14 13:12:54 UTC (rev 3117) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java 2007-08-14 13:22:42 UTC (rev 3118) @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.StringTokenizer; @@ -21,10 +20,8 @@ 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.template.VpeToggableTemplate; 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; Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeTemplate.java =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeTemplate.java 2007-08-14 13:12:54 UTC (rev 3117) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeTemplate.java 2007-08-14 13:22:42 UTC (rev 3118) @@ -165,9 +165,8 @@ public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData data) { super.validate(pageContext, sourceNode, visualDocument, data); - //TODO: Evgeny Zheleznyakov - nsIDOMNode node = data.getNode(); - revertTableRows(node); + data.getChildrenInfoList().get(0); + revertTableRows(data.getNode()); } /** @@ -242,9 +241,11 @@ * @param node */ private void revertTableRows(nsIDOMNode node) { + try { if (!(node instanceof nsIDOMElement)) { return; } + nsIDOMNodeList list = node.getChildNodes(); if (node.getNodeName().equalsIgnoreCase( HtmlComponentUtil.HTML_TAG_TABLE) @@ -260,6 +261,9 @@ for (int i = 0; i < list2.getLength(); i++) { revertTableRows(list2.item(i)); } + }catch(Throwable t) { + t.printStackTrace(); + } } /** @@ -357,11 +361,8 @@ .equals(name)) { correctImage(pageContext, sourceElement, visualNode); } - } + } - - - @Override public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode,