Attachment 64099 Details for Bug 22243 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

22243.txt (text/plain), 54.52 KB, created by Tod Creasey

on 2007-04-17 16:27:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2007-04-17 16:27:43 EDT

Size: 54.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.editors
>Index: src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java,v
>retrieving revision 1.39
>diff -u -r1.39 AbstractDecoratedTextEditorPreferenceConstants.java
>--- src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java	19 Mar 2007 10:42:36 -0000	1.39
>+++ src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java	17 Apr 2007 20:26:45 -0000
>@@ -12,19 +12,19 @@
> 
> import java.util.StringTokenizer;
> 
>-import org.eclipse.swt.SWT;
>-import org.eclipse.swt.graphics.RGB;
>-
> 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.jface.resource.JFaceResources;
> import org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter;
> import org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension;
>-
>+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.ui.internal.editors.text.EditorsPlugin;
>+import org.eclipse.ui.internal.texteditor.ITextEditorThemeConstants;
> import org.eclipse.ui.texteditor.spelling.SpellingService;
> 
> /**
>@@ -457,12 +457,17 @@
>   	* @param store the preference store to be initialized
>   	*/
> 	public static void initializeDefaultValues(IPreferenceStore store) {
>+		
>+		ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
> 
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_ANNOTATIONS_PREFERENCE_PAGE, false);
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_QUICK_DIFF_PREFERENCE_PAGE, false);
> 
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);
>-		PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(232, 242, 254));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR,
>+				findColor(registry,ITextEditorThemeConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(232, 242, 254)));
> 
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH, 4);
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS, false);
>@@ -471,10 +476,17 @@
> 
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, false);
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 80);
>-		PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, new RGB(176, 180 , 185));
>+		
>+		PreferenceConverter.setDefault(
>+				store, 
>+				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, 
>+				findColor(registry,ITextEditorThemeConstants.EDITOR_PRINT_MARGIN_COLOR,new RGB(176, 180 , 185)));
> 
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, false);
>-		PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, new RGB(120, 120, 120));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, 
>+				findColor(registry,ITextEditorThemeConstants.EDITOR_LINE_NUMBER_RULER_COLOR,new RGB(120, 120, 120)));
> 
> 		if (!store.getBoolean(USE_QUICK_DIFF_PREFERENCE_PAGE)) {
> 			store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON, true);
>@@ -494,16 +506,22 @@
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR, true);
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_DEFAULT_COLOR, true);
> 
>-		PreferenceConverter.setDefault(store, AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND, new RGB(255, 255, 255));
>+		PreferenceConverter.setDefault(store,AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND,new RGB(255, 255, 255));
>+		
> 		store.setDefault(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, true);
>-		PreferenceConverter.setDefault(store, AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND, new RGB(0, 0, 0));
>+		PreferenceConverter.setDefault(store,AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND,new RGB(0, 0, 0));
>+		
> 		store.setDefault(AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT, true);
> 
> 		String mod1Name= Action.findModifierString(SWT.MOD1);	// SWT.COMMAND on MAC; SWT.CONTROL elsewhere
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED, true);
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER, mod1Name);
> 		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER_MASK, SWT.MOD1);
>-		PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_COLOR, new RGB(0, 0, 255));
>+		
>+		PreferenceConverter.setDefault(
>+				store, 
>+				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_COLOR, 
>+				findColor(registry,ITextEditorThemeConstants.EDITOR_HYPERLINK_COLOR,new RGB(0, 0, 255)));
> 
> 		HyperlinkDetectorDescriptor[] descriptors= EditorsUI.getHyperlinkDetectorRegistry().getHyperlinkDetectorDescriptors();
> 		for (int i= 0; i < descriptors.length; i++) {
>@@ -523,7 +541,11 @@
> 		store.setDefault(SHOW_RANGE_INDICATOR, true);
> 		store.setDefault(REVISION_ASK_BEFORE_QUICKDIFF_SWITCH, ""); //$NON-NLS-1$
> 		
>-		PreferenceConverter.setDefault(store, AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE, new RGB(185, 176 , 180));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE, 
>+				findColor(registry,ITextEditorThemeConstants.PREFERENCE_COLOR_FIND_SCOPE,new RGB(185, 176 , 180)));
>+		
> 		store.setDefault(AbstractTextEditor.PREFERENCE_RULER_CONTRIBUTIONS, ""); //$NON-NLS-1$
> 		store.setDefault(REVISION_RULER_RENDERING_MODE, IRevisionRulerColumnExtension.AGE.name());
> 		store.setDefault(REVISION_RULER_SHOW_AUTHOR, false);
>@@ -538,6 +560,23 @@
> 		MarkerAnnotationPreferences.initializeDefaultValues(store);
> 	}
> 	
>+	
>+	/**
>+	 * Return the RGB for the key in the color registry. If there is no entry return defaultRGB.
>+	 * @param registry
>+	 * @param key the key for the constant in the registry
>+	 * @param defaultRGB
>+	 * @return RGB
>+	 */
>+	private static RGB findColor(ColorRegistry registry,
>+			String key, RGB defaultRGB) {
>+		if (registry.hasValueFor(key))
>+			return JFaceResources.getResources().createColor(
>+					registry.getColorDescriptor(key)).getRGB();
>+
>+		return defaultRGB;
>+	}
>+
> 	/**
> 	 * Computes the state mask out of the given modifiers string.
> 	 *
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/plugin.xml,v
>retrieving revision 1.104
>diff -u -r1.104 plugin.xml
>--- plugin.xml	21 Feb 2007 15:19:20 -0000	1.104
>+++ plugin.xml	17 Apr 2007 20:26:45 -0000
>@@ -932,5 +932,35 @@
>             targetId="org.eclipse.ui.DefaultTextEditor">
>       </hyperlinkDetector>
>    </extension>
>+   <extension
>+         point="org.eclipse.ui.themes">
>+      <theme
>+            id="org.eclipse.ui.ide.systemDefault">
>+         <colorOverride
>+               id="org.eclipse.ui.editors.currentLineColor"
>+               value="COLOR_WIDGET_LIGHT_SHADOW">
>+         </colorOverride>
>+         <colorOverride
>+               id="org.eclipse.ui.editors.lineNumberColor"
>+               value="COLOR_WIDGET_DARK_SHADOW">
>+         </colorOverride>
>+         <colorOverride
>+               id="org.eclipse.ui.editors.AbstractTextEditor.HYPERLINK_COLOR"
>+               value="COLOR_LIST_SELECTION">
>+         </colorOverride>
>+         <colorOverride
>+               id="org.eclipse.ui.editors.AbstractTextEditor.Color.FindScope"
>+               value="COLOR_WIDGET_DARK_SHADOW">
>+         </colorOverride>
>+         <colorOverride
>+               id="org.eclipse.ui.editors.printMarginColor"
>+               value="COLOR_WIDGET_NORMAL_SHADOW">
>+         </colorOverride>
>+         <colorOverride
>+               id="org.eclipse.ui.editors.hyperlinkColor"
>+               value="LIST_SELECTION_COLOR">
>+         </colorOverride>
>+      </theme>
>+   </extension>
> 
> </plugin>
>Index: src/org/eclipse/ui/internal/texteditor/ITextEditorThemeConstants.java
>===================================================================
>RCS file: src/org/eclipse/ui/internal/texteditor/ITextEditorThemeConstants.java
>diff -N src/org/eclipse/ui/internal/texteditor/ITextEditorThemeConstants.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ui/internal/texteditor/ITextEditorThemeConstants.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,72 @@
>+/*******************************************************************************
>+ * Copyright (c) 2000, 2007 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.ui.internal.texteditor;
>+
>+import org.eclipse.jface.preference.PreferenceConverter;
>+import org.eclipse.ui.editors.text.EditorsUI;
>+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
>+import org.eclipse.ui.texteditor.AbstractTextEditor;
>+
>+/**
>+ * ITextEditorThemeConstants are the set of constants used in the theme
>+ * extensions by the text editor. These correspond to the constants in
>+ * {@link AbstractDecoratedTextEditorPreferenceConstants}
>+ * 
>+ */
>+public interface ITextEditorThemeConstants {
>+
>+	static String ID_PREFIX = EditorsUI.PLUGIN_ID + "."; //$NON-NLS-1$
>+
>+	/**
>+	 * A named theme constant that holds the color used to highlight the current
>+	 * line (value <code>"org.eclipse.ui.texteditor.currentLineColor"</code>).
>+	 * 
>+	 * @see org.eclipse.jface.resource.StringConverter
>+	 * @see PreferenceConverter
>+	 */
>+	public final static String EDITOR_CURRENT_LINE_COLOR = ID_PREFIX
>+			+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR;
>+
>+	/**
>+	 * A named theme constant that holds the color used to render line numbers
>+	 * inside the line number ruler (value
>+	 * <code>"org.eclipse.ui.texteditor.lineNumberColor"</code>).
>+	 * 
>+	 * @see org.eclipse.jface.resource.StringConverter
>+	 * @see PreferenceConverter
>+	 */
>+	public final static String EDITOR_LINE_NUMBER_RULER_COLOR = ID_PREFIX
>+			+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR;
>+
>+	/**
>+	 * A named theme constant that holds the color used for hyperlinks.
>+	 * 
>+	 * @see org.eclipse.jface.resource.StringConverter
>+	 */
>+	public final static String EDITOR_HYPERLINK_COLOR = ID_PREFIX
>+			+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_COLOR;
>+
>+	/**
>+	 * Key used to look up find scope background color preference. Value:
>+	 * <code>org.eclipse.ui.texteditor.AbstractTextEditor.Color.FindScope</code>
>+	 */
>+	public final static String PREFERENCE_COLOR_FIND_SCOPE = ID_PREFIX
>+			+ AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE;
>+
>+	/**
>+	 * A named preference that holds the color used to render the print margin
>+	 * (value <code>"org.eclipse.ui.texteditor.printMarginColor"</code>).
>+	 */
>+	public final static String EDITOR_PRINT_MARGIN_COLOR = ID_PREFIX
>+			+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR;
>+
>+}
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/ui/PreferenceConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/PreferenceConstants.java,v
>retrieving revision 1.209
>diff -u -r1.209 PreferenceConstants.java
>--- ui/org/eclipse/jdt/ui/PreferenceConstants.java	26 Mar 2007 10:33:11 -0000	1.209
>+++ ui/org/eclipse/jdt/ui/PreferenceConstants.java	17 Apr 2007 20:26:48 -0000
>@@ -21,7 +21,10 @@
> 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.jface.resource.JFaceResources;
> 
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
> import org.eclipse.ui.texteditor.AbstractTextEditor;
> 
>@@ -33,6 +36,7 @@
> 
> import org.eclipse.jdt.ui.text.IJavaColorConstants;
> 
>+import org.eclipse.jdt.internal.ui.IJDTThemeConstants;
> import org.eclipse.jdt.internal.ui.JavaPlugin;
> import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings;
> import org.eclipse.jdt.internal.ui.preferences.NewJavaProjectPreferencePage;
>@@ -3511,6 +3515,8 @@
> 	 * @since 2.1
> 	 */
> 	public static void initializeDefaultValues(IPreferenceStore store) {
>+		
>+		ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
> 		store.setDefault(PreferenceConstants.EDITOR_SHOW_SEGMENTS, false);
> 
> 		// JavaBasePreferencePage
>@@ -3590,7 +3596,10 @@
> 
> 		// JavaEditorPreferencePage
> 		store.setDefault(PreferenceConstants.EDITOR_MATCHING_BRACKETS, true);
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, new RGB(192, 192,192));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_MATCHING_BRACKETS_COLOR,new RGB(192, 192,192)));
> 
> 		store.setDefault(PreferenceConstants.EDITOR_CORRECTION_INDICATION, true);
> 		store.setDefault(PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE, true);
>@@ -3602,15 +3611,26 @@
> 		store.setDefault(PreferenceConstants.EDITOR_TAB_WIDTH, 4);
> 		store.setDefault(PreferenceConstants.EDITOR_SPACES_FOR_TABS, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_MULTI_LINE_COMMENT_COLOR,new RGB(63, 127, 95)));
>+		
> 		store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR,new RGB(63, 127, 95)));
>+		
> 		store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, new RGB(127, 0, 85));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_KEYWORD_COLOR,new RGB(127, 0, 85)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD, true);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC, false);
> 
>@@ -3618,11 +3638,18 @@
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_ANNOTATION_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_ANNOTATION_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_STRING_COLOR, new RGB(42, 0, 255));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_STRING_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_STRING_COLOR,new RGB(42, 0, 255)));
>+		
> 		store.setDefault(PreferenceConstants.EDITOR_STRING_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_STRING_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR, new RGB(0, 0, 0));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_DEFAULT_COLOR,new RGB(0, 0, 0)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC, false);
> 
>@@ -3630,35 +3657,59 @@
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_METHOD_NAME_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_METHOD_NAME_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_COLOR, new RGB(127, 0, 85));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_KEYWORD_RETURN_COLOR,new RGB(127, 0, 85)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_BOLD, true);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_OPERATOR_COLOR, new RGB(0, 0, 0));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVA_OPERATOR_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_OPERATOR_COLOR,new RGB(0, 0, 0)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_OPERATOR_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_OPERATOR_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_BRACKET_COLOR, new RGB(0, 0, 0));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVA_BRACKET_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_BRACKET_COLOR,new RGB(0, 0, 0)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_BRACKET_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVA_BRACKET_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_TASK_TAG_COLOR, new RGB(127, 159, 191));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_TASK_TAG_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_TASK_TAG_COLOR,new RGB(127, 159, 191)));
> 		store.setDefault(PreferenceConstants.EDITOR_TASK_TAG_BOLD, true);
> 		store.setDefault(PreferenceConstants.EDITOR_TASK_TAG_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR, new RGB(127, 159, 191));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVADOC_KEYWORD_COLOR,new RGB(127, 159, 191)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD, true);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR, new RGB(127, 127, 159));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVADOC_TAG_COLOR,new RGB(127, 127, 159)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR, new RGB(63, 63, 191));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVADOC_LINKS_COLOR,new RGB(63, 63, 191)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_ITALIC, false);
> 
>-		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR, new RGB(63, 95, 191));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR, 
>+				findColor(registry,IJDTThemeConstants.EDITOR_JAVADOC_DEFAULT_COLOR,new RGB(63, 95, 191)));
> 		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD, false);
> 		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_ITALIC, false);
> 
>@@ -3666,12 +3717,30 @@
> 		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, 200);
> 
> 		store.setDefault(PreferenceConstants.CODEASSIST_AUTOINSERT, true);
>-		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, new RGB(255, 255, 255));
>-		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, new RGB(0, 0, 0));
>-		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND, new RGB(255, 255, 255));
>-		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND, new RGB(0, 0, 0));
>-		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND, new RGB(255, 255, 0));
>-		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND, new RGB(255, 0, 0));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, 
>+				findColor(registry,IJDTThemeConstants.CODEASSIST_PROPOSALS_BACKGROUND,new RGB(255, 255, 255)));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, 
>+				findColor(registry,IJDTThemeConstants.CODEASSIST_PROPOSALS_FOREGROUND,new RGB(0, 0, 0)));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND, 
>+				findColor(registry,IJDTThemeConstants.CODEASSIST_PARAMETERS_BACKGROUND,new RGB(255, 255, 255)));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND, 
>+				findColor(registry,IJDTThemeConstants.CODEASSIST_PARAMETERS_FOREGROUND,new RGB(0, 0, 0)));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND, 
>+				findColor(registry,IJDTThemeConstants.CODEASSIST_REPLACEMENT_BACKGROUND,new RGB(255, 255, 0)));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND, 
>+				findColor(registry,IJDTThemeConstants.CODEASSIST_REPLACEMENT_FOREGROUND,new RGB(255, 0, 0)));
> 		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, "."); //$NON-NLS-1$
> 		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC, "@#"); //$NON-NLS-1$
> 		store.setDefault(PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS, true);
>@@ -3762,19 +3831,38 @@
> 		store.setDefault(PreferenceConstants.EDITOR_FOLDING_HEADERS, true);
> 		
> 		// properties file editor
>-		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_KEY, new RGB(0, 0, 0));
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.PROPERTIES_FILE_COLORING_KEY, 
>+				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_KEY,new RGB(0, 0, 0)));
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_KEY_BOLD, false);
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_KEY_ITALIC, false);
>-		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE, new RGB(42, 0, 255));
>+		
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE, 
>+				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_VALUE,new RGB(42, 0, 255)));
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE_BOLD, false);
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE_ITALIC, false);
>-		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT, new RGB(0, 0, 0));
>+		
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT, 
>+				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT,new RGB(0, 0, 0)));
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT_BOLD, false);
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT_ITALIC, false);
>-		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT, new RGB(127, 0, 85));
>+		
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT, 
>+				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_ARGUMENT,new RGB(127, 0, 85)));
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT_BOLD, true);
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT_ITALIC, false);
>-		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT,  new RGB(63, 127, 95));
>+		
>+		PreferenceConverter.setDefault(
>+				store, 
>+				PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT,  
>+				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_COMMENT,new RGB(63, 127, 95)));
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_BOLD, false);
> 		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_ITALIC, false);
> 		
>@@ -3902,5 +3990,21 @@
> 		}
> 		return new DefaultScope().getNode(JavaUI.ID_PLUGIN).get(key, null);
> 	}
>+	
>+	/**
>+	 * Return the RGB for the key in the color registry. If there is no entry return defaultRGB.
>+	 * @param registry
>+	 * @param key the key for the constant in the registry
>+	 * @param defaultRGB
>+	 * @return RGB
>+	 */
>+	private static RGB findColor(ColorRegistry registry,
>+			String key, RGB defaultRGB) {
>+		if (registry.hasValueFor(key))
>+			return JFaceResources.getResources().createColor(
>+					registry.getColorDescriptor(key)).getRGB();
>+
>+		return defaultRGB;
>+	}
> }
> 
>Index: ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java,v
>retrieving revision 1.45
>diff -u -r1.45 SemanticHighlightings.java
>--- ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java	7 Jul 2006 15:25:26 -0000	1.45
>+++ ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java	17 Apr 2007 20:26:48 -0000
>@@ -15,8 +15,12 @@
> 
> import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.preference.PreferenceConverter;
>+import org.eclipse.jface.resource.ColorRegistry;
>+import org.eclipse.jface.resource.JFaceResources;
> import org.eclipse.jface.util.PropertyChangeEvent;
> 
>+import org.eclipse.ui.PlatformUI;
>+
> import org.eclipse.jdt.core.dom.ASTNode;
> import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
> import org.eclipse.jdt.core.dom.ArrayAccess;
>@@ -196,9 +200,14 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.STATIC_FINAL_FIELD_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
>+
>+
> 		/*
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextStyleBold()
> 		 */
>@@ -252,7 +261,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 192);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.STATIC_FIELD_TEXT_HIGHLIGHTING,
>+					new RGB(0, 0, 192));
> 		}
> 
> 		/*
>@@ -308,7 +320,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 192);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.FIELD_HIGHLIGHTING,
>+					new RGB(0, 0, 192));
> 		}
> 
> 		/*
>@@ -364,7 +379,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(171, 48, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.AUTOBOX_HIGHLIGHTING,
>+					new RGB(171, 48, 0));
> 		}
> 
> 		/*
>@@ -461,7 +479,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.METHOD_DECLARATION_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -517,7 +538,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.STATIC_METHOD_DECLARATION_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -578,7 +602,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.ANNOTATION_REFERENCE_ELEMENT_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -641,7 +668,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.ABSTRACT_METHOD_INVOCATION_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -712,7 +742,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.INHERITED_METHOD_INVOCATION_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -780,7 +813,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.METHOD_INVOCATION_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -881,7 +917,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.LOCAL_VARIABLE_DECLARATION_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -945,7 +984,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.LOCAL_VARIABLE_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -1005,7 +1047,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.PARAMETER_VARIABLE_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -1065,7 +1110,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 0, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.DEPRECATED_MEMBER_HIGHLIGHTING,
>+					new RGB(0, 0, 0));
> 		}
> 
> 		/*
>@@ -1175,7 +1223,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(100, 70, 50);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.TYPE_VARIABLE_HIGHLIGHTING,
>+					new RGB(100, 70, 50));
> 		}
> 
> 		/*
>@@ -1240,7 +1291,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(0, 80, 50);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.CLASS_HIGHLIGHTING,
>+					new RGB(0, 80, 50));
> 		}
> 
> 		/*
>@@ -1312,7 +1366,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(100, 70, 50);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.ENUM_HIGHLIGHTING,
>+					new RGB(100, 70, 50));
> 		}
> 		
> 		/*
>@@ -1384,7 +1441,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(50, 63, 112);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.INTERFACE_HIGHLIGHTING,
>+					new RGB(50, 63, 112));
> 		}
> 		
> 		/*
>@@ -1456,7 +1516,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(100, 100, 100);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.ANNOTATION_HIGHLIGHTING,
>+					new RGB(50, 63, 112));
> 		}
> 		
> 		/*
>@@ -1529,7 +1592,10 @@
> 		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
> 		 */
> 		public RGB getDefaultTextColor() {
>-			return new RGB(13, 100, 0);
>+			return findRGB(
>+					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
>+					ISemanticHighlightingsThemeConstants.TYPE_ARGUMENT_HIGHLIGHTING,
>+					new RGB(13, 100, 0));
> 		}
> 		
> 		/*
>@@ -1850,4 +1916,20 @@
> 	 */
> 	private SemanticHighlightings() {
> 	}
>+	
>+	/**
>+	 * Find the RGB for the key in the registry. Return defaultRGB if it is
>+	 * not found.
>+	 * @param registry
>+	 * @param key
>+	 * @param defaultRGB
>+	 * @return RGB
>+	 */
>+	static RGB findRGB(ColorRegistry registry, String key, RGB defaultRGB) {
>+		if (registry.hasValueFor(key))
>+			return JFaceResources.getResources().createColor(
>+					registry.getColorDescriptor(key)).getRGB();
>+
>+		return defaultRGB;
>+	}
> }
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/plugin.xml,v
>retrieving revision 1.733
>diff -u -r1.733 plugin.xml
>--- plugin.xml	3 Apr 2007 09:40:33 -0000	1.733
>+++ plugin.xml	17 Apr 2007 20:26:48 -0000
>@@ -5575,5 +5575,187 @@
> 	         </selectionEnablement>
>       	</linkHelper>          
>  </extension>
>+ <extension
>+       point="org.eclipse.ui.themes">
>+    <theme
>+          id="org.eclipse.ui.ide.systemDefault">
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.matchingBracketsColor"
>+             value="COLOR_WIDGET_NORMAL_SHADOW">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_multi_line_comment"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_keyword"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_keyword_return"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_string"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_single_line_comment"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_operator"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_doc_keyword"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_doc_tag"
>+             value="COLOR_WIDGET_NORMAL_SHADOW">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_bracket"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_comment_task_tag"
>+             value="COLOR_WIDGET_NORMAL_SHADOW">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_doc_link"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.java_doc_default"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.content_assist_proposals_background"
>+             value="COLOR_LIST_BACKGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.content_assist_proposals_foreground"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.content_assist_parameters_background"
>+             value="COLOR_LIST_BACKGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.content_assist_parameters_foreground"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.content_assist_completion_replacement_background"
>+             value="COLOR_INFO_BACKGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.content_assist_completion_replacement_foreground"
>+             value="COLOR_INFO_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.pf_coloring_value"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.pf_coloring_key"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.pf_coloring_argument"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.pf_coloring_assignment"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.pf_coloring_comment"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.staticFieldTextHighlighting"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.staticFinalFieldTextHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.fieldHighlighting"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.autoboxHighlighting"
>+             value="COLOR_WIDGET_DARK_SHADOW">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.staticMethodDeclarionHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.annotationReferenceElementHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.abstractMethodInvocationHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.inheritedMethodInvocationHighlighting"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.methodInvocationHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.localVariableDeclarionHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.localVariableHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.parameterVariableDeclarionHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.deprecatedMemberHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+       <fontOverride
>+             id="org.eclipse.jdt.ui.typeVariableDeclarationHighlighting"
>+             value="COLOR_WIDGET_DARK_SHADOW">
>+       </fontOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.classHighlighting"
>+             value="WIDGET_DARK_SHADOW">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.enumHighlighting"
>+             value="COLOR_WIDGET_DARK_SHADOW">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.interfaceHighlighting"
>+             value="COLOR_LIST_SELECTION">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.annotationHighlighting"
>+             value="COLOR_WIDGET_DARK_SHADOW">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.typeArgumentHighlighting"
>+             value="COLOR_WIDGET_DARK_SHADOW">
>+       </colorOverride>
>+       <colorOverride
>+             id="org.eclipse.jdt.ui.methodDeclarationHighlighting"
>+             value="COLOR_LIST_FOREGROUND">
>+       </colorOverride>
>+    </theme>
>+ </extension>
>      
> </plugin>
>Index: ui/org/eclipse/jdt/internal/ui/javaeditor/ISemanticHighlightingsThemeConstants.java
>===================================================================
>RCS file: ui/org/eclipse/jdt/internal/ui/javaeditor/ISemanticHighlightingsThemeConstants.java
>diff -N ui/org/eclipse/jdt/internal/ui/javaeditor/ISemanticHighlightingsThemeConstants.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/jdt/internal/ui/javaeditor/ISemanticHighlightingsThemeConstants.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,77 @@
>+/*******************************************************************************
>+ * Copyright (c) 2000, 2007 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.ui.javaeditor;
>+
>+import org.eclipse.jdt.ui.JavaUI;
>+
>+/**
>+ * ISemanticHighlightingsThemeConstants defines the set of constants in the
>+ * themes used by {@link SemanticHighlightings}
>+ * 
>+ */
>+public interface ISemanticHighlightingsThemeConstants {
>+
>+	static String ID_PREFIX = JavaUI.ID_PLUGIN + "."; //$NON-NLS-1$
>+
>+	static String STATIC_FIELD_TEXT_HIGHLIGHTING = ID_PREFIX + "staticFieldTextHighlighting"; //$NON-NLS-1$
>+
>+	static String STATIC_FINAL_FIELD_HIGHLIGHTING = ID_PREFIX + "staticFinalFieldTextHighlighting";//$NON-NLS-1$
>+
>+	static String FIELD_HIGHLIGHTING = ID_PREFIX + "fieldHighlighting";//$NON-NLS-1$
>+
>+	static String AUTOBOX_HIGHLIGHTING = ID_PREFIX + "autoboxHighlighting";//$NON-NLS-1$
>+
>+	static String STATIC_METHOD_DECLARATION_HIGHLIGHTING = ID_PREFIX
>+			+ "staticMethodDeclarionHighlighting";//$NON-NLS-1$
>+
>+	static String ANNOTATION_REFERENCE_ELEMENT_HIGHLIGHTING = ID_PREFIX
>+			+ "annotationReferenceElementHighlighting";//$NON-NLS-1$
>+
>+	static String ABSTRACT_METHOD_INVOCATION_HIGHLIGHTING = ID_PREFIX
>+			+ "abstractMethodInvocationHighlighting";//$NON-NLS-1$
>+
>+	static String INHERITED_METHOD_INVOCATION_HIGHLIGHTING = ID_PREFIX
>+			+ "inheritedMethodInvocationHighlighting";//$NON-NLS-1$
>+
>+	static String METHOD_INVOCATION_HIGHLIGHTING = ID_PREFIX
>+			+ "methodInvocationHighlighting";//$NON-NLS-1$
>+
>+	static String LOCAL_VARIABLE_DECLARATION_HIGHLIGHTING = ID_PREFIX
>+			+ "localVariableDeclarionHighlighting";//$NON-NLS-1$
>+
>+	static String LOCAL_VARIABLE_HIGHLIGHTING = ID_PREFIX
>+			+ "localVariableHighlighting";//$NON-NLS-1$
>+
>+	static String PARAMETER_VARIABLE_HIGHLIGHTING = ID_PREFIX
>+			+ "parameterVariableDeclarionHighlighting";//$NON-NLS-1$
>+
>+	static String DEPRECATED_MEMBER_HIGHLIGHTING = ID_PREFIX
>+			+ "deprecatedMemberHighlighting";//$NON-NLS-1$
>+
>+	static String TYPE_VARIABLE_HIGHLIGHTING = ID_PREFIX
>+			+ "typeVariableDeclarationHighlighting";//$NON-NLS-1$
>+
>+	static String CLASS_HIGHLIGHTING = ID_PREFIX + "classHighlighting";//$NON-NLS-1$
>+
>+	static String ENUM_HIGHLIGHTING = ID_PREFIX + "enumHighlighting";//$NON-NLS-1$
>+
>+	static String INTERFACE_HIGHLIGHTING = ID_PREFIX + "interfaceHighlighting";//$NON-NLS-1$
>+
>+	static String ANNOTATION_HIGHLIGHTING = ID_PREFIX
>+			+ "annotationHighlighting"; //$NON-NLS-1$
>+
>+	static String TYPE_ARGUMENT_HIGHLIGHTING = ID_PREFIX
>+			+ "typeArgumentHighlighting"; //$NON-NLS-1$
>+
>+	static String METHOD_DECLARATION_HIGHLIGHTING = ID_PREFIX
>+			+ "methodDeclarationHighlighting"; //$NON-NLS-1$
>+
>+}
>Index: ui/org/eclipse/jdt/internal/ui/IJDTThemeConstants.java
>===================================================================
>RCS file: ui/org/eclipse/jdt/internal/ui/IJDTThemeConstants.java
>diff -N ui/org/eclipse/jdt/internal/ui/IJDTThemeConstants.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/jdt/internal/ui/IJDTThemeConstants.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,195 @@
>+/*******************************************************************************
>+ * Copyright (c) 2000, 2007 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.jdt.internal.ui;
>+
>+import org.eclipse.jdt.ui.JavaUI;
>+import org.eclipse.jdt.ui.PreferenceConstants;
>+
>+/**
>+ * IJDTThemeConstants are the constants for themes that map to the JDT constants
>+ * in {@link PreferenceConstants}
>+ * 
>+ */
>+public interface IJDTThemeConstants {
>+
>+	static String ID_PREFIX = JavaUI.ID_PLUGIN + "."; //$NON-NLS-1$
>+
>+	/**
>+	 * A named theme constant that holds the color used to highlight matching
>+	 * brackets.
>+	 * 
>+	 */
>+	public final static String EDITOR_MATCHING_BRACKETS_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR;
>+
>+	/**
>+	 * A named theme constant that holds the color used to render multi-line
>+	 * comments.
>+	 * 
>+	 */
>+	public final static String EDITOR_MULTI_LINE_COMMENT_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR;
>+
>+	/**
>+	 * A named theme constant that holds the color used to render java keywords.
>+	 * 
>+	 */
>+	public final static String EDITOR_JAVA_KEYWORD_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render string constants.
>+	 */
>+	public final static String EDITOR_STRING_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_STRING_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render single line
>+	 * comments.
>+	 */
>+	public final static String EDITOR_SINGLE_LINE_COMMENT_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render operators.
>+	 */
>+	public final static String EDITOR_JAVA_OPERATOR_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVA_OPERATOR_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render java default text.
>+	 */
>+	public final static String EDITOR_JAVA_DEFAULT_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render the 'return'
>+	 * keyword.
>+	 */
>+	public final static String EDITOR_JAVA_KEYWORD_RETURN_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render javadoc keywords.
>+	 */
>+	public final static String EDITOR_JAVADOC_KEYWORD_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render javadoc tags.
>+	 */
>+	public final static String EDITOR_JAVADOC_TAG_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render brackets.
>+	 */
>+	public final static String EDITOR_JAVA_BRACKET_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVA_BRACKET_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render task tags.
>+	 */
>+	public final static String EDITOR_TASK_TAG_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_TASK_TAG_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render javadoc links.
>+	 */
>+	public final static String EDITOR_JAVADOC_LINKS_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the color used to render javadoc default
>+	 * text.
>+	 */
>+	public final static String EDITOR_JAVADOC_DEFAULT_COLOR = ID_PREFIX
>+			+ PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR;
>+
>+	/**
>+	 * A theme constant that holds the background color used in the code assist
>+	 * selection dialog.
>+	 */
>+	public final static String CODEASSIST_PROPOSALS_BACKGROUND = ID_PREFIX
>+			+ PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND;
>+
>+	/**
>+	 * A theme constant that holds the foreground color used in the code assist
>+	 * selection dialog.
>+	 */
>+	public final static String CODEASSIST_PROPOSALS_FOREGROUND = ID_PREFIX
>+			+ PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND;
>+
>+	/**
>+	 * A theme constant that holds the background color used for parameter
>+	 * hints.
>+	 */
>+	public final static String CODEASSIST_PARAMETERS_BACKGROUND = ID_PREFIX
>+			+ PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND;
>+
>+	/**
>+	 * A theme constant that holds the foreground color used in the code assist
>+	 * selection dialog.
>+	 */
>+	public final static String CODEASSIST_PARAMETERS_FOREGROUND = ID_PREFIX
>+			+ PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND;
>+
>+	/**
>+	 * A named preference that holds the background color used in the code
>+	 * assist selection dialog to mark replaced code.
>+	 */
>+	public final static String CODEASSIST_REPLACEMENT_BACKGROUND = ID_PREFIX
>+			+ PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND;
>+
>+	/**
>+	 * A named preference that holds the foreground color used in the code
>+	 * assist selection dialog to mark replaced code.
>+	 */
>+	public final static String CODEASSIST_REPLACEMENT_FOREGROUND = ID_PREFIX
>+			+ PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND;
>+
>+	/**
>+	 * A named preference that holds the color used to render values in a
>+	 * properties file.
>+	 */
>+	public static final String PROPERTIES_FILE_COLORING_VALUE = ID_PREFIX
>+			+ PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE;
>+
>+	/**
>+	 * A named preference that holds the color used to render keys in a
>+	 * properties file.
>+	 */
>+	public static final String PROPERTIES_FILE_COLORING_KEY = ID_PREFIX
>+			+ PreferenceConstants.PROPERTIES_FILE_COLORING_KEY;
>+
>+	/**
>+	 * A named preference that holds the color used to render arguments in a
>+	 * properties file.
>+	 */
>+	public static final String PROPERTIES_FILE_COLORING_ARGUMENT = ID_PREFIX
>+			+ PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT;
>+
>+	/**
>+	 * A named preference that holds the color used to render assignments in a
>+	 * properties file.
>+	 */
>+	public static final String PROPERTIES_FILE_COLORING_ASSIGNMENT = ID_PREFIX
>+			+ PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT;
>+
>+	/**
>+	 * A named preference that holds the color used to render comments in a
>+	 * properties file.
>+	 */
>+	public static final String PROPERTIES_FILE_COLORING_COMMENT = ID_PREFIX
>+			+ PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT;
>+
>+}

Actions: View | Diff

Attachments on bug 22243: 64060 | 64099 | 64221 | 64449