Author: mareshkau Date: 2011-03-21 08:17:39 -0400 (Mon, 21 Mar 2011) New Revision: 29916 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java Log: https://issues.jboss.org/browse/JBIDE-8603 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java 2011-03-21 10:04:22 UTC (rev 29915) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java 2011-03-21 12:17:39 UTC (rev 29916) @@ -41,22 +41,22 @@ XulRunnerEditor xulRunnerEditor = controller.getXulRunnerEditor(); int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), 1, 6); part.getSourceEditor().getTextViewer().setSelectedRange(position, 0); - assertTrue("Show be selected Text Node",xulRunnerEditor.getSelectedElement().getNodeType()==nsIDOMNode.TEXT_NODE); //$NON-NLS-1$ + assertTrue("Show be selected Text Node",getSelectedNode(xulRunnerEditor).getNodeType()==nsIDOMNode.TEXT_NODE); //$NON-NLS-1$ position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), 1, 7); part.getSourceEditor().getTextViewer().setSelectedRange(position, 0); - assertTrue("Selected should be Element Node",xulRunnerEditor.getSelectedElement().getNodeType()==nsIDOMNode.ELEMENT_NODE); //$NON-NLS-1$ + assertTrue("Selected should be Element Node",getSelectedNode(xulRunnerEditor).getNodeType()==nsIDOMNode.ELEMENT_NODE); //$NON-NLS-1$ position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), 1, 15); part.getSourceEditor().getTextViewer().setSelectedRange(position, 0); - assertTrue("Selected should be Text Node",xulRunnerEditor.getSelectedElement().getNodeType()==nsIDOMNode.TEXT_NODE); //$NON-NLS-1$ + assertTrue("Selected should be Text Node",getSelectedNode(xulRunnerEditor).getNodeType()==nsIDOMNode.TEXT_NODE); //$NON-NLS-1$ position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), 1, 20); part.getSourceEditor().getTextViewer().setSelectedRange(position, 0); - assertTrue("Selected should be Text Node",xulRunnerEditor.getSelectedElement().getNodeType()==nsIDOMNode.TEXT_NODE); //$NON-NLS-1$ + assertTrue("Selected should be Text Node",getSelectedNode(xulRunnerEditor).getNodeType()==nsIDOMNode.TEXT_NODE); //$NON-NLS-1$ position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), 1, 25); part.getSourceEditor().getTextViewer().setSelectedRange(position, 0); - assertTrue("Selected should be Text Node",xulRunnerEditor.getSelectedElement().getNodeType()==nsIDOMNode.TEXT_NODE); //$NON-NLS-1$ + assertTrue("Selected should be Text Node",getSelectedNode(xulRunnerEditor).getNodeType()==nsIDOMNode.TEXT_NODE); //$NON-NLS-1$ position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), 1, 26); part.getSourceEditor().getTextViewer().setSelectedRange(position, 0); - assertTrue("Selected should be Element Node",xulRunnerEditor.getSelectedElement().getNodeType()==nsIDOMNode.ELEMENT_NODE); //$NON-NLS-1$ + assertTrue("Selected should be Element Node",getSelectedNode(xulRunnerEditor).getNodeType()==nsIDOMNode.ELEMENT_NODE); //$NON-NLS-1$ } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java 2011-03-21 10:04:22 UTC (rev 29915) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java 2011-03-21 12:17:39 UTC (rev 29916) @@ -67,7 +67,7 @@ int focusOffcetInSourceDocument = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), srcLine, srcLinePos); part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(focusOffcetInSourceDocument); vpeController.getPageContext().getSourceBuilder().getStructuredTextViewer().setSelectedRange(focusOffcetInSourceDocument, 0); - nsIDOMNode lastSelectedNode = vpeController.getXulRunnerEditor().getSelectedElement(); + nsIDOMNode lastSelectedNode = getSelectedNode(vpeController.getXulRunnerEditor()); NodeImpl sourceSelectedNode=null; //was selected source el if(attributeName!=null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2011-03-21 10:04:22 UTC (rev 29915) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2011-03-21 12:17:39 UTC (rev 29916) @@ -134,7 +134,7 @@ } private nsIDOMElement getSelectedElement() { - if(vpeController.getXulRunnerEditor().getLastSelectedNodes().size()!=1) return null; + if(vpeController.getXulRunnerEditor().getSelectedNodes().size()!=1) return null; return vpeController.getXulRunnerEditor().getSelectedElement(); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2011-03-21 10:04:22 UTC (rev 29915) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2011-03-21 12:17:39 UTC (rev 29916) @@ -346,7 +346,7 @@ public static nsIDOMNode getSelectedNode(VpePageContext pageContext) { nsIDOMNode domNode=null; List<nsIDOMNode> selectedNodes = pageContext.getVisualBuilder().getXulRunnerEditor() - .getLastSelectedNodes(); + .getSelectedNodes(); if(selectedNodes!=null&&selectedNodes.size()>0){ domNode=selectedNodes.get(0); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-03-21 10:04:22 UTC (rev 29915) +++ trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-03-21 12:17:39 UTC (rev 29916) @@ -379,7 +379,7 @@ TestUtil.delay(50); - assertNotNull(xulRunnerEditor.getSelectedElement()); + assertNotNull(getSelectedNode(xulRunnerEditor)); nsIDOMNode sample; if (nodeMapping.getSourceNode().getNodeType() == Node.TEXT_NODE @@ -391,7 +391,7 @@ sample = nodeMapping.getVisualNode(); } - assertEquals(sample, xulRunnerEditor.getSelectedElement()); + assertEquals(sample, getSelectedNode(xulRunnerEditor)); } } } @@ -464,4 +464,12 @@ protected String getEditorID(){ return EDITOR_ID; } + /** + * @author mareshkau + * @param xulRunnerEditor + * @return first node in nodes selection, if it selected + */ + protected static nsIDOMNode getSelectedNode(XulRunnerEditor xulRunnerEditor){ + return (xulRunnerEditor.getSelectedNodes().size()>0)?xulRunnerEditor.getSelectedNodes().get(0):null; + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2011-03-21 10:04:22 UTC (rev 29915) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2011-03-21 12:17:39 UTC (rev 29916) @@ -252,7 +252,7 @@ // return getElementForNode(lastSelectedNode); // } - public List<nsIDOMNode> getLastSelectedNodes() { + public List<nsIDOMNode> getSelectedNodes() { if(selectedNodes==null){ selectedNodes=Collections.<nsIDOMNode>emptyList(); } @@ -434,7 +434,7 @@ // } // } List<FlasherData> flasherDatas = new ArrayList<FlasherData>(); - for (nsIDOMNode domNode : getLastSelectedNodes()) { + for (nsIDOMNode domNode : getSelectedNodes()) { flasherDatas.add(prepareFlasherData(domNode)); } drawElementOutline(flasherDatas); @@ -544,8 +544,8 @@ */ public nsIDOMElement getSelectedElement(){ nsIDOMElement resizeElement = null; - if(getLastSelectedNodes()!=null&&getLastSelectedNodes().size()>0){ - resizeElement =getElementForNode(getLastSelectedNodes().get(0)); + if(getSelectedNodes()!=null&&getSelectedNodes().size()>0){ + resizeElement =getElementForNode(getSelectedNodes().get(0)); } return resizeElement; } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java 2011-03-21 10:04:22 UTC (rev 29915) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java 2011-03-21 12:17:39 UTC (rev 29916) @@ -51,7 +51,7 @@ viewer.setSelectedRange(startSelectionOffcet, length); VpeController vpeController = TestUtil.getVpeController(part); vpeController.sourceSelectionChanged(); - List<nsIDOMNode> selectedNodes = vpeController.getXulRunnerEditor().getLastSelectedNodes(); + List<nsIDOMNode> selectedNodes = vpeController.getXulRunnerEditor().getSelectedNodes(); assertEquals("Shuld be selected ",3,selectedNodes.size()); //$NON-NLS-1$ }