Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 64449 Details for
Bug 22243
[preferences] java editor does not respect high contrast settings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch with the defaults added
22243.txt (text/plain), 70.23 KB, created by
Tod Creasey
on 2007-04-20 10:58:53 EDT
(
hide
)
Description:
Patch with the defaults added
Filename:
MIME Type:
Creator:
Tod Creasey
Created:
2007-04-20 10:58:53 EDT
Size:
70.23 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#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 20 Apr 2007 14:58:57 -0000 >@@ -21,7 +21,9 @@ > 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.ui.PlatformUI; > import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; > import org.eclipse.ui.texteditor.AbstractTextEditor; > >@@ -33,6 +35,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 +3514,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 +3595,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 +3610,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 +3637,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 +3656,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 +3716,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 +3830,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 +3989,20 @@ > } > 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 registry.getRGB(key); >+ >+ 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 20 Apr 2007 14:58:56 -0000 >@@ -15,8 +15,11 @@ > > import org.eclipse.jface.preference.IPreferenceStore; > import org.eclipse.jface.preference.PreferenceConverter; >+import org.eclipse.jface.resource.ColorRegistry; > 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 +199,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 +260,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 +319,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 +378,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 +478,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 +537,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 +601,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 +667,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 +741,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 +812,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 +916,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 +983,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 +1046,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 +1109,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 +1222,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 +1290,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 +1365,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 +1440,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 +1515,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 +1591,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 +1915,19 @@ > */ > 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 registry.getRGB(key); >+ >+ 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 20 Apr 2007 14:58:56 -0000 >@@ -5575,5 +5575,471 @@ > </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_default" >+ value="LIST_FOREGROUND"> >+ </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> >+ <colorOverride >+ id="org.eclipse.jdt.ui.typeVariableDeclarationHighlighting" >+ value="COLOR_WIDGET_DARK_SHADOW"> >+ </colorOverride> >+ <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> >+ <colorOverride >+ id="org.eclipse.jdt.ui.staticMethodDeclarationHighlighting" >+ value="COLOR_LIST_FOREGROUND"> >+ </colorOverride> >+ </theme> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.matchingBracketsColor" >+ isEditable="false" >+ label="%Colors.matching_brackets" >+ value="192,192,192"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_multi_line_comment" >+ isEditable="false" >+ label="%Colors.java_multi_line_comment" >+ value="63,127,95"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_keyword" >+ isEditable="false" >+ label="%Colors.java_keyword" >+ value="127,0,85"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_keyword_return" >+ isEditable="false" >+ label="%Colors.java_keyword_return" >+ value="127,0,85"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_string" >+ isEditable="false" >+ label="%Colors.java_string" >+ value="42,0,255"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_default" >+ isEditable="false" >+ label="%Colors.java_default" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_single_line_comment" >+ isEditable="false" >+ label="%Colors.java_single_line_comment" >+ value="63,127,95"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_operator" >+ isEditable="false" >+ label="%Colors.java_operator" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_doc_keyword" >+ isEditable="false" >+ label="%Colors.java_doc_keyword" >+ value="127,159,191"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_doc_tag" >+ isEditable="false" >+ label="%Colors.java_doc_tag" >+ value="127,127,159"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_bracket" >+ isEditable="false" >+ label="%Colors.java_bracket" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_comment_task_tag" >+ isEditable="false" >+ label="%Colors.java_comment_task_tag" >+ value="127,159,191"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_doc_link" >+ isEditable="false" >+ label="%Colors.java_doc_link" >+ value="63,63,191"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.java_doc_default" >+ isEditable="false" >+ label="%Colors.java_doc_default" >+ value="63,95,191"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.content_assist_proposals_background" >+ isEditable="false" >+ label="%Colors.content_assist_proposals_background" >+ value="255,255,255"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.content_assist_proposals_foreground" >+ isEditable="false" >+ label="%Colors.content_assist_proposals_foreground" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.content_assist_parameters_background" >+ isEditable="false" >+ label="%Colors.content_assist_parameters_background" >+ value="255,255,255"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.content_assist_parameters_foreground" >+ isEditable="false" >+ label="%Colors.content_assist_parameters_foreground" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.content_assist_completion_replacement_background" >+ isEditable="false" >+ label="%Colors.content_assist_completion_replacement_background" >+ value="255,255,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.content_assist_completion_replacement_foreground" >+ isEditable="false" >+ label="%Colors.content_assist_completion_replacement_foreground" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.pf_coloring_value" >+ isEditable="false" >+ label="%Colors.pf_coloring_value" >+ value="42,0,255"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.pf_coloring_key" >+ isEditable="false" >+ label="%Colors.pf_coloring_key" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.pf_coloring_argument" >+ isEditable="false" >+ label="%Colors.pf_coloring_argument" >+ value="127,0,85"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.pf_coloring_assignment" >+ isEditable="false" >+ label="%Colors.pf_coloring_assignment" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.pf_coloring_comment" >+ isEditable="false" >+ label="%Colors.pf_coloring_comment" >+ value="63,127,95"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.staticFieldTextHighlighting" >+ isEditable="false" >+ label="%Colors.staticFieldTextHighlighting" >+ value="0,0,192"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.staticFinalFieldTextHighlighting" >+ isEditable="false" >+ label="%Colors.staticFinalFieldTextHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.fieldHighlighting" >+ isEditable="false" >+ label="%Colors.fieldHighlighting" >+ value="0,0,192"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.autoboxHighlighting" >+ isEditable="false" >+ label="%Colors.autoboxHighlighting" >+ value="171,48,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.staticMethodDeclarionHighlighting" >+ isEditable="false" >+ label="%Colors.staticMethodDeclarionHighlighting" >+ value="171,48,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.annotationReferenceElementHighlighting" >+ isEditable="false" >+ label="%Colors.annotationReferenceElementHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.abstractMethodInvocationHighlighting" >+ isEditable="false" >+ label="%Colors.abstractMethodInvocationHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.inheritedMethodInvocationHighlighting" >+ isEditable="false" >+ label="%Colors.inheritedMethodInvocationHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.methodInvocationHighlighting" >+ isEditable="false" >+ label="%Colors.methodInvocationHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.localVariableDeclarionHighlighting" >+ isEditable="false" >+ label="%Colors.localVariableDeclarionHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.localVariableHighlighting" >+ isEditable="false" >+ label="%Colors.localVariableHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.parameterVariableDeclarionHighlighting" >+ isEditable="false" >+ label="%Colors.parameterVariableDeclarionHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.deprecatedMemberHighlighting" >+ isEditable="false" >+ label="%Colors.deprecatedMemberHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.typeVariableDeclarationHighlighting" >+ isEditable="false" >+ label="%Colors.typeVariableDeclarationHighlighting" >+ value="100,70,50"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.classHighlighting" >+ isEditable="false" >+ label="%Colors.classHighlighting" >+ value="0,80,50"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.enumHighlighting" >+ isEditable="false" >+ label="%Colors.enumHighlighting" >+ value="100,70,50"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.interfaceHighlighting" >+ isEditable="false" >+ label="%Colors.interfaceHighlighting" >+ value="50,63,112"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.annotationHighlighting" >+ isEditable="false" >+ label="%Colors.annotationHighlighting" >+ value="50,63,112"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.typeArgumentHighlighting" >+ isEditable="false" >+ label="%Colors.typeArgumentHighlighting" >+ value="13,100,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.methodDeclarationHighlighting" >+ isEditable="false" >+ label="%Colors.methodDeclarationHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.jdt.ui.staticMethodDeclarationHighlighting" >+ isEditable="false" >+ label="%Colors.staticMethodDeclarationHighlighting" >+ value="0,0,0"> >+ </colorDefinition> >+ </extension> > > </plugin> >Index: plugin.properties >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/plugin.properties,v >retrieving revision 1.451 >diff -u -r1.451 plugin.properties >--- plugin.properties 23 Mar 2007 17:18:29 -0000 1.451 >+++ plugin.properties 20 Apr 2007 14:58:56 -0000 >@@ -1040,3 +1040,51 @@ > JavaElementHyperlinkDetector= Java Element > NLSHyperlinkDetector= Java Property Key > PropertyKeyHyperlinkDetector= Java Property Key >+ >+#---Themes --- >+Colors.matching_brackets = Matching Brackets >+Colors.java_multi_line_comment = Java Multi Line Comment >+Colors.java_keyword = Java Keyword >+Colors.java_keyword_return = Java Keyword Return >+Colors.java_string = Java String >+Colors.java_single_line_comment = Java Single Line Comment >+Colors.java_operator = Java Operator >+Colors.java_doc_keyword = Javadoc keyword >+Colors.java_doc_tag = Javadoc tag >+Colors.java_bracket = Java bracket >+Colors.java_comment_task_tag = Java Comment Task Tag >+Colors.java_default = Java Default >+Colors.java_doc_link = Javadoc link >+Colors.java_doc_default = Javadoc default >+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 >+Colors.content_assist_completion_replacement_background = Content Assist Completion Replacement Background >+Colors.content_assist_completion_replacement_foreground = Content Assist Completion Replacement Foreground >+Colors.pf_coloring_value = Properties File Value >+Colors.pf_coloring_key = Properties File Key >+Colors.pf_coloring_argument = Properties File Argument >+Colors.pf_coloring_assignment = Properties File Assignment >+Colors.pf_coloring_comment = Properties File Comment >+Colors.staticFieldTextHighlighting = Static Field Text Highlighting >+Colors.staticFinalFieldTextHighlighting = Static Final Field Text Highlighting >+Colors.fieldHighlighting = Field Highlighting >+Colors.autoboxHighlighting = Autobox Highlighting >+Colors.staticMethodDeclarionHighlighting = Static Method Declarion Highlighting >+Colors.annotationReferenceElementHighlighting = Annotation Reference Element Highlighting >+Colors.abstractMethodInvocationHighlighting = Abstract Method Invocation Highlighting >+Colors.inheritedMethodInvocationHighlighting = Inherited Method Invocation Highlighting >+Colors.methodInvocationHighlighting = Method Invocation Highlighting >+Colors.localVariableDeclarionHighlighting = Local Variable Declaration Highlighting >+Colors.localVariableHighlighting = Local Variable Highlighting >+Colors.parameterVariableDeclarionHighlighting = Parameter Variable Declaration Highlighting >+Colors.deprecatedMemberHighlighting = Deprecated Member Highlighting >+Colors.typeVariableDeclarationHighlighting = Type Variable Declaration Highlighting >+Colors.classHighlighting = Class Highlighting >+Colors.enumHighlighting = Enum Highlighting >+Colors.interfaceHighlighting = Interface Highlighting >+Colors.annotationHighlighting = Annotation Highlighting >+Colors.typeArgumentHighlighting = Type Argument Highlighting >+Colors.methodDeclarationHighlighting = Method Declaration Highlighting >+Colors.staticMethodDeclarationHighlighting = Static Method Declaration Highlighting >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; >+ >+} >#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 20 Apr 2007 14:58:57 -0000 >@@ -12,19 +12,18 @@ > > 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.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 +456,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 +475,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 +505,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 +540,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 +559,22 @@ > 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 registry.getRGB(key); >+ >+ 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 20 Apr 2007 14:58:57 -0000 >@@ -932,5 +932,61 @@ > 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.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> >+ <colorDefinition >+ id="org.eclipse.ui.editors.currentLineColor" >+ isEditable="false" >+ label="%Colors.currentLineColor" >+ value="232,242,254"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.ui.editors.lineNumberColor" >+ isEditable="false" >+ label="%Colors.lineNumberColor" >+ value="120,120,120"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.ui.editors.hyperlinkColor" >+ isEditable="false" >+ label="%Colors.hyperlinkColor" >+ value="0,0,255"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.ui.editors.AbstractTextEditor.Color.FindScope" >+ isEditable="false" >+ label="%Colors.FindScope" >+ value="185,176,180"> >+ </colorDefinition> >+ <colorDefinition >+ id="org.eclipse.ui.editors.printMarginColor" >+ isEditable="false" >+ label="%Colors.PrintMargin" >+ value="176,180,185"> >+ </colorDefinition> >+ </extension> > > </plugin> >Index: plugin.properties >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/plugin.properties,v >retrieving revision 1.65 >diff -u -r1.65 plugin.properties >--- plugin.properties 27 Mar 2007 10:23:26 -0000 1.65 >+++ plugin.properties 20 Apr 2007 14:58:57 -0000 >@@ -135,3 +135,10 @@ > TextEditorHyperlinkTarget= Textual Editors > URLHyperlinkDetector= URL > HyperlinkDetectorsPreferencePage= Hyperlinking >+ >+#--- Themes --- # >+Colors.currentLineColor = Current Line >+Colors.lineNumberColor = Line Number >+Colors.hyperlinkColor = Hyperlink >+Colors.FindScope = Find Scope >+Colors.PrintMargin = Print Margin >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; >+ >+}
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=64449">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 22243
:
64060
|
64099
|
64221
| 64449
