Author: mareshkau
Date: 2009-02-12 09:56:14 -0500 (Thu, 12 Feb 2009)
New Revision: 13598
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.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-3650
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java 2009-02-12
11:37:02 UTC (rev 13597)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java 2009-02-12
14:56:14 UTC (rev 13598)
@@ -21,7 +21,6 @@
import org.jboss.tools.vpe.editor.mapping.VpeElementData;
import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
-import org.jboss.tools.vpe.editor.selection.VpeSelectionController;
import org.jboss.tools.vpe.editor.util.NodesManagingUtil;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.jboss.tools.vpe.editor.util.TextUtil;
@@ -262,14 +261,14 @@
return true;
}
-
+
editable = nodeData.isEditable()
&& !isBorderPosition(
nodeData.getSourceNode(),
SelectionUtil
.getSourceSelectionRange(getSourceEditor()),
delete);
-
+
}
// if template can't give necessary information
else {
@@ -286,6 +285,7 @@
}
if (editable) {
+
sourceEditor.getTextViewer().getTextWidget().invokeAction(delete);
}
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 2009-02-12
11:37:02 UTC (rev 13597)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2009-02-12
14:56:14 UTC (rev 13598)
@@ -17,6 +17,7 @@
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.eclipse.wst.xml.core.internal.document.TextImpl;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.mapping.NodeData;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
@@ -251,7 +252,7 @@
* source selection to visual selection
*/
final public void refreshVisualSelection() {
- // TODO Max Areshkau Adjust for restoring cursor position
+
IStructuredModel model = null;
try {
@@ -370,13 +371,13 @@
if (focusOffcetReferenceToSourceNode > length
|| anchorOffcetReferenceToSourceNode > length)
return;
-
+ TextImpl sourceTextImpl = (TextImpl) targetSourceNode;
int visualNodeFocusOffcet = TextUtil.visualPosition(
- ((Node) targetSourceNode).getNodeValue(),
+ sourceTextImpl.getValueSource(),
focusOffcetReferenceToSourceNode);
int visualNodeAnchorOffcet = TextUtil.visualPosition(
- ((Node) targetSourceNode).getNodeValue(),
+ sourceTextImpl.getValueSource(),
anchorOffcetReferenceToSourceNode);
nsISelection selection = selectionController.getSelection(