Code cleanup.
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartInsertHandler.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartInsertHandler.java
index 3dcecea..0891218 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartInsertHandler.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartInsertHandler.java
@@ -10,8 +10,7 @@
import static org.eclipse.xtext.ui.editor.utils.EditorUtils.getActiveXtextEditor;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.*;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.widgets.Control;
import org.eclipse.xtext.ui.editor.XtextEditor;
@@ -26,15 +25,15 @@
/** {@inheritDoc} */
public final Object execute(ExecutionEvent event) {
XtextEditor activeEditor = getActiveXtextEditor();
- if (activeEditor != null) insertContent(activeEditor);
+ if (activeEditor != null) insertContent(activeEditor, styledTextFrom(activeEditor));
return null;
}
- protected abstract void insertContent(XtextEditor editor);
-
- protected static StyledText styledTextFrom(XtextEditor editor) {
+ private StyledText styledTextFrom(XtextEditor editor) {
Object adapter = editor.getAdapter(Control.class);
if (adapter instanceof StyledText) return (StyledText) adapter;
return null;
}
+
+ protected abstract void insertContent(XtextEditor editor, StyledText styledText);
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartSemicolonHandler.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartSemicolonHandler.java
index 184f4b5..1c661ff 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartSemicolonHandler.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartSemicolonHandler.java
@@ -42,8 +42,7 @@
private final String semicolon = SEMICOLON.toString();
/** {@inheritDoc} */
- @Override protected void insertContent(XtextEditor editor) {
- StyledText styledText = styledTextFrom(editor);
+ @Override protected void insertContent(XtextEditor editor, StyledText styledText) {
int originalCaretOffset = styledText.getCaretOffset();
int lineAtOffset = styledText.getLineAtOffset(originalCaretOffset);
int offsetAtLine = styledText.getOffsetAtLine(lineAtOffset);
