[NiConsole] Switch to new FixDocumentPartitioner
diff --git a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsolePreviewSourceViewerConfiguration.java b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsolePreviewSourceViewerConfiguration.java
index c0d8f58..01894e7 100644
--- a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsolePreviewSourceViewerConfiguration.java
+++ b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsolePreviewSourceViewerConfiguration.java
@@ -17,6 +17,9 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+import org.eclipse.statet.jcommons.lang.Nullable;
+
import org.eclipse.statet.ecommons.text.core.sections.BasicDocContentSections;
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.text.ui.presentation.SingleTokenScanner;
@@ -25,9 +28,14 @@
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfiguration;
+@NonNullByDefault
public class ConsolePreviewSourceViewerConfiguration extends SourceEditorViewerConfiguration {
+ private static final String[] CONTENT_TYPES= ConsoleTextStylesPreviewPartitioner.CONTENT_TYPES.toArray(
+ new String[ConsoleTextStylesPreviewPartitioner.CONTENT_TYPES.size()] );
+
+
private static final DocContentSections CONTENT_INFO= new BasicDocContentSections(ConsoleTextStylesPreviewPartitioner.PARTITIONING,
ConsoleTextStylesPreviewPartitioner.PARTITIONING) {
@Override
@@ -47,18 +55,18 @@
@Override
- protected void initScanners() {
- final TextStyleManager textStyles= getTextStyles();
-
- for (final String contentType : ConsoleTextStylesPreviewPartitioner.PARTITIONS) {
- addScanner(contentType,
- new SingleTokenScanner(textStyles, contentType) );
- }
+ public String[] getConfiguredContentTypes(final @Nullable ISourceViewer sourceViewer) {
+ return CONTENT_TYPES;
}
@Override
- public String[] getConfiguredContentTypes(final ISourceViewer sourceViewer) {
- return ConsoleTextStylesPreviewPartitioner.PARTITIONS;
+ protected void initScanners() {
+ final TextStyleManager textStyles= getTextStyles();
+
+ for (final String contentType : getConfiguredContentTypes(null)) {
+ addScanner(contentType,
+ new SingleTokenScanner(textStyles, contentType) );
+ }
}
}
diff --git a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsoleTextStylesPreviewPartitioner.java b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsoleTextStylesPreviewPartitioner.java
index 4a7607c..4d130bc 100644
--- a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsoleTextStylesPreviewPartitioner.java
+++ b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsoleTextStylesPreviewPartitioner.java
@@ -14,28 +14,32 @@
package org.eclipse.statet.internal.nico.ui.preferences;
-import org.eclipse.statet.ecommons.text.FixDocumentPartitioner;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+
+import org.eclipse.statet.ecommons.text.core.util.FixDocumentPartitioner;
import org.eclipse.statet.nico.ui.NicoUIPreferences;
+@NonNullByDefault
class ConsoleTextStylesPreviewPartitioner extends FixDocumentPartitioner {
public static final String PARTITIONING= "org.eclipse.statet.ConsolePreview";
- public static final String[] PARTITIONS= new String[] {
+ public static final ImList<String> CONTENT_TYPES= ImCollections.newList(
NicoUIPreferences.OUTPUT_STD_INPUT_STREAM_ROOT_KEY,
NicoUIPreferences.OUTPUT_INFO_STREAM_ROOT_KEY,
NicoUIPreferences.OUTPUT_STD_OUTPUT_ROOT_KEY,
NicoUIPreferences.OUTPUT_STD_ERROR_STREAM_ROOT_KEY,
- NicoUIPreferences.OUTPUT_SYSTEM_OUTPUT_STREAM_ROOT_KEY,
- };
+ NicoUIPreferences.OUTPUT_SYSTEM_OUTPUT_STREAM_ROOT_KEY );
public ConsoleTextStylesPreviewPartitioner() {
- super(PARTITIONS);
+ super(CONTENT_TYPES);
append(NicoUIPreferences.OUTPUT_STD_OUTPUT_ROOT_KEY, 23 + 22 + 40 + 1);
append(NicoUIPreferences.OUTPUT_INFO_STREAM_ROOT_KEY, 2);
append(NicoUIPreferences.OUTPUT_STD_INPUT_STREAM_ROOT_KEY, 17-2);
