[jbosstools-commits] JBoss Tools SVN: r11771 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directories.

Author: mareshkau Date: 2008-11-13 13:44:32 -0500 (Thu, 13 Nov 2008) New Revision: 11771 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java Log: JBIDE-3163 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-11-13 18:37:20 UTC (rev 11770) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-11-13 18:44:32 UTC (rev 11771) @@ -42,6 +42,7 @@ * @param element * @return */ + @Override public Attr getOutputAttributeNode(Element element) { if (element.hasAttribute(JSF.ATTR_VALUE)) 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-11-13 18:37:20 UTC (rev 11770) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-13 18:44:32 UTC (rev 11771) @@ -524,15 +524,18 @@ && (data.getNodesData() != null) && (data.getNodesData().size() > 0)) { - Element sourceElement = (Element) sourceNode; - for (org.jboss.tools.vpe.editor.mapping.NodeData nodeData : data .getNodesData()) { if (nodeData.getSourceNode() != null) { - - Attr attr = sourceElement.getAttributeNode(nodeData + Node attr = null; + if(sourceNode.getAttributes()!=null) { + attr = sourceNode.getAttributes().getNamedItem(nodeData .getSourceNode().getNodeName()); + } else { + //Text node haven't child nodes, but it's node. + attr = sourceNode; + } nodeData.setSourceNode(attr); nodeData.setEditable(false); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java 2008-11-13 18:37:20 UTC (rev 11770) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java 2008-11-13 18:44:32 UTC (rev 11771) @@ -13,9 +13,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.NodeData; -import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeElementData; -import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.util.HTML; @@ -48,30 +46,12 @@ //TODO Max Areshkau think may be we shouldn't use span nsIDOMElement element = visualDocument.createElement(HTML.TAG_SPAN); element.appendChild(visualNewTextNode); - - return new VpeCreationData(element); - } - - /* (non-Javadoc) - * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getNodeData(org.mozilla.interfaces.nsIDOMNode, org.jboss.tools.vpe.editor.mapping.VpeElementData, org.jboss.tools.vpe.editor.mapping.VpeDomMapping) - */ - @Override - public NodeData getNodeData(nsIDOMNode node, VpeElementData elementData, - VpeDomMapping domMapping) { - - NodeData result; - VpeNodeMapping nodeMapping = domMapping.getNearNodeMapping(node); - - nsIDOMNode textNode; - if(node.getNodeType()==nsIDOMNode.ELEMENT_NODE) { - textNode = node.getFirstChild(); - } else { - textNode = node; - } - - result = new NodeData(nodeMapping.getSourceNode(),textNode,true); - return result; - } - - + + VpeElementData textElementData = new VpeElementData(); + NodeData nodeData = new NodeData(sourceNode, visualNewTextNode); + textElementData.addNodeData(nodeData); + VpeCreationData result = new VpeCreationData(element); + result.setElementData(textElementData); + return result; + } }