Author: mareshkau Date: 2008-11-17 05:30:32 -0500 (Mon, 17 Nov 2008) New Revision: 11837 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.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/template/VpeCopyCreator.java Log: JBIDE-3144 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-17 08:35:46 UTC (rev 11836) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -118,9 +118,10 @@ // get atribute's offset //mareshkau because it's node can be a proxy, see JBIDE-3144 - outputAttr = (Attr) ((((Attr)outputAttr).getOwnerElement()).getAttributes().getNamedItem(outputAttr.getLocalName())); + if(!(outputAttr instanceof IDOMAttr)) { + outputAttr = (Attr) ((((Attr)outputAttr).getOwnerElement()).getAttributes().getNamedItem(outputAttr.getLocalName())); + } - int offset = ((IDOMAttr) outputAttr) .getValueRegionStartOffset(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2008-11-17 08:35:46 UTC (rev 11836) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -71,7 +71,7 @@ nsIDOMNode domNode = simpleTextTemplate.getVisualNodeByBySourcePosition(simpleTextMapping, TestUtil.getLinePositionOffcet(itextViewer, 14, 10), 0, domMapping).getFirstChild(); - assertEquals(simpleTextNode ,simpleTextTemplate.getNodeData(domNode, null, domMapping).getSourceNode()); + assertEquals(simpleTextNode ,domMapping.getNearElementMappingAtVisualNode(domNode).getSourceNode()); assertEquals("Node should be a text node", nsIDOMNode.TEXT_NODE,domNode.getNodeType()); //$NON-NLS-1$ assertEquals(simpleTextNode.getNodeValue(), domNode.getNodeValue()); @@ -110,7 +110,7 @@ nsIDOMNode domNode = simpleTextTemplate.getVisualNodeByBySourcePosition(simpleTextMapping, TestUtil.getLinePositionOffcet(itextViewer, 15, 27), 0, domMapping).getFirstChild(); assertEquals("Node should be a text node", nsIDOMNode.TEXT_NODE,domNode.getNodeType()); //$NON-NLS-1$ - assertEquals(simpleTextNode ,simpleTextTemplate.getNodeData(domNode, null, domMapping).getSourceNode()); + assertEquals(simpleTextNode ,domMapping.getNearElementMappingAtVisualNode(domNode).getSourceNode()); assertEquals("Hello", domNode.getNodeValue().trim()); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-11-17 08:35:46 UTC (rev 11836) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -315,6 +315,7 @@ performContentTest("components/treeNodesAdaptor.xhtml");//$NON-NLS-1$ } + @Override protected String getTestProjectName() { return RichFacesAllTests.IMPORT_PROJECT_NAME; } 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-17 08:35:46 UTC (rev 11836) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.regex.Pattern; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Path; @@ -103,10 +101,6 @@ public static final String VPE_USER_TOGGLE_ID = "vpe-user-toggle-id"; //$NON-NLS-1$ public static final String VPE_USER_TOGGLE_LOOKUP_PARENT = "vpe-user-toggle-lookup-parent"; //$NON-NLS-1$ - /** REGEX_EL */ - private static final Pattern REGEX_EL = Pattern.compile( - "[\\$|\\#]\\{.*\\}", Pattern.MULTILINE + Pattern.DOTALL); //$NON-NLS-1$ - private static final String PSEUDO_ELEMENT = "br"; //$NON-NLS-1$ private static final String PSEUDO_ELEMENT_ATTR = "vpe:pseudo-element"; //$NON-NLS-1$ private static final String INIT_ELEMENT_ATTR = "vpe:init-element"; //$NON-NLS-1$ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2008-11-17 08:35:46 UTC (rev 11836) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -134,6 +134,7 @@ private void addAttributes(Element sourceElement, nsIDOMElement visualElement, VpePageContext pageContext) { + NamedNodeMap sourceAttributes = sourceElement.getAttributes(); if (sourceAttributes == null) { return; @@ -142,9 +143,9 @@ for (int i = 0; i < len; i++) { Attr sourceAttr = (Attr) sourceAttributes.item(i); String name = sourceAttr.getName(); + //mareshkau, here we should have access to modified value fix for jbide-3144 + String value = sourceElement.getAttribute(name); - String value = sourceAttr.getValue(); - if (isAttribute(name)) { visualElement.setAttribute(name, value); }