[185851] source editors need to handle high contrast setting better
diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/JSPUIPreferenceInitializer.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/JSPUIPreferenceInitializer.java
index 447efb3..b0e9b10 100644
--- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/JSPUIPreferenceInitializer.java
+++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/JSPUIPreferenceInitializer.java
@@ -2,9 +2,11 @@
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.text.templates.Template;
import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
import org.eclipse.jst.jsp.ui.internal.style.IStyleConstantsJSP;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.html.ui.internal.style.IStyleConstantsHTML;
import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
@@ -21,6 +23,7 @@
*/
public void initializeDefaultPreferences() {
IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
+ ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
// setting the same as HTML
store.setDefault(JSPUIPreferenceNames.AUTO_PROPOSE, true);
@@ -29,10 +32,10 @@
// JSP Style Preferences
String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
- String styleValue = ColorHelper.getColorString(127, 0, 127) + NOBACKGROUNDBOLD;
+ String styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_NAME, 127, 0, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_NAME, styleValue);
- styleValue = ColorHelper.getColorString(42, 0, 255) + JUSTITALIC;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, 42, 0, 255) + JUSTITALIC;
store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
@@ -40,17 +43,18 @@
// specified value is black; leaving as widget default
store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS, styleValue);
- styleValue = ColorHelper.getColorString(63, 95, 191) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_BORDER, 63, 95, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.COMMENT_BORDER, styleValue);
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_TEXT, 63, 95, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.COMMENT_TEXT, styleValue);
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_BORDER, styleValue);
- styleValue = ColorHelper.getColorString(63, 127, 127) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_NAME, 63, 127, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_NAME, styleValue);
- styleValue = ColorHelper.getColorString(191, 95, 63) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsHTML.SCRIPT_AREA_BORDER, 191, 95, 63) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsHTML.SCRIPT_AREA_BORDER, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.wst.css.ui/plugin.properties b/bundles/org.eclipse.wst.css.ui/plugin.properties
index 32dfaf0..2b3989c 100644
--- a/bundles/org.eclipse.wst.css.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.css.ui/plugin.properties
@@ -54,3 +54,13 @@
scope.structured.text.editor.css.name=Editing CSS Source
scope.structured.text.editor.css.description=Editing CSS Source
+
+Colors.atmarkRule=At Mark Rule
+Colors.selector=Selector
+Colors.media=Media
+Colors.comment=Comment
+Colors.propertyName=Property Name
+Colors.propertyValue=Property Value
+Colors.uri=URI
+Colors.string=String
+Colors.error=Error
diff --git a/bundles/org.eclipse.wst.css.ui/plugin.xml b/bundles/org.eclipse.wst.css.ui/plugin.xml
index 78b1956..a0576b4 100644
--- a/bundles/org.eclipse.wst.css.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.css.ui/plugin.xml
@@ -352,6 +352,104 @@
</definition>
</extension>
+ <!-- Define theme -->
+ <extension
+ point="org.eclipse.ui.themes">
+ <theme
+ id="org.eclipse.ui.ide.systemDefault">
+ <colorOverride
+ id="ATMARK_RULE"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="SELECTOR"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="MEDIA"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="COMMENT"
+ value="COLOR_LIST_SELECTION">
+ </colorOverride>
+ <colorOverride
+ id="PROPERTY_NAME"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="PROPERTY_VALUE"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="URI"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="STRING"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="ERROR"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ </theme>
+ <colorDefinition
+ id="ATMARK_RULE"
+ isEditable="false"
+ label="%Colors.atmarkRule"
+ value="63, 127, 127">
+ </colorDefinition>
+ <colorDefinition
+ id="SELECTOR"
+ isEditable="false"
+ label="%Colors.selector"
+ value="63, 127, 127">
+ </colorDefinition>
+ <colorDefinition
+ id="MEDIA"
+ isEditable="false"
+ label="%Colors.media"
+ value="42, 0, 225">
+ </colorDefinition>
+ <colorDefinition
+ id="COMMENT"
+ isEditable="false"
+ label="%Colors.comment"
+ value="63, 95, 191">
+ </colorDefinition>
+ <colorDefinition
+ id="PROPERTY_NAME"
+ isEditable="false"
+ label="%Colors.propertyName"
+ value="127, 0, 127">
+ </colorDefinition>
+ <colorDefinition
+ id="PROPERTY_VALUE"
+ isEditable="false"
+ label="%Colors.propertyValue"
+ value="42, 0, 225">
+ </colorDefinition>
+ <colorDefinition
+ id="URI"
+ isEditable="false"
+ label="%Colors.uri"
+ value="42, 0, 225">
+ </colorDefinition>
+ <colorDefinition
+ id="STRING"
+ isEditable="false"
+ label="%Colors.string"
+ value="42, 0, 225">
+ </colorDefinition>
+ <colorDefinition
+ id="ERROR"
+ isEditable="false"
+ label="%Colors.error"
+ value="191, 63, 63">
+ </colorDefinition>
+ </extension>
+
<!-- Enable the FormatHandler for CSS Content Type -->
<extension point="org.eclipse.ui.handlers">
<handler
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java
index 44d0e02..c4714f0 100644
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java
+++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java
@@ -2,7 +2,9 @@
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.text.templates.Template;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
import org.eclipse.wst.css.ui.internal.style.IStyleConstantsCSS;
import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
@@ -17,28 +19,33 @@
*/
public void initializeDefaultPreferences() {
IPreferenceStore store = CSSUIPlugin.getDefault().getPreferenceStore();
+ ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
+
// CSS Style Preferences
String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
String styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
store.setDefault(IStyleConstantsCSS.NORMAL, styleValue);
- styleValue = ColorHelper.getColorString(63, 127, 127) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATMARK_RULE, 63, 127, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsCSS.ATMARK_RULE, styleValue);
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.SELECTOR, 63, 127, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsCSS.SELECTOR, styleValue);
- styleValue = ColorHelper.getColorString(42, 0, 225) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.MEDIA, 42, 0, 225) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsCSS.MEDIA, styleValue);
- styleValue = ColorHelper.getColorString(63, 95, 191) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.COMMENT, 63, 95, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsCSS.COMMENT, styleValue);
- styleValue = ColorHelper.getColorString(127, 0, 127) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.PROPERTY_NAME, 127, 0, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsCSS.PROPERTY_NAME, styleValue);
- styleValue = ColorHelper.getColorString(42, 0, 225) + JUSTITALIC;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.PROPERTY_VALUE, 42, 0, 225) + JUSTITALIC;
store.setDefault(IStyleConstantsCSS.PROPERTY_VALUE, styleValue);
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.URI, 42, 0, 225) + JUSTITALIC;
store.setDefault(IStyleConstantsCSS.URI, styleValue);
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.STRING, 42, 0, 225) + JUSTITALIC;
store.setDefault(IStyleConstantsCSS.STRING, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
@@ -46,7 +53,7 @@
store.setDefault(IStyleConstantsCSS.SEMI_COLON, styleValue);
store.setDefault(IStyleConstantsCSS.CURLY_BRACE, styleValue);
- styleValue = ColorHelper.getColorString(191, 63, 63) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ERROR, 191, 63, 63) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsCSS.ERROR, styleValue);
// set default new css file template to use in new file wizard
diff --git a/bundles/org.eclipse.wst.dtd.ui/plugin.properties b/bundles/org.eclipse.wst.dtd.ui/plugin.properties
index 410db75..3f5b50c 100644
--- a/bundles/org.eclipse.wst.dtd.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.dtd.ui/plugin.properties
@@ -50,3 +50,13 @@
preferenceKeywords.files=editor dtd creating files suffix specified
preferenceKeywords.templates=editor dtd templates snippet macros
preferenceKeywords.styles=editor dtd style customize syntax highlighting type text content foreground background bold color
+
+Colors.dtdDefault=DTD Default
+Colors.dtdTag=DTD Tag
+Colors.dtdTagName=DTD Tag Name
+Colors.dtdComment=DTD Comment
+Colors.dtdKeyword=DTD Keyword
+Colors.dtdString=DTD String
+Colors.dtdData=DTD Data
+Colors.dtdSymbol=DTD Symbol
+
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/plugin.xml b/bundles/org.eclipse.wst.dtd.ui/plugin.xml
index 8d17761..415c252 100644
--- a/bundles/org.eclipse.wst.dtd.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.dtd.ui/plugin.xml
@@ -384,4 +384,92 @@
</propertySection>
</propertySections>
</extension>
+
+ <!-- Define theme -->
+ <extension
+ point="org.eclipse.ui.themes">
+ <theme
+ id="org.eclipse.ui.ide.systemDefault">
+ <colorOverride
+ id="dtdDefault"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="dtdTag"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="dtdTagName"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="dtdComment"
+ value="COLOR_LIST_SELECTION">
+ </colorOverride>
+ <colorOverride
+ id="dtdKeyword"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="dtdString"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="dtdData"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="dtdSymbol"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ </theme>
+ <colorDefinition
+ id="dtdDefault"
+ isEditable="false"
+ label="%Colors.dtdDefault"
+ value="0, 0, 0">
+ </colorDefinition>
+ <colorDefinition
+ id="dtdTag"
+ isEditable="false"
+ label="%Colors.dtdTag"
+ value="63, 63, 191">
+ </colorDefinition>
+ <colorDefinition
+ id="dtdTagName"
+ isEditable="false"
+ label="%Colors.dtdTagName"
+ value="63, 63, 191">
+ </colorDefinition>
+ <colorDefinition
+ id="dtdComment"
+ isEditable="false"
+ label="%Colors.dtdComment"
+ value="127, 127, 127">
+ </colorDefinition>
+ <colorDefinition
+ id="dtdKeyword"
+ isEditable="false"
+ label="%Colors.dtdKeyword"
+ value="128, 0, 0">
+ </colorDefinition>
+ <colorDefinition
+ id="dtdString"
+ isEditable="false"
+ label="%Colors.dtdString"
+ value="63, 159, 95">
+ </colorDefinition>
+ <colorDefinition
+ id="dtdData"
+ isEditable="false"
+ label="%Colors.dtdData"
+ value="191, 95, 95">
+ </colorDefinition>
+ <colorDefinition
+ id="dtdSymbol"
+ isEditable="false"
+ label="%Colors.dtdSymbol"
+ value="128, 0, 0">
+ </colorDefinition>
+ </extension>
</plugin>
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceInitializer.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceInitializer.java
index 66bb95c..34d558d 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceInitializer.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceInitializer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,8 @@
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ColorRegistry;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
import org.eclipse.wst.dtd.ui.internal.style.IStyleConstantsDTD;
import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
@@ -29,32 +31,34 @@
*/
public void initializeDefaultPreferences() {
IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
-
+ ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
+
// DTD Style Preferences
String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
- String styleValue = ColorHelper.getColorString(0, 0, 0) + NOBACKGROUNDBOLD;
+ String styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_DEFAULT, 0, 0, 0) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsDTD.DTD_DEFAULT, styleValue); // black
- styleValue = ColorHelper.getColorString(63, 63, 191) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_TAG, 63, 63, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsDTD.DTD_TAG, styleValue); // blue
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_TAGNAME, 63, 63, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsDTD.DTD_TAGNAME, styleValue); // blue
- styleValue = ColorHelper.getColorString(127, 127, 127) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_COMMENT, 127, 127, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsDTD.DTD_COMMENT, styleValue); // grey
- styleValue = ColorHelper.getColorString(128, 0, 0) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_KEYWORD, 128, 0, 0) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsDTD.DTD_KEYWORD, styleValue); // dark
// red
- styleValue = ColorHelper.getColorString(63, 159, 95) + JUSTITALIC;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_STRING, 63, 159, 95) + JUSTITALIC;
store.setDefault(IStyleConstantsDTD.DTD_STRING, styleValue); // green
- styleValue = ColorHelper.getColorString(191, 95, 95) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_DATA, 191, 95, 95) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsDTD.DTD_DATA, styleValue); // light
// red
- styleValue = ColorHelper.getColorString(128, 0, 0) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_SYMBOL, 128, 0, 0) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsDTD.DTD_SYMBOL, styleValue); // dark
// red
}
diff --git a/bundles/org.eclipse.wst.html.ui/plugin.properties b/bundles/org.eclipse.wst.html.ui/plugin.properties
index c48a6b2..b097fbe 100644
--- a/bundles/org.eclipse.wst.html.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.html.ui/plugin.properties
@@ -70,3 +70,5 @@
scope.structured.text.editor.html.description=Editing HTML Source
scope.structured.text.editor.html.occurrences.name=HTML Source Occurrences
scope.structured.text.editor.html.occurrences.description=HTML Source Occurrences
+
+Colors.scriptAreaBorder=Script Area Border
diff --git a/bundles/org.eclipse.wst.html.ui/plugin.xml b/bundles/org.eclipse.wst.html.ui/plugin.xml
index 248c4f8..1ec3a7c 100644
--- a/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.html.ui/plugin.xml
@@ -565,6 +565,25 @@
</definition>
</extension>
+ <!-- Define theme - Many of the color overrides and definitions come from
+ the XML plugin -->
+ <extension
+ point="org.eclipse.ui.themes">
+ <theme
+ id="org.eclipse.ui.ide.systemDefault">
+ <colorOverride
+ id="SCRIPT_AREA_BORDER"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ </theme>
+ <colorDefinition
+ id="SCRIPT_AREA_BORDER"
+ isEditable="false"
+ label="%Colors.scriptAreaBorder"
+ value="191, 95, 63">
+ </colorDefinition>
+ </extension>
+
<!-- Enable the FormatHandler for HTML Content Type -->
<extension point="org.eclipse.ui.handlers">
<handler
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceInitializer.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceInitializer.java
index 8ef13c9..4192148 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceInitializer.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceInitializer.java
@@ -14,7 +14,9 @@
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.text.templates.Template;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.html.ui.internal.HTMLUIPlugin;
import org.eclipse.wst.html.ui.internal.style.IStyleConstantsHTML;
import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
@@ -32,64 +34,67 @@
*/
public void initializeDefaultPreferences() {
IPreferenceStore store = HTMLUIPlugin.getDefault().getPreferenceStore();
-
+ ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
+
store.setDefault(HTMLUIPreferenceNames.AUTO_PROPOSE, true);
store.setDefault(HTMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<=");//$NON-NLS-1$
// HTML Style Preferences
String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
- String styleValue = ColorHelper.getColorString(127, 0, 127) + NOBACKGROUNDBOLD;
+ String styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_NAME, 127, 0, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_NAME, styleValue);
- styleValue = ColorHelper.getColorString(42, 0, 255) + JUSTITALIC;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, 42, 0, 255) + JUSTITALIC;
store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS, styleValue); // specified value is black; leaving as widget default
- styleValue = ColorHelper.getColorString(63, 95, 191) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_BORDER, 63, 95, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.COMMENT_BORDER, styleValue);
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_TEXT, 63, 95, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.COMMENT_TEXT, styleValue);
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DECL_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DECL_BORDER, styleValue);
- styleValue = ColorHelper.getColorString(0, 0, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_NAME, 0, 0, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DOCTYPE_NAME, styleValue);
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, 0, 0, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, styleValue);
- styleValue = ColorHelper.getColorString(128, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, 128, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, styleValue);
- styleValue = ColorHelper.getColorString(63, 127, 95) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, 63, 127, 95) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
store.setDefault(IStyleConstantsXML.XML_CONTENT, styleValue); // specified value is black; leaving as widget default
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_BORDER, styleValue);
- styleValue = ColorHelper.getColorString(63, 127, 127) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_NAME, 63, 127, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_NAME, styleValue);
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.PI_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.PI_BORDER, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
store.setDefault(IStyleConstantsXML.PI_CONTENT, styleValue); // specified value is black; leaving as widget default
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.CDATA_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.CDATA_BORDER, styleValue);
- styleValue = ColorHelper.getColorString(0, 0, 0) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.CDATA_TEXT, 0, 0, 0) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.CDATA_TEXT, styleValue);
- styleValue = ColorHelper.getColorString(191, 95, 63) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsHTML.SCRIPT_AREA_BORDER, 191, 95, 63) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsHTML.SCRIPT_AREA_BORDER, styleValue);
- styleValue = ColorHelper.getColorString(42, 0, 255) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.ENTITY_REFERENCE, 42, 0, 255) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.ENTITY_REFERENCE, styleValue);
// set default new html file template to use in new file wizard
diff --git a/bundles/org.eclipse.wst.sse.ui/plugin.properties b/bundles/org.eclipse.wst.sse.ui/plugin.properties
index 20dbc0d..80f1a63 100644
--- a/bundles/org.eclipse.wst.sse.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.sse.ui/plugin.properties
@@ -100,4 +100,9 @@
StructureSelectPrevious_label=Previous Element
StructureSelectPrevious_tooltip=Expand selection to include previous sibling
StructureSelectHistory_label=Restore Last Selection
-StructureSelectHistory_tooltip=Restore last selection
\ No newline at end of file
+StructureSelectHistory_tooltip=Restore last selection
+
+Colors.content_assist_proposals_background=Content Assist Proposals Background
+Colors.content_assist_proposals_foreground=Content Assist Proposals Foreground
+Colors.content_assist_parameters_background=Content Assist Parameters Background
+Colors.content_assist_parameters_foreground=Content Assist Parameters Foreground
diff --git a/bundles/org.eclipse.wst.sse.ui/plugin.xml b/bundles/org.eclipse.wst.sse.ui/plugin.xml
index 864ee6f..8923404 100644
--- a/bundles/org.eclipse.wst.sse.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.sse.ui/plugin.xml
@@ -4,17 +4,17 @@
<extension-point
id="adapterFactoryDescription"
- name="%Adapter_Factory_Description_Extension.name" />
+ name="%Adapter_Factory_Description_Extension.name" ></extension-point>
<extension-point
id="extendedEditorActions"
- name="%Extended_Editor_Actions_Extension.name" />
+ name="%Extended_Editor_Actions_Extension.name" ></extension-point>
<extension-point
id="dropTargetTransfers"
- name="%Drop_Target_Transfers_Extension.name" />
+ name="%Drop_Target_Transfers_Extension.name" ></extension-point>
<extension-point
id="editorConfiguration"
name="%Extended_Editor_Configuration_Extension.name"
- schema="schema/editorconfiguration.exsd" />
+ schema="schema/editorconfiguration.exsd" ></extension-point>
<!-- Make sure default preference values are set at runtime -->
@@ -716,5 +716,53 @@
</definition>
</extension>
+ <!-- Define theme -->
+ <extension
+ point="org.eclipse.ui.themes">
+ <theme
+ id="org.eclipse.ui.ide.systemDefault">
+ <colorOverride
+ id="content_assist_proposals_background"
+ value="COLOR_LIST_BACKGROUND">
+ </colorOverride>
+ <colorOverride
+ id="content_assist_proposals_foreground"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="content_assist_parameters_background"
+ value="COLOR_LIST_BACKGROUND">
+ </colorOverride>
+ <colorOverride
+ id="content_assist_parameters_foreground"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ </theme>
+ <colorDefinition
+ id="content_assist_proposals_background"
+ isEditable="false"
+ label="%Colors.content_assist_proposals_background"
+ value="255,255,255">
+ </colorDefinition>
+ <colorDefinition
+ id="content_assist_proposals_foreground"
+ isEditable="false"
+ label="%Colors.content_assist_proposals_foreground"
+ value="0,0,0">
+ </colorDefinition>
+ <colorDefinition
+ id="content_assist_parameters_background"
+ isEditable="false"
+ label="%Colors.content_assist_parameters_background"
+ value="255,255,255">
+ </colorDefinition>
+ <colorDefinition
+ id="content_assist_parameters_foreground"
+ isEditable="false"
+ label="%Colors.content_assist_parameters_foreground"
+ value="0,0,0">
+ </colorDefinition>
+ </extension>
+
</plugin>
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java
index 372c808..14ff109 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,10 +15,13 @@
import org.eclipse.jface.action.Action;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames;
+import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
import org.eclipse.wst.sse.ui.internal.projection.IStructuredTextFoldingProvider;
import org.eclipse.wst.sse.ui.internal.provisional.preferences.CommonEditorPreferenceNames;
@@ -29,7 +32,8 @@
*/
public void initializeDefaultPreferences() {
IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
-
+ ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
+
// use the base annotation & quick diff preference page
EditorsUI.useAnnotationsPreferencePage(store);
EditorsUI.useQuickDiffPreferencePage(store);
@@ -47,7 +51,7 @@
// preference
store.setDefault(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, true);
- setMatchingBracketsPreferences(store);
+ setMatchingBracketsPreferences(store, registry);
// hover help preferences are not part of base text editor preference
String mod2Name = Action.findModifierString(SWT.MOD2); // SWT.COMMAND
@@ -67,15 +71,15 @@
// set content assist defaults
store.setDefault(EditorPreferenceNames.CODEASSIST_AUTOACTIVATION_DELAY, 500);
- PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PROPOSALS_BACKGROUND, new RGB(255, 255, 255));
- PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PROPOSALS_FOREGROUND, new RGB(0, 0, 0));
- PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PARAMETERS_BACKGROUND, new RGB(255, 255, 255));
- PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PARAMETERS_FOREGROUND, new RGB(0, 0, 0));
+ PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PROPOSALS_BACKGROUND, ColorHelper.findRGB(registry, EditorPreferenceNames.CODEASSIST_PROPOSALS_BACKGROUND, new RGB(255, 255, 255)));
+ PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PROPOSALS_FOREGROUND, ColorHelper.findRGB(registry, EditorPreferenceNames.CODEASSIST_PROPOSALS_FOREGROUND, new RGB(0, 0, 0)));
+ PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PARAMETERS_BACKGROUND, ColorHelper.findRGB(registry, EditorPreferenceNames.CODEASSIST_PARAMETERS_BACKGROUND, new RGB(255, 255, 255)));
+ PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PARAMETERS_FOREGROUND, ColorHelper.findRGB(registry, EditorPreferenceNames.CODEASSIST_PARAMETERS_FOREGROUND, new RGB(0, 0, 0)));
}
- private void setMatchingBracketsPreferences(IPreferenceStore store) {
+ private void setMatchingBracketsPreferences(IPreferenceStore store, ColorRegistry registry) {
// matching brackets is not part of base text editor preference
store.setDefault(EditorPreferenceNames.MATCHING_BRACKETS, true);
- PreferenceConverter.setDefault(store, EditorPreferenceNames.MATCHING_BRACKETS_COLOR, new RGB(192, 192, 192));
+ PreferenceConverter.setDefault(store, EditorPreferenceNames.MATCHING_BRACKETS_COLOR, ColorHelper.findRGB(registry, EditorPreferenceNames.MATCHING_BRACKETS_COLOR, new RGB(192, 192, 192)));
}
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/ColorHelper.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/ColorHelper.java
index d39424d..684da7b 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/ColorHelper.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/ColorHelper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@
+import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.wst.sse.ui.internal.Logger;
@@ -188,4 +189,42 @@
return stylePrefs;
}
+
+ /**
+ * Attempts to lookup the RGB value for <code>key</code> from the color
+ * registry. If one is not found, the <code>defaultRGB</code> is used.
+ * @param registry The ColorRegistry to search for the RGB value
+ * @param key The key that the RGB value is stored under in the registry
+ * @param defaultRGB The default RGB value to return in the absence of one
+ * from the color registry
+ *
+ * @return The RGB value from the color registry for a given key, if it exists.
+ * Otherwise, return the default RGB value.
+ */
+ public static RGB findRGB(ColorRegistry registry, String key, RGB defaultRGB) {
+ if(registry.hasValueFor(key))
+ return registry.getRGB(key);
+ return defaultRGB;
+ }
+
+ /**
+ * Attempts to find the RGB string for <code>key</code> from the color registry.
+ * If one is not found, an RGB string is generated from the parameters <code>r,g,b</code>.
+ *
+ * @param registry The ColorRegistry to search for the RGB value
+ * @param key The key that the RGB value is stored under in the registry
+ * @param r The default red value
+ * @param g The default green value
+ * @param b The default blue value
+ *
+ * @return The String RGB value from the color registry for a given key, if it exists.
+ * Otherwise, return the string RGB value created from the default r,g,b parameters.
+ *
+ */
+ public static String findRGBString(ColorRegistry registry, String key, int r, int g, int b) {
+ if(registry.hasValueFor(key))
+ return toRGBString(registry.getRGB(key));
+ return getColorString(r, g, b);
+ }
+
}
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.properties b/bundles/org.eclipse.wst.xml.ui/plugin.properties
index d521c58..3b47efd 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.properties
@@ -114,4 +114,20 @@
scope.structured.text.editor.xml.expand.name=XML Source Expand/Collapse
scope.structured.text.editor.xml.expand.description=XML Source Expand/Collapse
scope.structured.text.editor.xml.occurrences.name=XML Source Occurrences
-scope.structured.text.editor.xml.occurrences.description=XML Source Occurrences
\ No newline at end of file
+scope.structured.text.editor.xml.occurrences.description=XML Source Occurrences
+
+Colors.tagAttributeName=Tag Attribute Name
+Colors.tagAttributeValue=Tag Attribute Value
+Colors.commentBorder=Comment Border
+Colors.commentText=Comment Text
+Colors.declBorder=Declaration Border
+Colors.doctypeName=Doctype Name
+Colors.doctypeExternalPubref=Doctype External Public Reference
+Colors.doctypeExternalId=Doctype External Id
+Colors.doctypeExtrenalSysref=Doctype External System Reference
+Colors.tagBorder=Tag Border
+Colors.tagName=Tag Name
+Colors.piBorder=Processing Instruction Border
+Colors.cdataBorder=CDATA Border
+Colors.cdataText=CDATA Text
+Colors.entityReference=Entity Reference
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.xml b/bundles/org.eclipse.wst.xml.ui/plugin.xml
index 06124df..d8817ec 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.xml
@@ -1321,6 +1321,164 @@
name="%CollapseAll_name">
</command>
</extension>
+
+ <!-- Define theme -->
+ <extension
+ point="org.eclipse.ui.themes">
+ <theme
+ id="org.eclipse.ui.ide.systemDefault">
+ <colorOverride
+ id="tagAttributeName"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="tagAttributeValue"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="commentBorder"
+ value="COLOR_LIST_SELECTION">
+ </colorOverride>
+ <colorOverride
+ id="commentText"
+ value="COLOR_LIST_SELECTION">
+ </colorOverride>
+ <colorOverride
+ id="declBoder"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="doctypeName"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="doctypeExternalPubref"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="doctypeExternalId"
+ value="COLOR_WIDGET_NORMAL_SHADOW">
+ </colorOverride>
+ <colorOverride
+ id="doctypeExtrenalSysref"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="tagBorder"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="tagName"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="piBorder"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="cdataBorder"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="cdataText"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ <colorOverride
+ id="entityReference"
+ value="COLOR_LIST_FOREGROUND">
+ </colorOverride>
+ </theme>
+ <colorDefinition
+ id="tagAttributeName"
+ isEditable="false"
+ label="%Colors.tagAttributeName"
+ value="127, 0, 127">
+ </colorDefinition>
+ <colorDefinition
+ id="tagAttributeValue"
+ isEditable="false"
+ label="%Colors.tagAttributeValue"
+ value="42, 0, 255">
+ </colorDefinition>
+ <colorDefinition
+ id="commentBorder"
+ isEditable="false"
+ label="%Colors.commentBorder"
+ value="63, 95, 191">
+ </colorDefinition>
+ <colorDefinition
+ id="commentText"
+ isEditable="false"
+ label="%Colors.commentText"
+ value="63, 95, 191">
+ </colorDefinition>
+ <colorDefinition
+ id="declBoder"
+ isEditable="false"
+ label="%Colors.declBorder"
+ value="0, 128, 128">
+ </colorDefinition>
+ <colorDefinition
+ id="doctypeName"
+ isEditable="false"
+ label="%Colors.doctypeName"
+ value="0, 128, 128">
+ </colorDefinition>
+ <colorDefinition
+ id="doctypeExternalPubref"
+ isEditable="false"
+ label="%Colors.doctypeExternalPubref"
+ value="0, 128, 128">
+ </colorDefinition>
+ <colorDefinition
+ id="doctypeExternalId"
+ isEditable="false"
+ label="%Colors.doctypeExternalId"
+ value="128, 128, 128">
+ </colorDefinition>
+ <colorDefinition
+ id="doctypeExtrenalSysref"
+ isEditable="false"
+ label="%Colors.doctypeExtrenalSysref"
+ value="63, 127, 95">
+ </colorDefinition>
+ <colorDefinition
+ id="tagBorder"
+ isEditable="false"
+ label="%Colors.tagBorder"
+ value="0, 128, 128">
+ </colorDefinition>
+ <colorDefinition
+ id="tagName"
+ isEditable="false"
+ label="%Colors.tagName"
+ value="63, 127, 127">
+ </colorDefinition>
+ <colorDefinition
+ id="piBorder"
+ isEditable="false"
+ label="%Colors.piBorder"
+ value="0, 128, 128">
+ </colorDefinition>
+ <colorDefinition
+ id="cdataBorder"
+ isEditable="false"
+ label="%Colors.cdataBorder"
+ value="0, 128, 128">
+ </colorDefinition>
+ <colorDefinition
+ id="cdataText"
+ isEditable="false"
+ label="%Colors.cdataText"
+ value="0, 0, 0">
+ </colorDefinition>
+ <colorDefinition
+ id="entityReference"
+ isEditable="false"
+ label="%Colors.entityReference"
+ value="42, 0, 255">
+ </colorDefinition>
+ </extension>
<!-- Enable the FormatHandler for XML Content Type -->
<extension point="org.eclipse.ui.handlers">
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceInitializer.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceInitializer.java
index 80ac7a4..8d294b1 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceInitializer.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceInitializer.java
@@ -14,7 +14,9 @@
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.text.templates.Template;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
@@ -31,6 +33,7 @@
*/
public void initializeDefaultPreferences() {
IPreferenceStore store = XMLUIPlugin.getDefault().getPreferenceStore();
+ ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
store.setDefault(XMLUIPreferenceNames.AUTO_PROPOSE, true);
store.setDefault(XMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<=:"); //$NON-NLS-1$
@@ -41,10 +44,10 @@
// XML Style Preferences
String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
- String styleValue = ColorHelper.getColorString(127, 0, 127) + NOBACKGROUNDBOLD;
+ String styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_NAME, 127, 0, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_NAME, styleValue);
- styleValue = ColorHelper.getColorString(42, 0, 255) + JUSTITALIC;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, 42, 0, 255) + JUSTITALIC;
store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
@@ -57,21 +60,23 @@
// widget
// default
- styleValue = ColorHelper.getColorString(63, 95, 191) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_BORDER, 63, 95, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.COMMENT_BORDER, styleValue);
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_TEXT, 63, 95, 191) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.COMMENT_TEXT, styleValue);
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DECL_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DECL_BORDER, styleValue);
- styleValue = ColorHelper.getColorString(0, 0, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_NAME, 0, 0, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DOCTYPE_NAME, styleValue);
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, 0, 0, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, styleValue);
- styleValue = ColorHelper.getColorString(128, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, 128, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, styleValue);
- styleValue = ColorHelper.getColorString(63, 127, 95) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, 63, 127, 95) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
@@ -84,13 +89,13 @@
// widget
// default
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_BORDER, styleValue);
- styleValue = ColorHelper.getColorString(63, 127, 127) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_NAME, 63, 127, 127) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.TAG_NAME, styleValue);
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.PI_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.PI_BORDER, styleValue);
styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
@@ -103,13 +108,13 @@
// widget
// default
- styleValue = ColorHelper.getColorString(0, 128, 128) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.CDATA_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.CDATA_BORDER, styleValue);
- styleValue = ColorHelper.getColorString(0, 0, 0) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.CDATA_TEXT, 0, 0, 0) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.CDATA_TEXT, styleValue);
- styleValue = ColorHelper.getColorString(42, 0, 255) + NOBACKGROUNDBOLD;
+ styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.ENTITY_REFERENCE, 42, 0, 255) + NOBACKGROUNDBOLD;
store.setDefault(IStyleConstantsXML.ENTITY_REFERENCE, styleValue);
// set default new xml file template to use in new file wizard