Adapt to changed AbstractTextStylesConfigurationBlock
Change-Id: I85a52d282557589865d0a32fd113b9dcc095fd27
diff --git a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsoleTextStylesPreferencePage.java b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsoleTextStylesPreferencePage.java
index 32ffe3c..5cccb83 100644
--- a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsoleTextStylesPreferencePage.java
+++ b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/ConsoleTextStylesPreferencePage.java
@@ -22,19 +22,24 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.editors.text.EditorsUI;
+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.preferences.ui.ConfigurationBlock;
import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlockPreferencePage;
import org.eclipse.statet.ecommons.preferences.ui.ScopedPreferenceStore;
import org.eclipse.statet.ecommons.text.PartitionerDocumentSetupParticipant;
-import org.eclipse.statet.ecommons.text.ui.presentation.AbstractTextStylesConfigurationBlock;
import org.eclipse.statet.ecommons.text.ui.settings.PreferenceStoreTextStyleManager;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfiguration;
+import org.eclipse.statet.ltk.ui.sourceediting.presentation.AbstractTextStylesConfigurationBlock;
import org.eclipse.statet.ltk.ui.util.CombinedPreferenceStore;
import org.eclipse.statet.nico.core.runtime.SubmitType;
import org.eclipse.statet.nico.ui.NicoUIPreferences;
+@NonNullByDefault
public class ConsoleTextStylesPreferencePage extends ConfigurationBlockPreferencePage {
@@ -47,15 +52,17 @@
@Override
protected ConfigurationBlock createConfigurationBlock() {
- return new ConsoleTextStylesPreferenceBlock();
+ return new ConsoleTextStylesConfigurationBlock();
}
}
-class ConsoleTextStylesPreferenceBlock extends AbstractTextStylesConfigurationBlock {
+
+@NonNullByDefault
+class ConsoleTextStylesConfigurationBlock extends AbstractTextStylesConfigurationBlock {
- public ConsoleTextStylesPreferenceBlock() {
+ public ConsoleTextStylesConfigurationBlock() {
}
@@ -65,35 +72,30 @@
}
@Override
- protected SyntaxNode[] createItems() {
- return new SyntaxNode[] {
+ protected ImList<SyntaxNode> createItems() {
+ return ImCollections.newList(
new StyleNode(Messages.TextStyle_Input_label, Messages.TextStyle_Input_description,
- NicoUIPreferences.OUTPUT_STD_INPUT_STREAM_ROOT_KEY, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ NicoUIPreferences.OUTPUT_STD_INPUT_STREAM_ROOT_KEY, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.TextStyle_Info_label, Messages.TextStyle_Info_description,
- NicoUIPreferences.OUTPUT_INFO_STREAM_ROOT_KEY, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ NicoUIPreferences.OUTPUT_INFO_STREAM_ROOT_KEY, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.TextStyle_StandardOutput_label, Messages.TextStyle_StandardOutput_description,
- NicoUIPreferences.OUTPUT_STD_OUTPUT_ROOT_KEY, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, new SyntaxNode[] {
+ NicoUIPreferences.OUTPUT_STD_OUTPUT_ROOT_KEY, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ),
new StyleNode(Messages.TextStyle_SystemOutput_label, Messages.TextStyle_SystemOutput_description,
- NicoUIPreferences.OUTPUT_SYSTEM_OUTPUT_STREAM_ROOT_KEY, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- }),
+ NicoUIPreferences.OUTPUT_SYSTEM_OUTPUT_STREAM_ROOT_KEY, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ))),
new StyleNode(Messages.TextStyle_StandardError_label, Messages.TextStyle_StandardError_description,
- NicoUIPreferences.OUTPUT_STD_ERROR_STREAM_ROOT_KEY, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- new CategoryNode(Messages.TextStyle_SpecialBackground_label, new SyntaxNode[] {
+ NicoUIPreferences.OUTPUT_STD_ERROR_STREAM_ROOT_KEY, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
+
+ new CategoryNode(Messages.TextStyle_SpecialBackground_label,
new BackgroundNode(SubmitType.OTHER.getLabel(),
NLS.bind(Messages.TextStyle_SpecialBackground_Tasks_description, SubmitType.OTHER.getLabel()),
- NicoUIPreferences.OUTPUT_OTHER_TASKS_BACKGROUND_ROOT_KEY ),
- }),
- };
+ NicoUIPreferences.OUTPUT_OTHER_TASKS_BACKGROUND_ROOT_KEY )
+ )
+ );
}
@Override
diff --git a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/Messages.java b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/Messages.java
index 3e76550..09a62e0 100644
--- a/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/Messages.java
+++ b/r/org.eclipse.statet.nico.ui/src/org/eclipse/statet/internal/nico/ui/preferences/Messages.java
@@ -16,7 +16,11 @@
import org.eclipse.osgi.util.NLS;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+
+@NonNullByDefault
+@SuppressWarnings("null")
public class Messages extends NLS {
diff --git a/r/org.eclipse.statet.r.ui/plugin.xml b/r/org.eclipse.statet.r.ui/plugin.xml
index 620fc8b..eddbf60 100644
--- a/r/org.eclipse.statet.r.ui/plugin.xml
+++ b/r/org.eclipse.statet.r.ui/plugin.xml
@@ -870,7 +870,7 @@
id="org.eclipse.statet.r.preferencePages.RdTextStylesPage"
category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="%preferencePages.RdSyntaxColoring.name"
- class="org.eclipse.statet.internal.r.ui.preferences.RdSyntaxColoringPreferencePage">
+ class="org.eclipse.statet.internal.r.ui.preferences.RdTextStylesPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceAppearance"/>
</page>
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RTextStylesPreferencePage.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RTextStylesPreferencePage.java
index 323d505..0c04ae4 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RTextStylesPreferencePage.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RTextStylesPreferencePage.java
@@ -22,19 +22,22 @@
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.statet.jcommons.collections.ImCollections;
import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.jcommons.lang.NonNull;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.ecommons.preferences.core.Preference;
import org.eclipse.statet.ecommons.preferences.core.Preference.StringArrayPref;
import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlock;
import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlockPreferencePage;
-import org.eclipse.statet.ecommons.text.ui.presentation.AbstractTextStylesConfigurationBlock;
import org.eclipse.statet.ecommons.text.ui.settings.PreferenceStoreTextStyleManager;
import org.eclipse.statet.internal.r.ui.RUIPlugin;
import org.eclipse.statet.ltk.ui.LtkUIPreferences;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfiguration;
+import org.eclipse.statet.ltk.ui.sourceediting.presentation.AbstractTextStylesConfigurationBlock;
import org.eclipse.statet.ltk.ui.util.CombinedPreferenceStore;
import org.eclipse.statet.r.core.RCore;
import org.eclipse.statet.r.core.rsource.RTerminal;
@@ -46,6 +49,7 @@
import org.eclipse.statet.r.ui.text.r.IRTextTokens;
+@NonNullByDefault
public class RTextStylesPreferencePage extends ConfigurationBlockPreferencePage {
@@ -56,16 +60,17 @@
@Override
protected ConfigurationBlock createConfigurationBlock() {
- return new RTextStylesPreferenceBlock();
+ return new RTextStylesConfigurationBlock();
}
}
-class RTextStylesPreferenceBlock extends AbstractTextStylesConfigurationBlock {
+@NonNullByDefault
+class RTextStylesConfigurationBlock extends AbstractTextStylesConfigurationBlock {
- public RTextStylesPreferenceBlock() {
+ public RTextStylesConfigurationBlock() {
}
@@ -75,158 +80,130 @@
}
@Override
- protected SyntaxNode[] createItems() {
+ protected ImList<SyntaxNode> createItems() {
final List<StyleNode> identifierChilds= new ArrayList<>();
identifierChilds.add(
new StyleNode(Messages.RSyntaxColoring_Identifier_Assignment_label, getIdentifierItemsDescription(RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_ASSIGNMENT_ITEMS),
- RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_ASSIGNMENT_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_ASSIGNMENT_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_DEFAULT_ROOT),
SyntaxNode.createUseOtherStyle(RUIPreferenceConstants.R.TS_ASSIGNMENT_ROOT, Messages.RSyntaxColoring_Assignment_label),
- SyntaxNode.createUseCustomStyle()
- }, null ));
+ SyntaxNode.createUseCustomStyle() )));
identifierChilds.add(
new StyleNode(Messages.RSyntaxColoring_Identifier_Logical_label, getIdentifierItemsDescription(RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_LOGICAL_ITEMS),
- RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_LOGICAL_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_LOGICAL_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_DEFAULT_ROOT),
SyntaxNode.createUseOtherStyle(RUIPreferenceConstants.R.TS_OPERATORS_SUB_LOGICAL_ROOT, Messages.RSyntaxColoring_Operators_Logical_label),
- SyntaxNode.createUseCustomStyle()
- }, null ));
+ SyntaxNode.createUseCustomStyle() )));
identifierChilds.add(
new StyleNode(Messages.RSyntaxColoring_Identifier_Flowcontrol_label, getIdentifierItemsDescription(RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_FLOWCONTROL_ITEMS),
- RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_FLOWCONTROL_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_FLOWCONTROL_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_DEFAULT_ROOT),
SyntaxNode.createUseOtherStyle(RUIPreferenceConstants.R.TS_FLOWCONTROL_ROOT, Messages.RSyntaxColoring_Flowcontrol_label),
- SyntaxNode.createUseCustomStyle()
- }, null ));
+ SyntaxNode.createUseCustomStyle() )));
identifierChilds.add(
new StyleNode(Messages.RSyntaxColoring_Identifier_Custom1_label, getIdentifierItemsDescription(RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_CUSTOM1_ITEMS),
- RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_CUSTOM1_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_CUSTOM1_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_DEFAULT_ROOT),
- SyntaxNode.createUseCustomStyle()
- }, null ));
+ SyntaxNode.createUseCustomStyle() )));
identifierChilds.add(
new StyleNode(Messages.RSyntaxColoring_Identifier_Custom2_label, getIdentifierItemsDescription(RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_CUSTOM2_ITEMS),
- RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_CUSTOM2_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_IDENTIFIER_SUB_CUSTOM2_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_DEFAULT_ROOT),
- SyntaxNode.createUseCustomStyle()
- }, null ));
+ SyntaxNode.createUseCustomStyle() )));
- return new SyntaxNode[] {
- new CategoryNode(Messages.RSyntaxColoring_CodeCategory_label, new SyntaxNode[] {
+ return ImCollections.newList(
+ new CategoryNode(Messages.RSyntaxColoring_CodeCategory_label,
new StyleNode(Messages.RSyntaxColoring_Default_label, Messages.RSyntaxColoring_Default_description,
- RUIPreferenceConstants.R.TS_DEFAULT_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, identifierChilds.toArray(new SyntaxNode[identifierChilds.size()]) ),
+ RUIPreferenceConstants.R.TS_DEFAULT_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ),
+ identifierChilds.toArray(new @NonNull SyntaxNode[identifierChilds.size()]) ),
new StyleNode(Messages.RSyntaxColoring_Undefined_label, Messages.RSyntaxColoring_Undefined_description,
- RUIPreferenceConstants.R.TS_UNDEFINED_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_UNDEFINED_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_String_label, Messages.RSyntaxColoring_String_description,
- RUIPreferenceConstants.R.TS_STRING_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_STRING_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Numbers_label, Messages.RSyntaxColoring_Numbers_description,
- RUIPreferenceConstants.R.TS_NUMBERS_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, new SyntaxNode[] {
+ RUIPreferenceConstants.R.TS_NUMBERS_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ),
new StyleNode(Messages.RSyntaxColoring_Numbers_Integer_label, Messages.RSyntaxColoring_Numbers_Integer_description,
- RUIPreferenceConstants.R.TS_NUMBERS_SUB_INT_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_NUMBERS_SUB_INT_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_NUMBERS_ROOT),
- SyntaxNode.createUseCustomStyle() }, null ),
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Numbers_Complex_label, Messages.RSyntaxColoring_Numbers_Complex_description,
- RUIPreferenceConstants.R.TS_NUMBERS_SUB_CPLX_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_NUMBERS_SUB_CPLX_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_NUMBERS_ROOT),
- SyntaxNode.createUseCustomStyle() }, null ),
- }),
+ SyntaxNode.createUseCustomStyle() ))),
new StyleNode(Messages.RSyntaxColoring_SpecialConstants_label,
addListToTooltip(Messages.RSyntaxColoring_SpecialConstants_description, IRTextTokens.SPECIALCONST),
- RUIPreferenceConstants.R.TS_SPECIAL_CONSTANTS_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_SPECIAL_CONSTANTS_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_LogicalConstants_label,
addListToTooltip(Messages.RSyntaxColoring_LogicalConstants_description, IRTextTokens.LOGICALCONST),
- RUIPreferenceConstants.R.TS_LOGICAL_CONSTANTS_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_LOGICAL_CONSTANTS_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Flowcontrol_label,
addListToTooltip(Messages.RSyntaxColoring_Flowcontrol_description, IRTextTokens.FLOWCONTROL),
- RUIPreferenceConstants.R.TS_FLOWCONTROL_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_FLOWCONTROL_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Separators_label,
addListToTooltip(Messages.RSyntaxColoring_Separators_description, IRTextTokens.SEPARATOR),
- RUIPreferenceConstants.R.TS_SEPARATORS_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_SEPARATORS_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Assignment_label,
addListToTooltip(Messages.RSyntaxColoring_Assignment_description, new String[] { "<-", "->", "<<-", "->>", addExtraStyleNoteToTooltip("= ({0})") }), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- RUIPreferenceConstants.R.TS_ASSIGNMENT_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, new SyntaxNode[] {
+ RUIPreferenceConstants.R.TS_ASSIGNMENT_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ),
new StyleNode(Messages.RSyntaxColoring_Assignment_Equalsign_label,
addListToTooltip(Messages.RSyntaxColoring_Assignment_Equalsign_description, IRTextTokens.ASSIGN_SUB_EQUAL),
- RUIPreferenceConstants.R.TS_ASSIGNMENT_SUB_EQUALSIGN_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_ASSIGNMENT_SUB_EQUALSIGN_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_ASSIGNMENT_ROOT),
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Assignment_Pipe_label,
addListToTooltip(Messages.RSyntaxColoring_Assignment_Pipe_description, IRTextTokens.ASSIGN_SUB_PIPE),
- RUIPreferenceConstants.R.TS_ASSIGNMENT_SUB_PIPE_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_ASSIGNMENT_SUB_PIPE_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_ASSIGNMENT_ROOT),
- SyntaxNode.createUseCustomStyle()
- }, null ),
- }),
+ SyntaxNode.createUseCustomStyle() ))),
new StyleNode(Messages.RSyntaxColoring_Operators_label, Messages.RSyntaxColoring_Operators_description,
- RUIPreferenceConstants.R.TS_OTHER_OPERATORS_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, new SyntaxNode[] {
+ RUIPreferenceConstants.R.TS_OTHER_OPERATORS_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ),
new StyleNode(Messages.RSyntaxColoring_Operators_Logical_label,
addListToTooltip(Messages.RSyntaxColoring_Operators_Logical_description, IRTextTokens.OP_SUB_LOGICAL),
- RUIPreferenceConstants.R.TS_OPERATORS_SUB_LOGICAL_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_OPERATORS_SUB_LOGICAL_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_OTHER_OPERATORS_ROOT),
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Operators_Relational_label,
addListToTooltip(Messages.RSyntaxColoring_Operators_Relational_description, IRTextTokens.OP_SUB_RELATIONAL),
- RUIPreferenceConstants.R.TS_OPERATORS_SUB_RELATIONAL_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_OPERATORS_SUB_RELATIONAL_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_OTHER_OPERATORS_ROOT),
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Operators_Userdefined_label,
addListToTooltip(Messages.RSyntaxColoring_Operators_Userdefined_description, new String[] { "%\u2026%" }), //$NON-NLS-1$
- RUIPreferenceConstants.R.TS_OPERATORS_SUB_USERDEFINED_ROOT, new SyntaxNode.UseStyle[] {
+ RUIPreferenceConstants.R.TS_OPERATORS_SUB_USERDEFINED_ROOT, ImCollections.newList(
SyntaxNode.createUseNoExtraStyle(RUIPreferenceConstants.R.TS_OTHER_OPERATORS_ROOT),
- SyntaxNode.createUseCustomStyle()
- }, null ),
- }),
+ SyntaxNode.createUseCustomStyle() ))),
new StyleNode(Messages.RSyntaxColoring_Grouping_label, Messages.RSyntaxColoring_Grouping_description,
- RUIPreferenceConstants.R.TS_GROUPING_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_GROUPING_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Indexing_label, Messages.RSyntaxColoring_Indexing_description,
- RUIPreferenceConstants.R.TS_INDEXING_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- }),
- new CategoryNode(Messages.RSyntaxColoring_CommentsCategory_label, new SyntaxNode[] {
+ RUIPreferenceConstants.R.TS_INDEXING_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ))
+ ),
+ new CategoryNode(Messages.RSyntaxColoring_CommentsCategory_label,
new StyleNode(Messages.RSyntaxColoring_Comment_label, Messages.RSyntaxColoring_Comment_description,
- RUIPreferenceConstants.R.TS_COMMENT_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_COMMENT_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_TaskTag_label, Messages.RSyntaxColoring_TaskTag_description,
- RUIPreferenceConstants.R.TS_TASK_TAG_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_TASK_TAG_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_Roxygen_label, Messages.RSyntaxColoring_Roxygen_description,
- RUIPreferenceConstants.R.TS_ROXYGEN_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ RUIPreferenceConstants.R.TS_ROXYGEN_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
new StyleNode(Messages.RSyntaxColoring_RoxygenTag_label, Messages.RSyntaxColoring_RoxygenTag_description,
- RUIPreferenceConstants.R.TS_ROXYGEN_TAG_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- }),
- };
+ RUIPreferenceConstants.R.TS_ROXYGEN_TAG_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ))
+ )
+ );
}
private String getIdentifierItemsDescription(final String key) {
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RdSyntaxColoringPreferencePage.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RdTextStylesPreferencePage.java
similarity index 60%
rename from r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RdSyntaxColoringPreferencePage.java
rename to r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RdTextStylesPreferencePage.java
index 4eab8ce..1239de8 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RdSyntaxColoringPreferencePage.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RdTextStylesPreferencePage.java
@@ -19,14 +19,18 @@
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.ui.editors.text.EditorsUI;
+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.preferences.ui.ConfigurationBlock;
import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlockPreferencePage;
-import org.eclipse.statet.ecommons.text.ui.presentation.AbstractTextStylesConfigurationBlock;
import org.eclipse.statet.ecommons.text.ui.settings.PreferenceStoreTextStyleManager;
import org.eclipse.statet.internal.r.ui.RUIPlugin;
import org.eclipse.statet.ltk.ui.LtkUIPreferences;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfiguration;
+import org.eclipse.statet.ltk.ui.sourceediting.presentation.AbstractTextStylesConfigurationBlock;
import org.eclipse.statet.ltk.ui.util.CombinedPreferenceStore;
import org.eclipse.statet.r.core.RCore;
import org.eclipse.statet.r.ui.RUIPreferenceConstants;
@@ -34,26 +38,28 @@
import org.eclipse.statet.r.ui.editors.RdSourceViewerConfiguration;
-public class RdSyntaxColoringPreferencePage extends ConfigurationBlockPreferencePage {
+@NonNullByDefault
+public class RdTextStylesPreferencePage extends ConfigurationBlockPreferencePage {
- public RdSyntaxColoringPreferencePage() {
+ public RdTextStylesPreferencePage() {
setPreferenceStore(RUIPlugin.getInstance().getPreferenceStore());
}
@Override
protected ConfigurationBlock createConfigurationBlock() {
- return new RdTextStylesBlock();
+ return new RdTextStylesConfigurationBlock();
}
}
-class RdTextStylesBlock extends AbstractTextStylesConfigurationBlock {
+@NonNullByDefault
+class RdTextStylesConfigurationBlock extends AbstractTextStylesConfigurationBlock {
- public RdTextStylesBlock() {
+ public RdTextStylesConfigurationBlock() {
}
@@ -63,52 +69,43 @@
}
@Override
- protected SyntaxNode[] createItems() {
- return new SyntaxNode[] {
- new CategoryNode(Messages.RdSyntaxColoring_CodeCategory_label, new SyntaxNode[] {
- new StyleNode(Messages.RdSyntaxColoring_Default_label, Messages.RdSyntaxColoring_Default_description,
- RUIPreferenceConstants.Rd.TS_DEFAULT_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+ protected ImList<CategoryNode> createItems() {
+ return ImCollections.newList(
+ new CategoryNode(Messages.RdSyntaxColoring_CodeCategory_label,
+ new StyleNode(Messages.RdSyntaxColoring_Default_label, Messages.RdSyntaxColoring_Default_description,
+ RUIPreferenceConstants.Rd.TS_DEFAULT_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
// new StyleNode(Messages.RdSyntaxColoring_Verbatim_label, Messages.RdSyntaxColoring_Verbatim_description,
-// RUIPreferenceConstants.Rd.TS_VERBATIM_ROOT, false ),
- new StyleNode(Messages.RdSyntaxColoring_SectionTag_label, Messages.RdSyntaxColoring_SectionTag_description,
- RUIPreferenceConstants.Rd.TS_SECTION_TAG_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- new StyleNode(Messages.RdSyntaxColoring_SubSectionTag_label, Messages.RdSyntaxColoring_SubSectionTag_description,
- RUIPreferenceConstants.Rd.TS_SUBSECTION_TAG_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- new StyleNode(Messages.RdSyntaxColoring_OtherTag_label, Messages.RdSyntaxColoring_OtherTag_description,
- RUIPreferenceConstants.Rd.TS_OTHER_TAG_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- new StyleNode(Messages.RdSyntaxColoring_UnlistedTag_label, Messages.RdSyntaxColoring_UnlistedTag_description,
- RUIPreferenceConstants.Rd.TS_UNLISTED_TAG_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- new StyleNode(Messages.RdSyntaxColoring_Brackets_label, Messages.RdSyntaxColoring_Brackets_description,
- RUIPreferenceConstants.Rd.TS_BRACKETS_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
+// RUIPreferenceConstants.Rd.TS_VERBATIM_ROOT, ),
+ new StyleNode(Messages.RdSyntaxColoring_SectionTag_label, Messages.RdSyntaxColoring_SectionTag_description,
+ RUIPreferenceConstants.Rd.TS_SECTION_TAG_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
+ new StyleNode(Messages.RdSyntaxColoring_SubSectionTag_label, Messages.RdSyntaxColoring_SubSectionTag_description,
+ RUIPreferenceConstants.Rd.TS_SUBSECTION_TAG_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
+ new StyleNode(Messages.RdSyntaxColoring_OtherTag_label, Messages.RdSyntaxColoring_OtherTag_description,
+ RUIPreferenceConstants.Rd.TS_OTHER_TAG_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
+ new StyleNode(Messages.RdSyntaxColoring_UnlistedTag_label, Messages.RdSyntaxColoring_UnlistedTag_description,
+ RUIPreferenceConstants.Rd.TS_UNLISTED_TAG_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
+ new StyleNode(Messages.RdSyntaxColoring_Brackets_label, Messages.RdSyntaxColoring_Brackets_description,
+ RUIPreferenceConstants.Rd.TS_BRACKETS_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
- new StyleNode(Messages.RdSyntaxColoring_PlatformSpecif_label, Messages.RdSyntaxColoring_PlatformSpecif_description,
- RUIPreferenceConstants.Rd.TS_PLATFORM_SPECIF_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- }),
- new CategoryNode(Messages.RdSyntaxColoring_CommentsCategory_label, new SyntaxNode[] {
- new StyleNode(Messages.RdSyntaxColoring_Comment_label, Messages.RdSyntaxColoring_Comment_description,
- RUIPreferenceConstants.Rd.TS_COMMENT_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- new StyleNode(Messages.RdSyntaxColoring_TaskTag_label, Messages.RdSyntaxColoring_TaskTag_description,
- RUIPreferenceConstants.Rd.TS_TASK_TAG_ROOT, new SyntaxNode.UseStyle[] {
- SyntaxNode.createUseCustomStyle()
- }, null ),
- }),
- };
+ new StyleNode(Messages.RdSyntaxColoring_PlatformSpecif_label, Messages.RdSyntaxColoring_PlatformSpecif_description,
+ RUIPreferenceConstants.Rd.TS_PLATFORM_SPECIF_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ))
+ ),
+ new CategoryNode(Messages.RdSyntaxColoring_CommentsCategory_label,
+ new StyleNode(Messages.RdSyntaxColoring_Comment_label, Messages.RdSyntaxColoring_Comment_description,
+ RUIPreferenceConstants.Rd.TS_COMMENT_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() )),
+ new StyleNode(Messages.RdSyntaxColoring_TaskTag_label, Messages.RdSyntaxColoring_TaskTag_description,
+ RUIPreferenceConstants.Rd.TS_TASK_TAG_ROOT, ImCollections.newList(
+ SyntaxNode.createUseCustomStyle() ))
+ )
+ );
}
@Override
