Bug 544397: Rename preference node from 'StatET' to 'R'
Change-Id: I73614c8d4d72734dfc49d5ddf0626a15b1e39902
diff --git a/r/org.eclipse.statet.ide.ui/plugin.properties b/r/org.eclipse.statet.ide.ui/plugin.properties
index 0c14452..5fcea66 100644
--- a/r/org.eclipse.statet.ide.ui/plugin.properties
+++ b/r/org.eclipse.statet.ide.ui/plugin.properties
@@ -14,9 +14,6 @@
perspectives_StatetPerspective_name = StatET
-preferencePages_StatetBase_name = StatET
-preferencePages_Editors_name = Source Editors
-preferencePages_RunDebug_name = Run/Debug
preferencePages_CodeGenerationTemplates_name = Code Generation
preferencePages_TaskTags_name = Task Tags
diff --git a/r/org.eclipse.statet.ide.ui/plugin.xml b/r/org.eclipse.statet.ide.ui/plugin.xml
index 5ec2c50..c0e4351 100644
--- a/r/org.eclipse.statet.ide.ui/plugin.xml
+++ b/r/org.eclipse.statet.ide.ui/plugin.xml
@@ -38,28 +38,8 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
- id="org.eclipse.statet.base.preferencePages.StatetBase"
- class="org.eclipse.statet.internal.ide.ui.preferences.StatetBasePreferencePage"
- name="%preferencePages_StatetBase_name">
- <keywordReference id="org.eclipse.statet.base.keywords.StatetGeneral"/>
- </page>
- <page
- id="org.eclipse.statet.base.preferencePages.Editors"
- category="org.eclipse.statet.base.preferencePages.StatetBase"
- class="org.eclipse.statet.internal.ide.ui.preferences.EmptyPreferencePage"
- name="%preferencePages_Editors_name">
- <keywordReference id="org.eclipse.statet.ltk.keywords.SourceAppearance"/>
- <keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
- </page>
- <page
- id="org.eclipse.statet.base.preferencePages.RunDebug"
- category="org.eclipse.statet.base.preferencePages.StatetBase"
- class="org.eclipse.statet.internal.ide.ui.preferences.EmptyPreferencePage"
- name="%preferencePages_RunDebug_name">
- </page>
- <page
id="org.eclipse.statet.base.preferencePages.CodeGenerationTemplates"
- category="org.eclipse.statet.base.preferencePages.StatetBase"
+ category="org.eclipse.statet.r.preferencePages.R"
class="org.eclipse.statet.internal.ide.ui.preferences.CodeGenerationTemplatesPreferencePage"
name="%preferencePages_CodeGenerationTemplates_name">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceTemplates"/>
@@ -67,7 +47,7 @@
</page>
<page
id="org.eclipse.statet.base.ui.preferencePages.TaskTags"
- category="org.eclipse.statet.base.preferencePages.StatetBase"
+ category="org.eclipse.statet.r.preferencePages.R"
class="org.eclipse.statet.internal.ide.ui.preferences.TaskTagsPreferencePage"
name="%preferencePages_TaskTags_name">
<keywordReference id="org.eclipse.statet.ltk.keywords.TaskTags"/>
diff --git a/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/EmptyPreferencePage.java b/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/EmptyPreferencePage.java
deleted file mode 100644
index 286bed1..0000000
--- a/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/EmptyPreferencePage.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=============================================================================#
- # Copyright (c) 2009, 2019 Stephan Wahlbrink and others.
- #
- # This program and the accompanying materials are made available under the
- # terms of the Eclipse Public License 2.0 which is available at
- # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
- # which is available at https://www.apache.org/licenses/LICENSE-2.0.
- #
- # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
- #
- # Contributors:
- # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
- #=============================================================================*/
-
-package org.eclipse.statet.internal.ide.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * An empty preference page
- */
-public class EmptyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-
- public EmptyPreferencePage() {
- }
-
-
- @Override
- public void init(final IWorkbench workbench) {
- }
-
- @Override
- protected Control createContents(final Composite parent) {
- return new Composite(parent, SWT.NONE);
- }
-
-}
diff --git a/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/Messages.java b/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/Messages.java
index 1ba891b..578cadc 100644
--- a/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/Messages.java
+++ b/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/Messages.java
@@ -20,8 +20,6 @@
public class Messages extends NLS {
- public static String StatetBase_description;
-
public static String CodeTemplates_title;
public static String CodeTemplates_label;
public static String CodeTemplates_EditButton_label;
diff --git a/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/Messages.properties b/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/Messages.properties
index 65f15de..8bcbd51 100644
--- a/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/Messages.properties
+++ b/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/Messages.properties
@@ -12,8 +12,6 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================#
-StatetBase_description = StatET
-
CodeTemplates_title = Code Templates for StatET
CodeTemplates_label = C&onfigure generated code and comments:
CodeTemplates_EditButton_label = &Edit...
diff --git a/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/StatetBasePreferencePage.java b/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/StatetBasePreferencePage.java
deleted file mode 100644
index 511e9ac..0000000
--- a/r/org.eclipse.statet.ide.ui/src/org/eclipse/statet/internal/ide/ui/preferences/StatetBasePreferencePage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=============================================================================#
- # Copyright (c) 2005, 2019 Stephan Wahlbrink and others.
- #
- # This program and the accompanying materials are made available under the
- # terms of the Eclipse Public License 2.0 which is available at
- # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
- # which is available at https://www.apache.org/licenses/LICENSE-2.0.
- #
- # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
- #
- # Contributors:
- # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
- #=============================================================================*/
-
-package org.eclipse.statet.internal.ide.ui.preferences;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-public class StatetBasePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-
- public StatetBasePreferencePage() {
-
- super(GRID);
-
- setDescription(Messages.StatetBase_description);
- }
-
-
- @Override
- public void init(final IWorkbench workbench) {
- }
-
- @Override
- public void createFieldEditors() {
- }
-
-}
diff --git a/r/org.eclipse.statet.nico.ui/plugin.xml b/r/org.eclipse.statet.nico.ui/plugin.xml
index 56af6ef..d6677a1 100644
--- a/r/org.eclipse.statet.nico.ui/plugin.xml
+++ b/r/org.eclipse.statet.nico.ui/plugin.xml
@@ -228,19 +228,19 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.nico.preferencePages.ResourceMappings"
- category="org.eclipse.statet.base.preferencePages.RunDebug"
+ category="org.eclipse.statet.r.preferencePages.RunDebug"
class="org.eclipse.statet.internal.nico.ui.preferences.ResourceMappingPreferencePage"
name="%preferencePages_ResourceMappings_name">
</page>
<page
id="org.eclipse.statet.nico.preferencePages.Console"
- category="org.eclipse.statet.base.preferencePages.RunDebug"
+ category="org.eclipse.statet.r.preferencePages.RunDebug"
class="org.eclipse.statet.internal.nico.ui.preferences.ConsolePreferencePage"
name="%preferencePages_Console_name">
</page>
<page
id="org.eclipse.statet.nico.preferencePages.ConsoleTextStyles"
- category="org.eclipse.statet.base.preferencePages.RunDebug"
+ category="org.eclipse.statet.r.preferencePages.RunDebug"
class="org.eclipse.statet.internal.nico.ui.preferences.ConsoleTextStylesPreferencePage"
name="%preferencePages_ConsoleTextStyles_name">
</page>
diff --git a/r/org.eclipse.statet.r.console.ui/plugin.xml b/r/org.eclipse.statet.r.console.ui/plugin.xml
index e0f9ffc..dfd2a93 100644
--- a/r/org.eclipse.statet.r.console.ui/plugin.xml
+++ b/r/org.eclipse.statet.r.console.ui/plugin.xml
@@ -438,7 +438,7 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.r.preferencePages.RConsoleAdvancedContentAssistPage"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="%preferencePages_RConsoleContentAssist_name"
class="org.eclipse.statet.internal.r.console.ui.page.AdvancedContentAssistConfigurationPage">
</page>
@@ -475,7 +475,7 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.r.preferencePages.RSnippets"
- category="org.eclipse.statet.base.preferencePages.RunDebug"
+ category="org.eclipse.statet.r.preferencePages.RunDebug"
name="%preferencePages_RSnippet_name"
class="org.eclipse.statet.internal.r.console.ui.snippets.RSnippetPreferencePage">
</page>
diff --git a/r/org.eclipse.statet.r.doc/reference/r_console-snippets.xhtml b/r/org.eclipse.statet.r.doc/reference/r_console-snippets.xhtml
index cca44a9..a2f997b 100644
--- a/r/org.eclipse.statet.r.doc/reference/r_console-snippets.xhtml
+++ b/r/org.eclipse.statet.r.doc/reference/r_console-snippets.xhtml
@@ -20,7 +20,7 @@
<h3>Define Snippets</h3>
<p>R code snippets can be configured in <span class="uisequence">Window > Preferences</span> at
-<span class="uisequence indent">StatET > Run/Debug > R Snippets</span>
+<span class="uisequence indent">R > Run/Debug > R Snippets</span>
</p>
<p>The user can add, edit and delete the R snippets using the buttons at the right side.
It is also possible to exchange templates between workspaces using the export and import buttons.</p>
diff --git a/r/org.eclipse.statet.r.doc/reference/r_editor-contentassist.xhtml b/r/org.eclipse.statet.r.doc/reference/r_editor-contentassist.xhtml
index 0c19b10..573b5ab 100644
--- a/r/org.eclipse.statet.r.doc/reference/r_editor-contentassist.xhtml
+++ b/r/org.eclipse.statet.r.doc/reference/r_editor-contentassist.xhtml
@@ -66,7 +66,7 @@
<h4>Configuration of snippet templates</h4>
<p>The content of the predefined snippets can be configured in <span class="uisequence">Window > Preferences</span> at
-<span class="uisequence indent">StatET > Source Editors > R Templates</span>
+<span class="uisequence indent">R > Source Editors > R Templates</span>
</p>
<img style="width: 776px; height: 536px;" alt="Screenshot preferences content assist templates" src="../images/screenshot_preferences_content_assist_templates.png"/>
diff --git a/r/org.eclipse.statet.r.doc/reference/r_editor-highlighting.xhtml b/r/org.eclipse.statet.r.doc/reference/r_editor-highlighting.xhtml
index f2d25f0..b7ea0d2 100644
--- a/r/org.eclipse.statet.r.doc/reference/r_editor-highlighting.xhtml
+++ b/r/org.eclipse.statet.r.doc/reference/r_editor-highlighting.xhtml
@@ -18,7 +18,7 @@
<p>StatET offers very fine-grained configuration of syntactic highlighting,
which is accessible via the StatET preferences in
<span class="uisequence">Window > Preferences</span> at:
-<span class="uisequence indent">StatET > Source Editors > R Syntax Coloring</span></p>
+<span class="uisequence indent">R > Source Editors > R Syntax Coloring</span></p>
<img style="width: 700px; height: 516px;" alt="Screenshot preferences R syntax coloring" src="../images/screenshot_preferences_r_syntax_coloring.png"/>
@@ -33,7 +33,7 @@
<li><kbd>Ctrl+,</kbd> : navigate to previous annotation</li>
</ul>
<p>The Syntax error detection feature can be (dis)activated in the StatET preferences at
-<span class="uisequence indent">StatET > Source Editors > R Editing Options</span>
+<span class="uisequence indent">R > Source Editors > R Editing Options</span>
by (un)checking the option 'Enable syntax checking as you type'.</p>
<img style="width: 675px; height: 713px;" alt="Syntax checking preferences" src="../images/screenshot_syntax_checking_preferences-2.png"/>
@@ -56,7 +56,7 @@
quickly navigate to the desired occurrence.</p>
<p>The Mark occurrences feature can be (dis)activated in the
StatET preferences at
-<span class="uisequence indent">StatET > Source Editors > R Editing Options</span>
+<span class="uisequence indent">R > Source Editors > R Editing Options</span>
by (un)checking the option 'Enable mark occurences'. As is indicated in
that preferences page, the visual display of the occurrences can be
configured at
diff --git a/r/org.eclipse.statet.r.doc/reference/r_editor-tasks.xhtml b/r/org.eclipse.statet.r.doc/reference/r_editor-tasks.xhtml
index 1693ff4..26e47d3 100644
--- a/r/org.eclipse.statet.r.doc/reference/r_editor-tasks.xhtml
+++ b/r/org.eclipse.statet.r.doc/reference/r_editor-tasks.xhtml
@@ -43,7 +43,7 @@
<h4>Options</h4>
<p>One can edit and add or remove task keywords in the preferences at
- <span class="uisequence indent">StatET > Task Tags</span></p>
+ <span class="uisequence indent">R > Task Tags</span></p>
<img style="width: 660px; height: 543px;" alt="Task tags preferences page" src="../images/screenshot_task_tags_prefs.png"/>
<p>The tags can also be configured per project.</p>
diff --git a/r/org.eclipse.statet.r.doc/reference/r_env-index.xhtml b/r/org.eclipse.statet.r.doc/reference/r_env-index.xhtml
index 7c318a4..026faa4 100644
--- a/r/org.eclipse.statet.r.doc/reference/r_env-index.xhtml
+++ b/r/org.eclipse.statet.r.doc/reference/r_env-index.xhtml
@@ -24,7 +24,7 @@
<h3>Preferences / Automatic Modes</h3>
<p>The preference page of the R environments at
-<span class="uisequence indent">StatET > Run/Debug > R Environments</span>
+<span class="uisequence indent">R > Run/Debug > R Environments</span>
offers in the lower part an option to configure globally the automatic indexing of R environments.</p>
<img alt="Screenshot R Environments preference page" src="../images/screenshot_r_environments.png"/>
diff --git a/r/org.eclipse.statet.r.doc/reference/r_env.xhtml b/r/org.eclipse.statet.r.doc/reference/r_env.xhtml
index e2cb179..49dff26 100644
--- a/r/org.eclipse.statet.r.doc/reference/r_env.xhtml
+++ b/r/org.eclipse.statet.r.doc/reference/r_env.xhtml
@@ -30,7 +30,7 @@
<h3>Preferences</h3>
<p>
The R environments for your Eclipse workspace can be viewed and configured in the preferences:
-<span class="uisequence indent">StatET > Run/Debug > R Environments</span></p>
+<span class="uisequence indent">R > Run/Debug > R Environments</span></p>
<img alt="Screenshot R Environments preference page" src="../images/screenshot_r_environments.png"/>
<p>
One can specify as many R environments as wanted as long as they have a unique name. Buttons
diff --git a/r/org.eclipse.statet.r.doc/reference/r_remote_console-resourcemapping.xhtml b/r/org.eclipse.statet.r.doc/reference/r_remote_console-resourcemapping.xhtml
index 580e41b..95ca06a 100644
--- a/r/org.eclipse.statet.r.doc/reference/r_remote_console-resourcemapping.xhtml
+++ b/r/org.eclipse.statet.r.doc/reference/r_remote_console-resourcemapping.xhtml
@@ -17,7 +17,7 @@
folder mapping allows to make use of this match. The folder mapping specifies the translation
of both path.</p>
<p>Remote Folders are configured in the preference page
-<span class="uisequence">StatET > Run/Debug > Remote Folders</span>.</p>
+<span class="uisequence">R > Run/Debug > Remote Folders</span>.</p>
<h4>Example</h4>
<p>For example the working data are store in a directory <code>/home/stephan/mydata</code>
diff --git a/r/org.eclipse.statet.r.ui/plugin.properties b/r/org.eclipse.statet.r.ui/plugin.properties
index 9888b45..28e2ffc 100644
--- a/r/org.eclipse.statet.r.ui/plugin.properties
+++ b/r/org.eclipse.statet.r.ui/plugin.properties
@@ -12,6 +12,8 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================#
+preferencePages_R_name= R\u2002[StatET]
+
projectConfigurators_RPackageProject_label= R Package Project
decorators_RProjectDecorator_label= R Project Decorator
@@ -49,7 +51,8 @@
menus_REditorContext_ToggleComment_mnemonic = C
menus_REditorContext_CorrectIndent_mnemonic = I
-preferencePages.RCodeStyle.name = R Code Formatting
+preferencePages_RCodeStyle_name= Code Formatting
+preferencePages_SourceEditors_name= Source Editors
preferencePages.REditorOptions.name = R Editing Options
preferencePages.RIdentifierGroups.name = Identifier Groups
preferencePages.RSyntaxColoring.name= R Syntax Highlighting
@@ -101,9 +104,10 @@
#-- Debug ---------------------------------------------------------------------#
-preferencePages_RInteraction_name = R Interaction
-preferencePages_REnvironments_name = R Environments
-preferencePages_RRepositories_name = R Repositories
+preferencePages_RunDebug_name= Run/Debug
+preferencePages_RInteraction_name= R Interaction
+preferencePages_REnvironments_name= R Environments
+preferencePages_RRepositories_name= R Repositories
actionSets_RSessionTools_label = StatET R Session Tools
actionSets_RToolbar_label = StatET R Toolbar
diff --git a/r/org.eclipse.statet.r.ui/plugin.xml b/r/org.eclipse.statet.r.ui/plugin.xml
index 4c0df4a..50f1e5c 100644
--- a/r/org.eclipse.statet.r.ui/plugin.xml
+++ b/r/org.eclipse.statet.r.ui/plugin.xml
@@ -30,6 +30,15 @@
point="org.eclipse.core.runtime.preferences">
<initializer class="org.eclipse.statet.internal.r.ui.RUIPreferenceInitializer"/>
</extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ id="org.eclipse.statet.r.preferencePages.R"
+ name="%preferencePages_R_name"
+ class="org.eclipse.statet.internal.r.ui.preferences.RBasePreferencePage">
+ <keywordReference id="org.eclipse.statet.base.keywords.StatetGeneral"/>
+ </page>
+ </extension>
<extension
point="org.eclipse.ui.ide.projectNatureImages">
@@ -773,15 +782,23 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.r.preferencePages.RCodeStyle"
- category="org.eclipse.statet.base.preferencePages.StatetBase"
- name="%preferencePages.RCodeStyle.name"
+ category="org.eclipse.statet.r.preferencePages.R"
+ name="%preferencePages_RCodeStyle_name"
class="org.eclipse.statet.internal.r.ui.preferences.RCodeStylePreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceAppearance"/>
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceFormatting"/>
</page>
<page
+ id="org.eclipse.statet.r.preferencePages.SourceEditors"
+ category="org.eclipse.statet.r.preferencePages.R"
+ name="%preferencePages_SourceEditors_name"
+ class="org.eclipse.statet.internal.r.ui.preferences.SourceEditorsPreferencePage">
+ <keywordReference id="org.eclipse.statet.ltk.keywords.SourceAppearance"/>
+ <keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
+ </page>
+ <page
id="org.eclipse.statet.r.preferencePages.REditorOptions"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="%preferencePages.REditorOptions.name"
class="org.eclipse.statet.internal.r.ui.preferences.REditorPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
@@ -793,7 +810,7 @@
</page>
<page
id="org.eclipse.statet.r.preferencePages.RTextStyles"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="%preferencePages.RSyntaxColoring.name"
class="org.eclipse.statet.internal.r.ui.preferences.RTextStylesPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
@@ -809,7 +826,7 @@
</page>
<page
id="org.eclipse.statet.r.preferencePages.REditorTemplates"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="%preferencePages.REditorTemplates.name"
class="org.eclipse.statet.internal.r.ui.preferences.REditorTemplatesPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
@@ -817,7 +834,7 @@
</page>
<page
id="org.eclipse.statet.r.preferencePages.REditorAdvancedContentAssistPage"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="R Editor Content Assist"
class="org.eclipse.statet.internal.r.ui.editors.AdvancedContentAssistConfigurationPage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
@@ -825,13 +842,13 @@
</page>
<page
id="org.eclipse.statet.r.preferencePages.REditorAdvancedInfoHoverPage"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="R Editor Hover"
class="org.eclipse.statet.internal.r.ui.editors.AdvancedInfoHoverConfigurationPage$ForREditor">
</page>
<page
id="org.eclipse.statet.r.preferencePages.RdTextStylesPage"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="%preferencePages.RdSyntaxColoring.name"
class="org.eclipse.statet.internal.r.ui.preferences.RdSyntaxColoringPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
@@ -1060,7 +1077,7 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.r.preferencePages.RHelpPage"
- category="org.eclipse.statet.base.preferencePages.StatetBase"
+ category="org.eclipse.statet.r.preferencePages.R"
name="%preferencePages_RHelpPage_name"
class="org.eclipse.statet.internal.r.ui.rhelp.RHelpPreferencePage">
</page>
@@ -1474,20 +1491,29 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
+ id="org.eclipse.statet.r.preferencePages.RunDebug"
+ category="org.eclipse.statet.r.preferencePages.R"
+ name="%preferencePages_RunDebug_name"
+ class="org.eclipse.statet.internal.r.debug.ui.preferences.RInteractionPreferencePage">
+ </page>
+ <!--page
id="org.eclipse.statet.r.preferencePages.RInteractionPage"
- category="org.eclipse.statet.base.preferencePages.RunDebug"
- class="org.eclipse.statet.internal.r.debug.ui.preferences.RInteractionPreferencePage"
- name="%preferencePages_RInteraction_name"/>
+ category="org.eclipse.statet.r.preferencePages.RunDebug"
+ name="%preferencePages_RInteraction_name"
+ class="org.eclipse.statet.internal.r.debug.ui.preferences.RInteractionPreferencePage">
+ </page-->
<page
id="org.eclipse.statet.r.preferencePages.REnvironmentPage"
- category="org.eclipse.statet.base.preferencePages.RunDebug"
- class="org.eclipse.statet.internal.r.debug.ui.preferences.REnvPreferencePage"
- name="%preferencePages_REnvironments_name"/>
+ category="org.eclipse.statet.r.preferencePages.RunDebug"
+ name="%preferencePages_REnvironments_name"
+ class="org.eclipse.statet.internal.r.debug.ui.preferences.REnvPreferencePage">
+ </page>
<page
id="org.eclipse.statet.r.preferencePages.RRepositories"
- category="org.eclipse.statet.base.preferencePages.RunDebug"
- class="org.eclipse.statet.internal.r.ui.pkgmanager.RRepoPreferencePage"
- name="%preferencePages_RRepositories_name"/>
+ category="org.eclipse.statet.r.preferencePages.RunDebug"
+ name="%preferencePages_RRepositories_name"
+ class="org.eclipse.statet.internal.r.ui.pkgmanager.RRepoPreferencePage">
+ </page>
</extension>
<extension point="org.eclipse.ui.commands">
<!-- commands of launch shortcuts above -->
@@ -2171,7 +2197,7 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.r.preferencePages.RGraphicsPage"
- category="org.eclipse.statet.base.preferencePages.StatetBase"
+ category="org.eclipse.statet.r.preferencePages.R"
name="%preferencePages_RGraphicsPage_name"
class="org.eclipse.statet.rj.eclient.graphics.RGraphicsPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceAppearance"/>
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/Messages.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/Messages.java
index af55cc6..86a2cb0 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/Messages.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/Messages.java
@@ -28,6 +28,8 @@
public static String RIdentifiers_Identifier_error_AlreadyExistingInSameGroup_message;
public static String RIdentifiers_Identifier_error_AlreadyExistingInOtherGroup_message;
+ public static String SourceEditors_SeeAlso_info;
+
public static String RSyntaxColoring_CodeCategory_label;
public static String RSyntaxColoring_CommentsCategory_label;
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/Messages.properties b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/Messages.properties
index df5a55c..77c1b1c 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/Messages.properties
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/Messages.properties
@@ -17,6 +17,8 @@
RIdentifiers_Identifier_error_AlreadyExistingInSameGroup_message= The identifier already exists in this group.
RIdentifiers_Identifier_error_AlreadyExistingInOtherGroup_message= The identifier already exists in ''''{0}''''.
+SourceEditors_SeeAlso_info= See also the preference pages for:
+
RSyntaxColoring_CodeCategory_label= Code
RSyntaxColoring_CommentsCategory_label= Comments
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RBasePreferencePage.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RBasePreferencePage.java
new file mode 100644
index 0000000..dd82ef7
--- /dev/null
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/RBasePreferencePage.java
@@ -0,0 +1,62 @@
+/*=============================================================================#
+ # Copyright (c) 2019 Stephan Wahlbrink and others.
+ #
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ #
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ #
+ # Contributors:
+ # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================*/
+
+package org.eclipse.statet.internal.r.ui.preferences;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.swt.widgets.Composite;
+
+import org.eclipse.statet.ecommons.preferences.core.Preference;
+import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlock;
+import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlockPreferencePage;
+import org.eclipse.statet.ecommons.preferences.ui.ManagedConfigurationBlock;
+import org.eclipse.statet.ecommons.runtime.core.StatusChangeListener;
+
+
+public class RBasePreferencePage extends ConfigurationBlockPreferencePage {
+
+
+ public RBasePreferencePage() {
+ }
+
+
+ @Override
+ protected ConfigurationBlock createConfigurationBlock() {
+ return new RBaseConfigurationBlock(createStatusChangedListener());
+ }
+
+}
+
+
+class RBaseConfigurationBlock extends ManagedConfigurationBlock {
+
+
+ public RBaseConfigurationBlock(final StatusChangeListener statusListener) {
+ super(null, statusListener);
+ }
+
+
+ @Override
+ public void createBlockArea(final Composite pageComposite) {
+ final Map<Preference<?>, String> prefs= new HashMap<>();
+
+ setupPreferenceManager(prefs);
+
+ initBindings();
+ updateControls();
+ }
+
+}
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/SourceEditorsPreferencePage.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/SourceEditorsPreferencePage.java
new file mode 100644
index 0000000..cf7bfd6
--- /dev/null
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/preferences/SourceEditorsPreferencePage.java
@@ -0,0 +1,54 @@
+/*=============================================================================#
+ # Copyright (c) 2009, 2019 Stephan Wahlbrink and others.
+ #
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ #
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ #
+ # Contributors:
+ # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================*/
+
+package org.eclipse.statet.internal.r.ui.preferences;
+
+import org.eclipse.swt.widgets.Composite;
+
+import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlock;
+import org.eclipse.statet.ecommons.preferences.ui.ConfigurationBlockPreferencePage;
+import org.eclipse.statet.ecommons.preferences.ui.ManagedConfigurationBlock;
+import org.eclipse.statet.ecommons.runtime.core.StatusChangeListener;
+
+
+public class SourceEditorsPreferencePage extends ConfigurationBlockPreferencePage {
+
+
+ public SourceEditorsPreferencePage() {
+ }
+
+
+ @Override
+ protected ConfigurationBlock createConfigurationBlock() {
+ return new SourceEditorsConfigurationBlock(createStatusChangedListener());
+ }
+
+}
+
+
+class SourceEditorsConfigurationBlock extends ManagedConfigurationBlock {
+
+
+ public SourceEditorsConfigurationBlock(final StatusChangeListener statusListener) {
+ super(null, statusListener);
+ }
+
+
+ @Override
+ public void createBlockArea(final Composite pageComposite) {
+ addLinkHeader(pageComposite, Messages.SourceEditors_SeeAlso_info +
+ "\n • All <a href=\"org.eclipse.ui.preferencePages.GeneralTextEditor\">Text Editors</a> (Eclipse, StatET)" );
+ }
+
+}
diff --git a/redocs/org.eclipse.statet.redocs.tex.r/plugin.xml b/redocs/org.eclipse.statet.redocs.tex.r/plugin.xml
index c8a5202..becab28 100644
--- a/redocs/org.eclipse.statet.redocs.tex.r/plugin.xml
+++ b/redocs/org.eclipse.statet.redocs.tex.r/plugin.xml
@@ -405,7 +405,7 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.r.preferencePages.LtxRweaveEditor"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="%preferencePages_SweaveEditorOptions"
class="org.eclipse.statet.internal.redocs.tex.r.ui.config.EditorPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
diff --git a/redocs/org.eclipse.statet.redocs.wikitext.r/plugin.xml b/redocs/org.eclipse.statet.redocs.wikitext.r/plugin.xml
index 84af944..5d8b6fd 100644
--- a/redocs/org.eclipse.statet.redocs.wikitext.r/plugin.xml
+++ b/redocs/org.eclipse.statet.redocs.wikitext.r/plugin.xml
@@ -249,7 +249,7 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.redocs.preferencePages.WikitextREditor"
- category="org.eclipse.statet.base.preferencePages.Editors"
+ category="org.eclipse.statet.r.preferencePages.SourceEditors"
name="%preferencePages_WikitextRweaveEditorOptions"
class="org.eclipse.statet.internal.redocs.wikitext.r.ui.config.EditorPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
