Author: sdzmitrovich Date: 2008-08-12 09:54:55 -0400 (Tue, 12 Aug 2008) New Revision: 9666 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java Log: https://jira.jboss.org/jira/browse/JBIDE-2569 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2008-08-12 13:31:48 UTC (rev 9665) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2008-08-12 13:54:55 UTC (rev 9666) @@ -261,10 +261,13 @@ VpeTemplate template = elementMapping.getTemplate(); - if (!template.openBundle(pageContext, visualNode, elementMapping)) - template.openBundleEditors(pageContext, - (Element) elementMapping.getSourceNode(), - elementMapping.getData()); + // as all templates implement new method + template.openBundle(pageContext, visualNode, elementMapping); + // if (!template.openBundle(pageContext, visualNode, + // elementMapping)) + // template.openBundleEditors(pageContext, + // (Element) elementMapping.getSourceNode(), + // elementMapping.getData()); } return false; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2008-08-12 13:31:48 UTC (rev 9665) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2008-08-12 13:54:55 UTC (rev 9666) @@ -122,7 +122,11 @@ isNodeEditable = true; } - + + if (targetVisualNode.getNodeType() != nsIDOMNode.TEXT_NODE + && SelectionUtil.getLastSelectedNode(getPageContext()) == targetVisualNode) + return; + int focusOffset; int length; @@ -294,7 +298,7 @@ // if mapping is elementMapping - SelectionUtil.clearSelection(selectionController); +// SelectionUtil.clearSelection(selectionController); if (nodeMapping instanceof VpeElementMapping) { @@ -373,6 +377,9 @@ int visualNodeAnchorOffcet = TextUtil.visualPosition( ((Node) targetSourceNode).getNodeValue(), anchorOffcetReferenceToSourceNode); + + nsISelection selection = selectionController.getSelection( + nsISelectionController.SELECTION_NORMAL); selectionController.getSelection( nsISelectionController.SELECTION_NORMAL).collapse(