[*-Editor] Adapt to refactored TextStyleManager
Change-Id: Ib03ece1e2bc153648da0dcec5288787866aa94cc
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfiguration.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfiguration.java
index e1d8e29..581cbd4 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfiguration.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/sourceediting/LtxSourceViewerConfiguration.java
@@ -22,6 +22,7 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.IAutoEditStrategy;
import org.eclipse.jface.text.ITextDoubleClickStrategy;
+import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.information.IInformationProvider;
import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
import org.eclipse.jface.text.reconciler.IReconciler;
@@ -84,7 +85,8 @@
public LtxSourceViewerConfiguration(final DocContentSections documentContentInfo, final int flags,
final SourceEditor editor,
- final TexCoreAccess access, final IPreferenceStore preferenceStore, final PreferenceStoreTextStyleManager textStyles) {
+ final TexCoreAccess access, final IPreferenceStore preferenceStore,
+ final PreferenceStoreTextStyleManager<TextAttribute> textStyles) {
super(documentContentInfo, flags, editor);
setCoreAccess(access);
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxDefaultTextStyleScanner.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxDefaultTextStyleScanner.java
index a741d70..2200663 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxDefaultTextStyleScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxDefaultTextStyleScanner.java
@@ -33,6 +33,7 @@
import org.eclipse.statet.ecommons.collections.IntArrayMap;
import org.eclipse.statet.ecommons.text.core.input.DocumentParserInput;
import org.eclipse.statet.ecommons.text.ui.presentation.TextStyleManager;
+import org.eclipse.statet.ecommons.text.ui.presentation.TextStyleManager.TextStyleToken;
import org.eclipse.statet.docmlet.tex.core.parser.LtxLexer;
@@ -44,7 +45,7 @@
private final LtxLexer lexer;
private final IToken[] tokens;
- private final TextStyleManager textStyles;
+ private final TextStyleManager<?> textStyles;
private final IToken defaultToken;
private @Nullable IToken nextToken;
private final Map<CharArrayString, IToken> specialWords;
@@ -53,7 +54,7 @@
private int currentLength;
- public LtxDefaultTextStyleScanner(final TextStyleManager textStyles) {
+ public LtxDefaultTextStyleScanner(final TextStyleManager<?> textStyles) {
this.lexer= createLexer();
this.lexer.setReportAsterisk(false);
this.textStyles= textStyles;
@@ -71,7 +72,7 @@
return new LtxLexer();
}
- protected IToken getToken(final String key) {
+ protected TextStyleToken<?> getToken(final String key) {
return this.textStyles.getToken(key);
}
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxMathTextStyleScanner.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxMathTextStyleScanner.java
index 521c304..76b9692 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxMathTextStyleScanner.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/docmlet/tex/ui/text/LtxMathTextStyleScanner.java
@@ -31,7 +31,7 @@
public class LtxMathTextStyleScanner extends LtxDefaultTextStyleScanner {
- public LtxMathTextStyleScanner(final TextStyleManager textStyles) {
+ public LtxMathTextStyleScanner(final TextStyleManager<?> textStyles) {
super(textStyles);
}
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/TexUIPlugin.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/TexUIPlugin.java
index f3cbe92..eea1d5e 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/TexUIPlugin.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/TexUIPlugin.java
@@ -27,6 +27,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.templates.ContextTypeRegistry;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -82,7 +83,7 @@
private LtxDocumentProvider ltxDocumentProvider;
- private PreferenceStoreTextStyleManager ltxTextStyles;
+ private JFaceTextStyleManager ltxTextStyles;
private ContextTypeRegistry ltxEditorTemplateContextTypeRegistry;
private EnhTemplateStore ltxEditorTemplateStore;
@@ -539,7 +540,7 @@
return this.ltxDocumentProvider;
}
- public PreferenceStoreTextStyleManager getLtxTextStyles() {
+ public PreferenceStoreTextStyleManager<TextAttribute> getLtxTextStyles() {
if (this.ltxTextStyles == null) {
if (!this.started) {
throw new IllegalStateException("Plug-in is not started.");
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxTextStylesPreferencePage.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxTextStylesPreferencePage.java
index 782d43d..18fb47d 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxTextStylesPreferencePage.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/config/LtxTextStylesPreferencePage.java
@@ -17,6 +17,7 @@
import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.TextAttribute;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlock;
@@ -143,7 +144,8 @@
@Override
protected SourceEditorViewerConfiguration getSourceEditorViewerConfiguration(
- final IPreferenceStore preferenceStore, final PreferenceStoreTextStyleManager textStyles) {
+ final IPreferenceStore preferenceStore,
+ final PreferenceStoreTextStyleManager<TextAttribute> textStyles) {
return new LtxSourceViewerConfiguration(LtxDocumentContentInfo.INSTANCE, 0,
null,
TexCore.getDefaultsAccess(),
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/YamlUIPlugin.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/YamlUIPlugin.java
index b41cc75..396aee7 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/YamlUIPlugin.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/YamlUIPlugin.java
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.templates.ContextTypeRegistry;
import org.eclipse.jface.text.templates.persistence.TemplateStore;
import org.eclipse.ui.editors.text.EditorsUI;
@@ -77,7 +78,7 @@
private YamlDocumentProvider yamlDocumentProvider;
- private PreferenceStoreTextStyleManager yamlTextStyles;
+ private JFaceTextStyleManager yamlTextStyles;
private ContextTypeRegistry yamlEditorTemplateContextTypeRegistry;
private TemplateStore yamlEditorTemplateStore;
@@ -174,7 +175,7 @@
return this.yamlDocumentProvider;
}
- public synchronized PreferenceStoreTextStyleManager getYamlTextStyles() {
+ public synchronized PreferenceStoreTextStyleManager<TextAttribute> getYamlTextStyles() {
if (this.yamlTextStyles == null) {
if (!this.started) {
throw new IllegalStateException("Plug-in is not started.");
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlTextStylesPreferencePage.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlTextStylesPreferencePage.java
index 7bc0e99..19ef9fc 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlTextStylesPreferencePage.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/config/YamlTextStylesPreferencePage.java
@@ -17,6 +17,7 @@
import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.TextAttribute;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlock;
@@ -126,7 +127,8 @@
@Override
protected SourceEditorViewerConfiguration getSourceEditorViewerConfiguration(
- final IPreferenceStore preferenceStore, final PreferenceStoreTextStyleManager textStyles) {
+ final IPreferenceStore preferenceStore,
+ final PreferenceStoreTextStyleManager<TextAttribute> textStyles) {
return new YamlSourceViewerConfiguration(YamlDocumentContentInfo.INSTANCE, 0,
null,
YamlCore.getDefaultsAccess(),
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfiguration.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfiguration.java
index bf4b729..aa2ba01 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfiguration.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/sourceediting/YamlSourceViewerConfiguration.java
@@ -22,6 +22,7 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.IAutoEditStrategy;
import org.eclipse.jface.text.ITextDoubleClickStrategy;
+import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.information.IInformationProvider;
import org.eclipse.jface.text.reconciler.IReconciler;
import org.eclipse.jface.text.source.ISourceViewer;
@@ -81,7 +82,8 @@
public YamlSourceViewerConfiguration(final DocContentSections documentContentInfo, final int flags,
final SourceEditor editor,
- final YamlCoreAccess access, final IPreferenceStore preferenceStore, final PreferenceStoreTextStyleManager textStyles) {
+ final YamlCoreAccess access, final IPreferenceStore preferenceStore,
+ final PreferenceStoreTextStyleManager<TextAttribute> textStyles) {
super(documentContentInfo, flags, editor);
setCoreAccess(access);
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/text/YamlDefaultTextStyleScanner.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/text/YamlDefaultTextStyleScanner.java
index b36d3b0..29f6b2a 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/text/YamlDefaultTextStyleScanner.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/yaml/ui/text/YamlDefaultTextStyleScanner.java
@@ -25,6 +25,7 @@
import org.eclipse.statet.ecommons.text.core.input.DocumentParserInput;
import org.eclipse.statet.ecommons.text.ui.presentation.TextStyleManager;
+import org.eclipse.statet.ecommons.text.ui.presentation.TextStyleManager.TextStyleToken;
@NonNullByDefault
@@ -41,9 +42,9 @@
private static final byte LAST_EOL= 2;
- private final TextStyleManager textStyles;
+ private final TextStyleManager<?> textStyles;
private final @NonNull IToken[] tokens;
- private final IToken defaultToken;
+ private final TextStyleToken<?> defaultToken;
private int currentOffset;
private int currentLength;
@@ -54,7 +55,7 @@
private byte lastChar;
- public YamlDefaultTextStyleScanner(final TextStyleManager textStyles) {
+ public YamlDefaultTextStyleScanner(final TextStyleManager<?> textStyles) {
this.textStyles= textStyles;
this.defaultToken= getToken(YamlTextStyles.TS_DEFAULT);
@@ -66,7 +67,7 @@
}
- protected IToken getToken(final String key) {
+ protected TextStyleToken<?> getToken(final String key) {
return this.textStyles.getToken(key);
}
