LANG: refactor pref handling for LangSourceViewer and LSVC.

GoClipse · Jun 1, 2015 · e7b7d9e · e7b7d9e
1 parent a356721
commit e7b7d9e
Show file tree

Hide file tree

Showing 23 changed files with 425 additions and 611 deletions.
diff --git a/...ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java b/...ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java
@@ -12,7 +12,7 @@
 package _org.eclipse.jdt.internal.ui.text.java.hover;
 
 import melnorme.lang.ide.ui.editor.ILangEditorTextHover;
-import melnorme.lang.ide.ui.editor.WordFinder;
+import melnorme.lang.ide.ui.text.util.WordFinder;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DefaultInformationControl;

diff --git a/...ide.ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/LangInformationProvider.java b/...ide.ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/LangInformationProvider.java
@@ -11,7 +11,7 @@
 package _org.eclipse.jdt.internal.ui.text.java.hover;
 
 import melnorme.lang.ide.ui.editor.BestMatchHover;
-import melnorme.lang.ide.ui.text.util.JavaWordFinder;
+import melnorme.lang.ide.ui.text.util.WordFinder;
 
 import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.IRegion;
@@ -38,7 +38,7 @@ public LangInformationProvider(IEditorPart editor) {
 	public IRegion getSubject(ITextViewer textViewer, int offset) {
 
 		if (textViewer != null)
-			return JavaWordFinder.findWord(textViewer.getDocument(), offset);
+			return WordFinder.findWord(textViewer.getDocument(), offset);
 
 		return null;
 	}

diff --git a/...src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java b/...src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
@@ -165,7 +165,7 @@ public SourceViewerInformationControl(Shell parent, boolean isResizable, int ori
 		// Source viewer
 		IPreferenceStore store= LangUIPlugin.getInstance().getCombinedPreferenceStore();
 
-		fViewer= new LangSourceViewer(composite, null, null, false, textStyle, store);
+		fViewer= new LangSourceViewer(composite, null, null, false, textStyle);
 		fViewer.configure(EditorSettings_Actual.createSimpleSourceViewerConfiguration(store, getColorManager()));
 
 		fViewer.setEditable(false);

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/AbstractLangEditor.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/AbstractLangEditor.java
@@ -138,13 +138,10 @@ protected void alterCombinedPreferenceStores_beforeEditorsUI(List<IPreferenceSto
 	@Override
 	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
 		AbstractLangSourceViewerConfiguration langSVC = getSourceViewerConfiguration_asLang();
-		if(langSVC != null) {
-			langSVC.handlePropertyChangeEvent(event);
-		}
 
-		ISourceViewerExt sourceViewer = getSourceViewer_asExt();
+		if(langSVC != null) {
-		if(sourceViewer != null) {
+			LangSourceViewer sourceViewer = getSourceViewer_();
-			sourceViewer.handlePropertyChangeEvent_2(event, getPreferenceStore());
+			langSVC.handlePropertyChange(event, getPreferenceStore(), sourceViewer);
 		}
 
 		super.handlePreferenceStoreChanged(event);
@@ -188,9 +185,8 @@ public ISourceViewerExt getSourceViewer_asExt() {
 	}
 
 	protected LangSourceViewer doCreateSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
-		IPreferenceStore store = getPreferenceStore();
 		LangSourceViewer viewer = 
-				new LangSourceViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles, store);
+				new LangSourceViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles);
 		// ensure decoration support has been created and configured.
 		getSourceViewerDecorationSupport(viewer);
 		return viewer;

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/BestMatchHover.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/BestMatchHover.java
@@ -17,6 +17,7 @@
 
 import melnorme.lang.ide.ui.LangEditorTextHoversRegistry;
 import melnorme.lang.ide.ui.LangUIPlugin;
+import melnorme.lang.ide.ui.text.util.WordFinder;
 
 import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.IRegion;

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/ISourceViewerExt.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/ISourceViewerExt.java
@@ -11,17 +11,13 @@
 package melnorme.lang.ide.ui.editor;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
 import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.util.PropertyChangeEvent;
 
 public interface ISourceViewerExt extends ISourceViewer {
 
 	IContentAssistant getContentAssistant();
 
-	void handlePropertyChangeEvent_2(PropertyChangeEvent event, IPreferenceStore prefStore);
-
 	void showOutline() throws CoreException;
 
 }