Author: sdzmitrovich Date: 2008-12-15 10:24:52 -0500 (Mon, 15 Dec 2008) New Revision: 12593 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/util/SelectionUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-3384 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-12-15 15:10:28 UTC (rev 12592) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2008-12-15 15:24:52 UTC (rev 12593) @@ -103,6 +103,7 @@ } else { + isNodeEditable = false; targetSourceNode = elementMapping.getSourceNode(); } 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 2008-12-15 15:10:28 UTC (rev 12592) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2008-12-15 15:24:52 UTC (rev 12593) @@ -192,11 +192,12 @@ // gets visual selection range Point sourceRange = new Point(0, 0); // converts to source selection - if (sourceNode != null) { + if ((sourceNode != null) && (sourceNode.getNodeValue() != null)) { sourceRange.x = TextUtil.sourcePosition(sourceNode.getNodeValue(), focusedNode.getNodeValue(), selection.getFocusOffset()); sourceRange.y = TextUtil.sourcePosition(sourceNode.getNodeValue(), - focusedNode.getNodeValue(), selection.getAnchorOffset()) - sourceRange.x; + focusedNode.getNodeValue(), selection.getAnchorOffset()) + - sourceRange.x; } return sourceRange; }