Bug 571530: [SourceEditor] Fix SourceEditorOperationHandler
Backport-of: 12a8f7dcff289245de9115e8dcba9a74638761f8
Change-Id: Idb58be5691f652bc27d441d3883c1c937a962f8e
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/SourceEditorOperationHandler.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/SourceEditorOperationHandler.java
index 96c1148..7d9c17d 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/SourceEditorOperationHandler.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/SourceEditorOperationHandler.java
@@ -20,7 +20,6 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.text.ITextOperationTarget;
-import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
@@ -41,13 +40,14 @@
private final int textOperation;
- public SourceEditorOperationHandler(final ISourceEditor editor, final int viewerOperation) {
+ public SourceEditorOperationHandler(final ISourceEditor editor, final int textOperation) {
this.editor= nonNullAssert(editor);
- this.textOperation= viewerOperation;
+ this.textOperation= textOperation;
}
- public SourceEditorOperationHandler(final int viewerOperation) {
+
+ public SourceEditorOperationHandler(final int textOperation) {
this.editor= null;
- this.textOperation= viewerOperation;
+ this.textOperation= textOperation;
}
@@ -95,7 +95,7 @@
}
final ITextOperationTarget operationTarget= getOperationTarget(editor);
- if (operationTarget != null && operationTarget.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS)) {
+ if (operationTarget != null && operationTarget.canDoOperation(this.textOperation)) {
operationTarget.doOperation(this.textOperation);
}
return null;
