simplify ScriptMergeViewer for adopters
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/compare/RubyMergeViewer.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/compare/RubyMergeViewer.java
index 1b21d0c..571e5cf 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/compare/RubyMergeViewer.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/compare/RubyMergeViewer.java
@@ -12,40 +12,14 @@
package org.eclipse.dltk.ruby.internal.ui.compare;
import org.eclipse.compare.CompareConfiguration;
-import org.eclipse.dltk.ruby.internal.ui.Messages;
-import org.eclipse.dltk.ruby.internal.ui.RubyUI;
+import org.eclipse.dltk.ruby.internal.ui.RubyUILanguageToolkit;
import org.eclipse.dltk.ui.compare.ScriptMergeViewer;
-import org.eclipse.dltk.ui.text.ScriptTextTools;
-import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.widgets.Composite;
public class RubyMergeViewer extends ScriptMergeViewer {
public RubyMergeViewer(Composite parent, CompareConfiguration configuration) {
- super(parent, configuration);
- }
-
- protected ScriptTextTools getTextTools() {
- return RubyUI.getDefault().getTextTools();
- }
-
- /*
- * (non-Javadoc)
- *
- * @seeorg.eclipse.dltk.ruby.internal.ui.compare.ScriptMergeViewer#
- * getPreferenceStore()
- */
- protected IPreferenceStore getPreferenceStore() {
- return RubyUI.getDefault().getPreferenceStore();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.dltk.ui.compare.ScriptMergeViewer#getTitle()
- */
- public String getTitle() {
- return Messages.CompareTitle;
+ super(parent, configuration, RubyUILanguageToolkit.getInstance());
}
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/messages.properties b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/messages.properties
index 04370b1..30630aa 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/messages.properties
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/messages.properties
@@ -1,3 +1,2 @@
InitializeAfterLoadJob_startingDltkRubyInitialization=Starting DLTK Ruby initialization
InitializeAfterLoadJob_initializingDltkRuby=Initializing DLTK Ruby
-CompareTitle=Ruby Compare
