Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 22243 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java (-13 / +52 lines)
Lines 12-30 Link Here
12
12
13
import java.util.StringTokenizer;
13
import java.util.StringTokenizer;
14
14
15
import org.eclipse.swt.SWT;
16
import org.eclipse.swt.graphics.RGB;
17
18
import org.eclipse.jface.action.Action;
15
import org.eclipse.jface.action.Action;
19
import org.eclipse.jface.preference.IPreferenceStore;
16
import org.eclipse.jface.preference.IPreferenceStore;
20
import org.eclipse.jface.preference.PreferenceConverter;
17
import org.eclipse.jface.preference.PreferenceConverter;
21
18
import org.eclipse.jface.resource.ColorRegistry;
19
import org.eclipse.jface.resource.JFaceResources;
22
import org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter;
20
import org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter;
23
import org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension;
21
import org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension;
24
22
import org.eclipse.swt.SWT;
23
import org.eclipse.swt.graphics.RGB;
24
import org.eclipse.ui.PlatformUI;
25
import org.eclipse.ui.editors.text.EditorsUI;
25
import org.eclipse.ui.editors.text.EditorsUI;
26
27
import org.eclipse.ui.internal.editors.text.EditorsPlugin;
26
import org.eclipse.ui.internal.editors.text.EditorsPlugin;
27
import org.eclipse.ui.internal.texteditor.ITextEditorThemeConstants;
28
import org.eclipse.ui.texteditor.spelling.SpellingService;
28
import org.eclipse.ui.texteditor.spelling.SpellingService;
29
29
30
/**
30
/**
Lines 457-468 Link Here
457
  	* @param store the preference store to be initialized
457
  	* @param store the preference store to be initialized
458
  	*/
458
  	*/
459
	public static void initializeDefaultValues(IPreferenceStore store) {
459
	public static void initializeDefaultValues(IPreferenceStore store) {
460
		
461
		ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
460
462
461
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_ANNOTATIONS_PREFERENCE_PAGE, false);
463
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_ANNOTATIONS_PREFERENCE_PAGE, false);
462
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_QUICK_DIFF_PREFERENCE_PAGE, false);
464
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_QUICK_DIFF_PREFERENCE_PAGE, false);
463
465
464
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);
466
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);
465
		PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(232, 242, 254));
467
		PreferenceConverter.setDefault(
468
				store, 
469
				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR,
470
				findColor(registry,ITextEditorThemeConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(232, 242, 254)));
466
471
467
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH, 4);
472
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH, 4);
468
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS, false);
473
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS, false);
Lines 471-480 Link Here
471
476
472
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, false);
477
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, false);
473
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 80);
478
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 80);
474
		PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, new RGB(176, 180 , 185));
479
		
480
		PreferenceConverter.setDefault(
481
				store, 
482
				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, 
483
				findColor(registry,ITextEditorThemeConstants.EDITOR_PRINT_MARGIN_COLOR,new RGB(176, 180 , 185)));
475
484
476
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, false);
485
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, false);
477
		PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, new RGB(120, 120, 120));
486
		PreferenceConverter.setDefault(
487
				store, 
488
				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, 
489
				findColor(registry,ITextEditorThemeConstants.EDITOR_LINE_NUMBER_RULER_COLOR,new RGB(120, 120, 120)));
478
490
479
		if (!store.getBoolean(USE_QUICK_DIFF_PREFERENCE_PAGE)) {
491
		if (!store.getBoolean(USE_QUICK_DIFF_PREFERENCE_PAGE)) {
480
			store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON, true);
492
			store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON, true);
Lines 494-509 Link Here
494
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR, true);
506
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR, true);
495
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_DEFAULT_COLOR, true);
507
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_DEFAULT_COLOR, true);
496
508
497
		PreferenceConverter.setDefault(store, AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND, new RGB(255, 255, 255));
509
		PreferenceConverter.setDefault(store,AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND,new RGB(255, 255, 255));
510
		
498
		store.setDefault(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, true);
511
		store.setDefault(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, true);
499
		PreferenceConverter.setDefault(store, AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND, new RGB(0, 0, 0));
512
		PreferenceConverter.setDefault(store,AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND,new RGB(0, 0, 0));
513
		
500
		store.setDefault(AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT, true);
514
		store.setDefault(AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT, true);
501
515
502
		String mod1Name= Action.findModifierString(SWT.MOD1);	// SWT.COMMAND on MAC; SWT.CONTROL elsewhere
516
		String mod1Name= Action.findModifierString(SWT.MOD1);	// SWT.COMMAND on MAC; SWT.CONTROL elsewhere
503
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED, true);
517
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED, true);
504
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER, mod1Name);
518
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER, mod1Name);
505
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER_MASK, SWT.MOD1);
519
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER_MASK, SWT.MOD1);
506
		PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_COLOR, new RGB(0, 0, 255));
520
		
521
		PreferenceConverter.setDefault(
522
				store, 
523
				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_COLOR, 
524
				findColor(registry,ITextEditorThemeConstants.EDITOR_HYPERLINK_COLOR,new RGB(0, 0, 255)));
507
525
508
		HyperlinkDetectorDescriptor[] descriptors= EditorsUI.getHyperlinkDetectorRegistry().getHyperlinkDetectorDescriptors();
526
		HyperlinkDetectorDescriptor[] descriptors= EditorsUI.getHyperlinkDetectorRegistry().getHyperlinkDetectorDescriptors();
509
		for (int i= 0; i < descriptors.length; i++) {
527
		for (int i= 0; i < descriptors.length; i++) {
Lines 523-529 Link Here
523
		store.setDefault(SHOW_RANGE_INDICATOR, true);
541
		store.setDefault(SHOW_RANGE_INDICATOR, true);
524
		store.setDefault(REVISION_ASK_BEFORE_QUICKDIFF_SWITCH, ""); //$NON-NLS-1$
542
		store.setDefault(REVISION_ASK_BEFORE_QUICKDIFF_SWITCH, ""); //$NON-NLS-1$
525
		
543
		
526
		PreferenceConverter.setDefault(store, AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE, new RGB(185, 176 , 180));
544
		PreferenceConverter.setDefault(
545
				store, 
546
				AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE, 
547
				findColor(registry,ITextEditorThemeConstants.PREFERENCE_COLOR_FIND_SCOPE,new RGB(185, 176 , 180)));
548
		
527
		store.setDefault(AbstractTextEditor.PREFERENCE_RULER_CONTRIBUTIONS, ""); //$NON-NLS-1$
549
		store.setDefault(AbstractTextEditor.PREFERENCE_RULER_CONTRIBUTIONS, ""); //$NON-NLS-1$
528
		store.setDefault(REVISION_RULER_RENDERING_MODE, IRevisionRulerColumnExtension.AGE.name());
550
		store.setDefault(REVISION_RULER_RENDERING_MODE, IRevisionRulerColumnExtension.AGE.name());
529
		store.setDefault(REVISION_RULER_SHOW_AUTHOR, false);
551
		store.setDefault(REVISION_RULER_SHOW_AUTHOR, false);
Lines 538-543 Link Here
538
		MarkerAnnotationPreferences.initializeDefaultValues(store);
560
		MarkerAnnotationPreferences.initializeDefaultValues(store);
539
	}
561
	}
540
	
562
	
563
	
564
	/**
565
	 * Return the RGB for the key in the color registry. If there is no entry return defaultRGB.
566
	 * @param registry
567
	 * @param key the key for the constant in the registry
568
	 * @param defaultRGB
569
	 * @return RGB
570
	 */
571
	private static RGB findColor(ColorRegistry registry,
572
			String key, RGB defaultRGB) {
573
		if (registry.hasValueFor(key))
574
			return JFaceResources.getResources().createColor(
575
					registry.getColorDescriptor(key)).getRGB();
576
577
		return defaultRGB;
578
	}
579
541
	/**
580
	/**
542
	 * Computes the state mask out of the given modifiers string.
581
	 * Computes the state mask out of the given modifiers string.
543
	 *
582
	 *
(-)plugin.xml (+30 lines)
Lines 932-936 Link Here
932
            targetId="org.eclipse.ui.DefaultTextEditor">
932
            targetId="org.eclipse.ui.DefaultTextEditor">
933
      </hyperlinkDetector>
933
      </hyperlinkDetector>
934
   </extension>
934
   </extension>
935
   <extension
936
         point="org.eclipse.ui.themes">
937
      <theme
938
            id="org.eclipse.ui.ide.systemDefault">
939
         <colorOverride
940
               id="org.eclipse.ui.editors.currentLineColor"
941
               value="COLOR_WIDGET_LIGHT_SHADOW">
942
         </colorOverride>
943
         <colorOverride
944
               id="org.eclipse.ui.editors.lineNumberColor"
945
               value="COLOR_WIDGET_DARK_SHADOW">
946
         </colorOverride>
947
         <colorOverride
948
               id="org.eclipse.ui.editors.AbstractTextEditor.HYPERLINK_COLOR"
949
               value="COLOR_LIST_SELECTION">
950
         </colorOverride>
951
         <colorOverride
952
               id="org.eclipse.ui.editors.AbstractTextEditor.Color.FindScope"
953
               value="COLOR_WIDGET_DARK_SHADOW">
954
         </colorOverride>
955
         <colorOverride
956
               id="org.eclipse.ui.editors.printMarginColor"
957
               value="COLOR_WIDGET_NORMAL_SHADOW">
958
         </colorOverride>
959
         <colorOverride
960
               id="org.eclipse.ui.editors.hyperlinkColor"
961
               value="LIST_SELECTION_COLOR">
962
         </colorOverride>
963
      </theme>
964
   </extension>
935
965
936
</plugin>
966
</plugin>
(-)src/org/eclipse/ui/internal/texteditor/ITextEditorThemeConstants.java (+72 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
10
 *******************************************************************************/
11
12
package org.eclipse.ui.internal.texteditor;
13
14
import org.eclipse.jface.preference.PreferenceConverter;
15
import org.eclipse.ui.editors.text.EditorsUI;
16
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
17
import org.eclipse.ui.texteditor.AbstractTextEditor;
18
19
/**
20
 * ITextEditorThemeConstants are the set of constants used in the theme
21
 * extensions by the text editor. These correspond to the constants in
22
 * {@link AbstractDecoratedTextEditorPreferenceConstants}
23
 * 
24
 */
25
public interface ITextEditorThemeConstants {
26
27
	static String ID_PREFIX = EditorsUI.PLUGIN_ID + "."; //$NON-NLS-1$
28
29
	/**
30
	 * A named theme constant that holds the color used to highlight the current
31
	 * line (value <code>"org.eclipse.ui.texteditor.currentLineColor"</code>).
32
	 * 
33
	 * @see org.eclipse.jface.resource.StringConverter
34
	 * @see PreferenceConverter
35
	 */
36
	public final static String EDITOR_CURRENT_LINE_COLOR = ID_PREFIX
37
			+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR;
38
39
	/**
40
	 * A named theme constant that holds the color used to render line numbers
41
	 * inside the line number ruler (value
42
	 * <code>"org.eclipse.ui.texteditor.lineNumberColor"</code>).
43
	 * 
44
	 * @see org.eclipse.jface.resource.StringConverter
45
	 * @see PreferenceConverter
46
	 */
47
	public final static String EDITOR_LINE_NUMBER_RULER_COLOR = ID_PREFIX
48
			+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR;
49
50
	/**
51
	 * A named theme constant that holds the color used for hyperlinks.
52
	 * 
53
	 * @see org.eclipse.jface.resource.StringConverter
54
	 */
55
	public final static String EDITOR_HYPERLINK_COLOR = ID_PREFIX
56
			+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_COLOR;
57
58
	/**
59
	 * Key used to look up find scope background color preference. Value:
60
	 * <code>org.eclipse.ui.texteditor.AbstractTextEditor.Color.FindScope</code>
61
	 */
62
	public final static String PREFERENCE_COLOR_FIND_SCOPE = ID_PREFIX
63
			+ AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE;
64
65
	/**
66
	 * A named preference that holds the color used to render the print margin
67
	 * (value <code>"org.eclipse.ui.texteditor.printMarginColor"</code>).
68
	 */
69
	public final static String EDITOR_PRINT_MARGIN_COLOR = ID_PREFIX
70
			+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR;
71
72
}
(-)ui/org/eclipse/jdt/ui/PreferenceConstants.java (-25 / +129 lines)
Lines 21-27 Link Here
21
import org.eclipse.jface.action.Action;
21
import org.eclipse.jface.action.Action;
22
import org.eclipse.jface.preference.IPreferenceStore;
22
import org.eclipse.jface.preference.IPreferenceStore;
23
import org.eclipse.jface.preference.PreferenceConverter;
23
import org.eclipse.jface.preference.PreferenceConverter;
24
import org.eclipse.jface.resource.ColorRegistry;
25
import org.eclipse.jface.resource.JFaceResources;
24
26
27
import org.eclipse.ui.PlatformUI;
25
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
28
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
26
import org.eclipse.ui.texteditor.AbstractTextEditor;
29
import org.eclipse.ui.texteditor.AbstractTextEditor;
27
30
Lines 33-38 Link Here
33
36
34
import org.eclipse.jdt.ui.text.IJavaColorConstants;
37
import org.eclipse.jdt.ui.text.IJavaColorConstants;
35
38
39
import org.eclipse.jdt.internal.ui.IJDTThemeConstants;
36
import org.eclipse.jdt.internal.ui.JavaPlugin;
40
import org.eclipse.jdt.internal.ui.JavaPlugin;
37
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings;
41
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings;
38
import org.eclipse.jdt.internal.ui.preferences.NewJavaProjectPreferencePage;
42
import org.eclipse.jdt.internal.ui.preferences.NewJavaProjectPreferencePage;
Lines 3511-3516 Link Here
3511
	 * @since 2.1
3515
	 * @since 2.1
3512
	 */
3516
	 */
3513
	public static void initializeDefaultValues(IPreferenceStore store) {
3517
	public static void initializeDefaultValues(IPreferenceStore store) {
3518
		
3519
		ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
3514
		store.setDefault(PreferenceConstants.EDITOR_SHOW_SEGMENTS, false);
3520
		store.setDefault(PreferenceConstants.EDITOR_SHOW_SEGMENTS, false);
3515
3521
3516
		// JavaBasePreferencePage
3522
		// JavaBasePreferencePage
Lines 3590-3596 Link Here
3590
3596
3591
		// JavaEditorPreferencePage
3597
		// JavaEditorPreferencePage
3592
		store.setDefault(PreferenceConstants.EDITOR_MATCHING_BRACKETS, true);
3598
		store.setDefault(PreferenceConstants.EDITOR_MATCHING_BRACKETS, true);
3593
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, new RGB(192, 192,192));
3599
		PreferenceConverter.setDefault(
3600
				store, 
3601
				PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, 
3602
				findColor(registry,IJDTThemeConstants.EDITOR_MATCHING_BRACKETS_COLOR,new RGB(192, 192,192)));
3594
3603
3595
		store.setDefault(PreferenceConstants.EDITOR_CORRECTION_INDICATION, true);
3604
		store.setDefault(PreferenceConstants.EDITOR_CORRECTION_INDICATION, true);
3596
		store.setDefault(PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE, true);
3605
		store.setDefault(PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE, true);
Lines 3602-3616 Link Here
3602
		store.setDefault(PreferenceConstants.EDITOR_TAB_WIDTH, 4);
3611
		store.setDefault(PreferenceConstants.EDITOR_TAB_WIDTH, 4);
3603
		store.setDefault(PreferenceConstants.EDITOR_SPACES_FOR_TABS, false);
3612
		store.setDefault(PreferenceConstants.EDITOR_SPACES_FOR_TABS, false);
3604
3613
3605
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
3614
		PreferenceConverter.setDefault(
3615
				store, 
3616
				PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR, 
3617
				findColor(registry,IJDTThemeConstants.EDITOR_MULTI_LINE_COMMENT_COLOR,new RGB(63, 127, 95)));
3618
		
3606
		store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD, false);
3619
		store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD, false);
3607
		store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_ITALIC, false);
3620
		store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_ITALIC, false);
3608
3621
3609
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
3622
		PreferenceConverter.setDefault(
3623
				store, 
3624
				PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, 
3625
				findColor(registry,IJDTThemeConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR,new RGB(63, 127, 95)));
3626
		
3610
		store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD, false);
3627
		store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD, false);
3611
		store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC, false);
3628
		store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC, false);
3612
3629
3613
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, new RGB(127, 0, 85));
3630
		PreferenceConverter.setDefault(
3631
				store, 
3632
				PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, 
3633
				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_KEYWORD_COLOR,new RGB(127, 0, 85)));
3614
		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD, true);
3634
		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD, true);
3615
		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC, false);
3635
		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC, false);
3616
3636
Lines 3618-3628 Link Here
3618
		store.setDefault(PreferenceConstants.EDITOR_JAVA_ANNOTATION_BOLD, false);
3638
		store.setDefault(PreferenceConstants.EDITOR_JAVA_ANNOTATION_BOLD, false);
3619
		store.setDefault(PreferenceConstants.EDITOR_JAVA_ANNOTATION_ITALIC, false);
3639
		store.setDefault(PreferenceConstants.EDITOR_JAVA_ANNOTATION_ITALIC, false);
3620
3640
3621
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_STRING_COLOR, new RGB(42, 0, 255));
3641
		PreferenceConverter.setDefault(
3642
				store, 
3643
				PreferenceConstants.EDITOR_STRING_COLOR, 
3644
				findColor(registry,IJDTThemeConstants.EDITOR_STRING_COLOR,new RGB(42, 0, 255)));
3645
		
3622
		store.setDefault(PreferenceConstants.EDITOR_STRING_BOLD, false);
3646
		store.setDefault(PreferenceConstants.EDITOR_STRING_BOLD, false);
3623
		store.setDefault(PreferenceConstants.EDITOR_STRING_ITALIC, false);
3647
		store.setDefault(PreferenceConstants.EDITOR_STRING_ITALIC, false);
3624
3648
3625
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR, new RGB(0, 0, 0));
3649
		PreferenceConverter.setDefault(
3650
				store, 
3651
				PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR, 
3652
				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_DEFAULT_COLOR,new RGB(0, 0, 0)));
3626
		store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD, false);
3653
		store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD, false);
3627
		store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC, false);
3654
		store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC, false);
3628
3655
Lines 3630-3664 Link Here
3630
		store.setDefault(PreferenceConstants.EDITOR_JAVA_METHOD_NAME_BOLD, false);
3657
		store.setDefault(PreferenceConstants.EDITOR_JAVA_METHOD_NAME_BOLD, false);
3631
		store.setDefault(PreferenceConstants.EDITOR_JAVA_METHOD_NAME_ITALIC, false);
3658
		store.setDefault(PreferenceConstants.EDITOR_JAVA_METHOD_NAME_ITALIC, false);
3632
3659
3633
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_COLOR, new RGB(127, 0, 85));
3660
		PreferenceConverter.setDefault(
3661
				store, 
3662
				PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_COLOR, 
3663
				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_KEYWORD_RETURN_COLOR,new RGB(127, 0, 85)));
3634
		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_BOLD, true);
3664
		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_BOLD, true);
3635
		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_ITALIC, false);
3665
		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_ITALIC, false);
3636
3666
3637
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_OPERATOR_COLOR, new RGB(0, 0, 0));
3667
		PreferenceConverter.setDefault(
3668
				store, 
3669
				PreferenceConstants.EDITOR_JAVA_OPERATOR_COLOR, 
3670
				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_OPERATOR_COLOR,new RGB(0, 0, 0)));
3638
		store.setDefault(PreferenceConstants.EDITOR_JAVA_OPERATOR_BOLD, false);
3671
		store.setDefault(PreferenceConstants.EDITOR_JAVA_OPERATOR_BOLD, false);
3639
		store.setDefault(PreferenceConstants.EDITOR_JAVA_OPERATOR_ITALIC, false);
3672
		store.setDefault(PreferenceConstants.EDITOR_JAVA_OPERATOR_ITALIC, false);
3640
3673
3641
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_BRACKET_COLOR, new RGB(0, 0, 0));
3674
		PreferenceConverter.setDefault(
3675
				store, 
3676
				PreferenceConstants.EDITOR_JAVA_BRACKET_COLOR, 
3677
				findColor(registry,IJDTThemeConstants.EDITOR_JAVA_BRACKET_COLOR,new RGB(0, 0, 0)));
3642
		store.setDefault(PreferenceConstants.EDITOR_JAVA_BRACKET_BOLD, false);
3678
		store.setDefault(PreferenceConstants.EDITOR_JAVA_BRACKET_BOLD, false);
3643
		store.setDefault(PreferenceConstants.EDITOR_JAVA_BRACKET_ITALIC, false);
3679
		store.setDefault(PreferenceConstants.EDITOR_JAVA_BRACKET_ITALIC, false);
3644
3680
3645
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_TASK_TAG_COLOR, new RGB(127, 159, 191));
3681
		PreferenceConverter.setDefault(
3682
				store, 
3683
				PreferenceConstants.EDITOR_TASK_TAG_COLOR, 
3684
				findColor(registry,IJDTThemeConstants.EDITOR_TASK_TAG_COLOR,new RGB(127, 159, 191)));
3646
		store.setDefault(PreferenceConstants.EDITOR_TASK_TAG_BOLD, true);
3685
		store.setDefault(PreferenceConstants.EDITOR_TASK_TAG_BOLD, true);
3647
		store.setDefault(PreferenceConstants.EDITOR_TASK_TAG_ITALIC, false);
3686
		store.setDefault(PreferenceConstants.EDITOR_TASK_TAG_ITALIC, false);
3648
3687
3649
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR, new RGB(127, 159, 191));
3688
		PreferenceConverter.setDefault(
3689
				store, 
3690
				PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR, 
3691
				findColor(registry,IJDTThemeConstants.EDITOR_JAVADOC_KEYWORD_COLOR,new RGB(127, 159, 191)));
3650
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD, true);
3692
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD, true);
3651
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_ITALIC, false);
3693
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_ITALIC, false);
3652
3694
3653
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR, new RGB(127, 127, 159));
3695
		PreferenceConverter.setDefault(
3696
				store, 
3697
				PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR, 
3698
				findColor(registry,IJDTThemeConstants.EDITOR_JAVADOC_TAG_COLOR,new RGB(127, 127, 159)));
3654
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD, false);
3699
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD, false);
3655
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_ITALIC, false);
3700
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_ITALIC, false);
3656
3701
3657
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR, new RGB(63, 63, 191));
3702
		PreferenceConverter.setDefault(
3703
				store, 
3704
				PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR, 
3705
				findColor(registry,IJDTThemeConstants.EDITOR_JAVADOC_LINKS_COLOR,new RGB(63, 63, 191)));
3658
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD, false);
3706
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD, false);
3659
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_ITALIC, false);
3707
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_ITALIC, false);
3660
3708
3661
		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR, new RGB(63, 95, 191));
3709
		PreferenceConverter.setDefault(
3710
				store, 
3711
				PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR, 
3712
				findColor(registry,IJDTThemeConstants.EDITOR_JAVADOC_DEFAULT_COLOR,new RGB(63, 95, 191)));
3662
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD, false);
3713
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD, false);
3663
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_ITALIC, false);
3714
		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_ITALIC, false);
3664
3715
Lines 3666-3677 Link Here
3666
		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, 200);
3717
		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, 200);
3667
3718
3668
		store.setDefault(PreferenceConstants.CODEASSIST_AUTOINSERT, true);
3719
		store.setDefault(PreferenceConstants.CODEASSIST_AUTOINSERT, true);
3669
		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, new RGB(255, 255, 255));
3720
		PreferenceConverter.setDefault(
3670
		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, new RGB(0, 0, 0));
3721
				store, 
3671
		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND, new RGB(255, 255, 255));
3722
				PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, 
3672
		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND, new RGB(0, 0, 0));
3723
				findColor(registry,IJDTThemeConstants.CODEASSIST_PROPOSALS_BACKGROUND,new RGB(255, 255, 255)));
3673
		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND, new RGB(255, 255, 0));
3724
		PreferenceConverter.setDefault(
3674
		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND, new RGB(255, 0, 0));
3725
				store, 
3726
				PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, 
3727
				findColor(registry,IJDTThemeConstants.CODEASSIST_PROPOSALS_FOREGROUND,new RGB(0, 0, 0)));
3728
		PreferenceConverter.setDefault(
3729
				store, 
3730
				PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND, 
3731
				findColor(registry,IJDTThemeConstants.CODEASSIST_PARAMETERS_BACKGROUND,new RGB(255, 255, 255)));
3732
		PreferenceConverter.setDefault(
3733
				store, 
3734
				PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND, 
3735
				findColor(registry,IJDTThemeConstants.CODEASSIST_PARAMETERS_FOREGROUND,new RGB(0, 0, 0)));
3736
		PreferenceConverter.setDefault(
3737
				store, 
3738
				PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND, 
3739
				findColor(registry,IJDTThemeConstants.CODEASSIST_REPLACEMENT_BACKGROUND,new RGB(255, 255, 0)));
3740
		PreferenceConverter.setDefault(
3741
				store, 
3742
				PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND, 
3743
				findColor(registry,IJDTThemeConstants.CODEASSIST_REPLACEMENT_FOREGROUND,new RGB(255, 0, 0)));
3675
		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, "."); //$NON-NLS-1$
3744
		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, "."); //$NON-NLS-1$
3676
		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC, "@#"); //$NON-NLS-1$
3745
		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC, "@#"); //$NON-NLS-1$
3677
		store.setDefault(PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS, true);
3746
		store.setDefault(PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS, true);
Lines 3762-3780 Link Here
3762
		store.setDefault(PreferenceConstants.EDITOR_FOLDING_HEADERS, true);
3831
		store.setDefault(PreferenceConstants.EDITOR_FOLDING_HEADERS, true);
3763
		
3832
		
3764
		// properties file editor
3833
		// properties file editor
3765
		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_KEY, new RGB(0, 0, 0));
3834
		PreferenceConverter.setDefault(
3835
				store, 
3836
				PreferenceConstants.PROPERTIES_FILE_COLORING_KEY, 
3837
				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_KEY,new RGB(0, 0, 0)));
3766
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_KEY_BOLD, false);
3838
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_KEY_BOLD, false);
3767
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_KEY_ITALIC, false);
3839
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_KEY_ITALIC, false);
3768
		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE, new RGB(42, 0, 255));
3840
		
3841
		PreferenceConverter.setDefault(
3842
				store, 
3843
				PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE, 
3844
				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_VALUE,new RGB(42, 0, 255)));
3769
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE_BOLD, false);
3845
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE_BOLD, false);
3770
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE_ITALIC, false);
3846
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE_ITALIC, false);
3771
		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT, new RGB(0, 0, 0));
3847
		
3848
		PreferenceConverter.setDefault(
3849
				store, 
3850
				PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT, 
3851
				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT,new RGB(0, 0, 0)));
3772
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT_BOLD, false);
3852
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT_BOLD, false);
3773
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT_ITALIC, false);
3853
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT_ITALIC, false);
3774
		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT, new RGB(127, 0, 85));
3854
		
3855
		PreferenceConverter.setDefault(
3856
				store, 
3857
				PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT, 
3858
				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_ARGUMENT,new RGB(127, 0, 85)));
3775
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT_BOLD, true);
3859
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT_BOLD, true);
3776
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT_ITALIC, false);
3860
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT_ITALIC, false);
3777
		PreferenceConverter.setDefault(store, PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT,  new RGB(63, 127, 95));
3861
		
3862
		PreferenceConverter.setDefault(
3863
				store, 
3864
				PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT,  
3865
				findColor(registry,IJDTThemeConstants.PROPERTIES_FILE_COLORING_COMMENT,new RGB(63, 127, 95)));
3778
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_BOLD, false);
3866
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_BOLD, false);
3779
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_ITALIC, false);
3867
		store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_ITALIC, false);
3780
		
3868
		
Lines 3902-3906 Link Here
3902
		}
3990
		}
3903
		return new DefaultScope().getNode(JavaUI.ID_PLUGIN).get(key, null);
3991
		return new DefaultScope().getNode(JavaUI.ID_PLUGIN).get(key, null);
3904
	}
3992
	}
3993
	
3994
	/**
3995
	 * Return the RGB for the key in the color registry. If there is no entry return defaultRGB.
3996
	 * @param registry
3997
	 * @param key the key for the constant in the registry
3998
	 * @param defaultRGB
3999
	 * @return RGB
4000
	 */
4001
	private static RGB findColor(ColorRegistry registry,
4002
			String key, RGB defaultRGB) {
4003
		if (registry.hasValueFor(key))
4004
			return JFaceResources.getResources().createColor(
4005
					registry.getColorDescriptor(key)).getRGB();
4006
4007
		return defaultRGB;
4008
	}
3905
}
4009
}
3906
4010
(-)ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java (-20 / +102 lines)
Lines 15-22 Link Here
15
15
16
import org.eclipse.jface.preference.IPreferenceStore;
16
import org.eclipse.jface.preference.IPreferenceStore;
17
import org.eclipse.jface.preference.PreferenceConverter;
17
import org.eclipse.jface.preference.PreferenceConverter;
18
import org.eclipse.jface.resource.ColorRegistry;
19
import org.eclipse.jface.resource.JFaceResources;
18
import org.eclipse.jface.util.PropertyChangeEvent;
20
import org.eclipse.jface.util.PropertyChangeEvent;
19
21
22
import org.eclipse.ui.PlatformUI;
23
20
import org.eclipse.jdt.core.dom.ASTNode;
24
import org.eclipse.jdt.core.dom.ASTNode;
21
import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
25
import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
22
import org.eclipse.jdt.core.dom.ArrayAccess;
26
import org.eclipse.jdt.core.dom.ArrayAccess;
Lines 196-204 Link Here
196
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
200
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
197
		 */
201
		 */
198
		public RGB getDefaultTextColor() {
202
		public RGB getDefaultTextColor() {
199
			return new RGB(0, 0, 0);
203
			return findRGB(
204
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
205
					ISemanticHighlightingsThemeConstants.STATIC_FINAL_FIELD_HIGHLIGHTING,
206
					new RGB(0, 0, 0));
200
		}
207
		}
201
208
209
210
202
		/*
211
		/*
203
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextStyleBold()
212
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextStyleBold()
204
		 */
213
		 */
Lines 252-258 Link Here
252
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
261
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
253
		 */
262
		 */
254
		public RGB getDefaultTextColor() {
263
		public RGB getDefaultTextColor() {
255
			return new RGB(0, 0, 192);
264
			return findRGB(
265
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
266
					ISemanticHighlightingsThemeConstants.STATIC_FIELD_TEXT_HIGHLIGHTING,
267
					new RGB(0, 0, 192));
256
		}
268
		}
257
269
258
		/*
270
		/*
Lines 308-314 Link Here
308
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
320
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
309
		 */
321
		 */
310
		public RGB getDefaultTextColor() {
322
		public RGB getDefaultTextColor() {
311
			return new RGB(0, 0, 192);
323
			return findRGB(
324
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
325
					ISemanticHighlightingsThemeConstants.FIELD_HIGHLIGHTING,
326
					new RGB(0, 0, 192));
312
		}
327
		}
313
328
314
		/*
329
		/*
Lines 364-370 Link Here
364
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
379
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
365
		 */
380
		 */
366
		public RGB getDefaultTextColor() {
381
		public RGB getDefaultTextColor() {
367
			return new RGB(171, 48, 0);
382
			return findRGB(
383
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
384
					ISemanticHighlightingsThemeConstants.AUTOBOX_HIGHLIGHTING,
385
					new RGB(171, 48, 0));
368
		}
386
		}
369
387
370
		/*
388
		/*
Lines 461-467 Link Here
461
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
479
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
462
		 */
480
		 */
463
		public RGB getDefaultTextColor() {
481
		public RGB getDefaultTextColor() {
464
			return new RGB(0, 0, 0);
482
			return findRGB(
483
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
484
					ISemanticHighlightingsThemeConstants.METHOD_DECLARATION_HIGHLIGHTING,
485
					new RGB(0, 0, 0));
465
		}
486
		}
466
487
467
		/*
488
		/*
Lines 517-523 Link Here
517
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
538
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
518
		 */
539
		 */
519
		public RGB getDefaultTextColor() {
540
		public RGB getDefaultTextColor() {
520
			return new RGB(0, 0, 0);
541
			return findRGB(
542
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
543
					ISemanticHighlightingsThemeConstants.STATIC_METHOD_DECLARATION_HIGHLIGHTING,
544
					new RGB(0, 0, 0));
521
		}
545
		}
522
546
523
		/*
547
		/*
Lines 578-584 Link Here
578
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
602
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
579
		 */
603
		 */
580
		public RGB getDefaultTextColor() {
604
		public RGB getDefaultTextColor() {
581
			return new RGB(0, 0, 0);
605
			return findRGB(
606
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
607
					ISemanticHighlightingsThemeConstants.ANNOTATION_REFERENCE_ELEMENT_HIGHLIGHTING,
608
					new RGB(0, 0, 0));
582
		}
609
		}
583
610
584
		/*
611
		/*
Lines 641-647 Link Here
641
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
668
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
642
		 */
669
		 */
643
		public RGB getDefaultTextColor() {
670
		public RGB getDefaultTextColor() {
644
			return new RGB(0, 0, 0);
671
			return findRGB(
672
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
673
					ISemanticHighlightingsThemeConstants.ABSTRACT_METHOD_INVOCATION_HIGHLIGHTING,
674
					new RGB(0, 0, 0));
645
		}
675
		}
646
676
647
		/*
677
		/*
Lines 712-718 Link Here
712
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
742
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
713
		 */
743
		 */
714
		public RGB getDefaultTextColor() {
744
		public RGB getDefaultTextColor() {
715
			return new RGB(0, 0, 0);
745
			return findRGB(
746
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
747
					ISemanticHighlightingsThemeConstants.INHERITED_METHOD_INVOCATION_HIGHLIGHTING,
748
					new RGB(0, 0, 0));
716
		}
749
		}
717
750
718
		/*
751
		/*
Lines 780-786 Link Here
780
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
813
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
781
		 */
814
		 */
782
		public RGB getDefaultTextColor() {
815
		public RGB getDefaultTextColor() {
783
			return new RGB(0, 0, 0);
816
			return findRGB(
817
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
818
					ISemanticHighlightingsThemeConstants.METHOD_INVOCATION_HIGHLIGHTING,
819
					new RGB(0, 0, 0));
784
		}
820
		}
785
821
786
		/*
822
		/*
Lines 881-887 Link Here
881
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
917
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
882
		 */
918
		 */
883
		public RGB getDefaultTextColor() {
919
		public RGB getDefaultTextColor() {
884
			return new RGB(0, 0, 0);
920
			return findRGB(
921
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
922
					ISemanticHighlightingsThemeConstants.LOCAL_VARIABLE_DECLARATION_HIGHLIGHTING,
923
					new RGB(0, 0, 0));
885
		}
924
		}
886
925
887
		/*
926
		/*
Lines 945-951 Link Here
945
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
984
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
946
		 */
985
		 */
947
		public RGB getDefaultTextColor() {
986
		public RGB getDefaultTextColor() {
948
			return new RGB(0, 0, 0);
987
			return findRGB(
988
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
989
					ISemanticHighlightingsThemeConstants.LOCAL_VARIABLE_HIGHLIGHTING,
990
					new RGB(0, 0, 0));
949
		}
991
		}
950
992
951
		/*
993
		/*
Lines 1005-1011 Link Here
1005
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1047
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1006
		 */
1048
		 */
1007
		public RGB getDefaultTextColor() {
1049
		public RGB getDefaultTextColor() {
1008
			return new RGB(0, 0, 0);
1050
			return findRGB(
1051
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
1052
					ISemanticHighlightingsThemeConstants.PARAMETER_VARIABLE_HIGHLIGHTING,
1053
					new RGB(0, 0, 0));
1009
		}
1054
		}
1010
1055
1011
		/*
1056
		/*
Lines 1065-1071 Link Here
1065
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1110
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1066
		 */
1111
		 */
1067
		public RGB getDefaultTextColor() {
1112
		public RGB getDefaultTextColor() {
1068
			return new RGB(0, 0, 0);
1113
			return findRGB(
1114
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
1115
					ISemanticHighlightingsThemeConstants.DEPRECATED_MEMBER_HIGHLIGHTING,
1116
					new RGB(0, 0, 0));
1069
		}
1117
		}
1070
1118
1071
		/*
1119
		/*
Lines 1175-1181 Link Here
1175
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1223
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1176
		 */
1224
		 */
1177
		public RGB getDefaultTextColor() {
1225
		public RGB getDefaultTextColor() {
1178
			return new RGB(100, 70, 50);
1226
			return findRGB(
1227
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
1228
					ISemanticHighlightingsThemeConstants.TYPE_VARIABLE_HIGHLIGHTING,
1229
					new RGB(100, 70, 50));
1179
		}
1230
		}
1180
1231
1181
		/*
1232
		/*
Lines 1240-1246 Link Here
1240
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1291
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1241
		 */
1292
		 */
1242
		public RGB getDefaultTextColor() {
1293
		public RGB getDefaultTextColor() {
1243
			return new RGB(0, 80, 50);
1294
			return findRGB(
1295
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
1296
					ISemanticHighlightingsThemeConstants.CLASS_HIGHLIGHTING,
1297
					new RGB(0, 80, 50));
1244
		}
1298
		}
1245
1299
1246
		/*
1300
		/*
Lines 1312-1318 Link Here
1312
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1366
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1313
		 */
1367
		 */
1314
		public RGB getDefaultTextColor() {
1368
		public RGB getDefaultTextColor() {
1315
			return new RGB(100, 70, 50);
1369
			return findRGB(
1370
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
1371
					ISemanticHighlightingsThemeConstants.ENUM_HIGHLIGHTING,
1372
					new RGB(100, 70, 50));
1316
		}
1373
		}
1317
		
1374
		
1318
		/*
1375
		/*
Lines 1384-1390 Link Here
1384
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1441
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1385
		 */
1442
		 */
1386
		public RGB getDefaultTextColor() {
1443
		public RGB getDefaultTextColor() {
1387
			return new RGB(50, 63, 112);
1444
			return findRGB(
1445
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
1446
					ISemanticHighlightingsThemeConstants.INTERFACE_HIGHLIGHTING,
1447
					new RGB(50, 63, 112));
1388
		}
1448
		}
1389
		
1449
		
1390
		/*
1450
		/*
Lines 1456-1462 Link Here
1456
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1516
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1457
		 */
1517
		 */
1458
		public RGB getDefaultTextColor() {
1518
		public RGB getDefaultTextColor() {
1459
			return new RGB(100, 100, 100);
1519
			return findRGB(
1520
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
1521
					ISemanticHighlightingsThemeConstants.ANNOTATION_HIGHLIGHTING,
1522
					new RGB(50, 63, 112));
1460
		}
1523
		}
1461
		
1524
		
1462
		/*
1525
		/*
Lines 1529-1535 Link Here
1529
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1592
		 * @see org.eclipse.jdt.internal.ui.javaeditor.ISemanticHighlighting#getDefaultTextColor()
1530
		 */
1593
		 */
1531
		public RGB getDefaultTextColor() {
1594
		public RGB getDefaultTextColor() {
1532
			return new RGB(13, 100, 0);
1595
			return findRGB(
1596
					PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(),
1597
					ISemanticHighlightingsThemeConstants.TYPE_ARGUMENT_HIGHLIGHTING,
1598
					new RGB(13, 100, 0));
1533
		}
1599
		}
1534
		
1600
		
1535
		/*
1601
		/*
Lines 1850-1853 Link Here
1850
	 */
1916
	 */
1851
	private SemanticHighlightings() {
1917
	private SemanticHighlightings() {
1852
	}
1918
	}
1919
	
1920
	/**
1921
	 * Find the RGB for the key in the registry. Return defaultRGB if it is
1922
	 * not found.
1923
	 * @param registry
1924
	 * @param key
1925
	 * @param defaultRGB
1926
	 * @return RGB
1927
	 */
1928
	static RGB findRGB(ColorRegistry registry, String key, RGB defaultRGB) {
1929
		if (registry.hasValueFor(key))
1930
			return JFaceResources.getResources().createColor(
1931
					registry.getColorDescriptor(key)).getRGB();
1932
1933
		return defaultRGB;
1934
	}
1853
}
1935
}
(-)plugin.xml (+182 lines)
Lines 5575-5579 Link Here
5575
	         </selectionEnablement>
5575
	         </selectionEnablement>
5576
      	</linkHelper>          
5576
      	</linkHelper>          
5577
 </extension>
5577
 </extension>
5578
 <extension
5579
       point="org.eclipse.ui.themes">
5580
    <theme
5581
          id="org.eclipse.ui.ide.systemDefault">
5582
       <colorOverride
5583
             id="org.eclipse.jdt.ui.matchingBracketsColor"
5584
             value="COLOR_WIDGET_NORMAL_SHADOW">
5585
       </colorOverride>
5586
       <colorOverride
5587
             id="org.eclipse.jdt.ui.java_multi_line_comment"
5588
             value="COLOR_LIST_SELECTION">
5589
       </colorOverride>
5590
       <colorOverride
5591
             id="org.eclipse.jdt.ui.java_keyword"
5592
             value="COLOR_LIST_FOREGROUND">
5593
       </colorOverride>
5594
       <colorOverride
5595
             id="org.eclipse.jdt.ui.java_keyword_return"
5596
             value="COLOR_LIST_FOREGROUND">
5597
       </colorOverride>
5598
       <colorOverride
5599
             id="org.eclipse.jdt.ui.java_string"
5600
             value="COLOR_LIST_FOREGROUND">
5601
       </colorOverride>
5602
       <colorOverride
5603
             id="org.eclipse.jdt.ui.java_single_line_comment"
5604
             value="COLOR_LIST_SELECTION">
5605
       </colorOverride>
5606
       <colorOverride
5607
             id="org.eclipse.jdt.ui.java_operator"
5608
             value="COLOR_LIST_FOREGROUND">
5609
       </colorOverride>
5610
       <colorOverride
5611
             id="org.eclipse.jdt.ui.java_doc_keyword"
5612
             value="COLOR_LIST_SELECTION">
5613
       </colorOverride>
5614
       <colorOverride
5615
             id="org.eclipse.jdt.ui.java_doc_tag"
5616
             value="COLOR_WIDGET_NORMAL_SHADOW">
5617
       </colorOverride>
5618
       <colorOverride
5619
             id="org.eclipse.jdt.ui.java_bracket"
5620
             value="COLOR_LIST_FOREGROUND">
5621
       </colorOverride>
5622
       <colorOverride
5623
             id="org.eclipse.jdt.ui.java_comment_task_tag"
5624
             value="COLOR_WIDGET_NORMAL_SHADOW">
5625
       </colorOverride>
5626
       <colorOverride
5627
             id="org.eclipse.jdt.ui.java_doc_link"
5628
             value="COLOR_LIST_SELECTION">
5629
       </colorOverride>
5630
       <colorOverride
5631
             id="org.eclipse.jdt.ui.java_doc_default"
5632
             value="COLOR_LIST_SELECTION">
5633
       </colorOverride>
5634
       <colorOverride
5635
             id="org.eclipse.jdt.ui.content_assist_proposals_background"
5636
             value="COLOR_LIST_BACKGROUND">
5637
       </colorOverride>
5638
       <colorOverride
5639
             id="org.eclipse.jdt.ui.content_assist_proposals_foreground"
5640
             value="COLOR_LIST_FOREGROUND">
5641
       </colorOverride>
5642
       <colorOverride
5643
             id="org.eclipse.jdt.ui.content_assist_parameters_background"
5644
             value="COLOR_LIST_BACKGROUND">
5645
       </colorOverride>
5646
       <colorOverride
5647
             id="org.eclipse.jdt.ui.content_assist_parameters_foreground"
5648
             value="COLOR_LIST_FOREGROUND">
5649
       </colorOverride>
5650
       <colorOverride
5651
             id="org.eclipse.jdt.ui.content_assist_completion_replacement_background"
5652
             value="COLOR_INFO_BACKGROUND">
5653
       </colorOverride>
5654
       <colorOverride
5655
             id="org.eclipse.jdt.ui.content_assist_completion_replacement_foreground"
5656
             value="COLOR_INFO_FOREGROUND">
5657
       </colorOverride>
5658
       <colorOverride
5659
             id="org.eclipse.jdt.ui.pf_coloring_value"
5660
             value="COLOR_LIST_FOREGROUND">
5661
       </colorOverride>
5662
       <colorOverride
5663
             id="org.eclipse.jdt.ui.pf_coloring_key"
5664
             value="COLOR_LIST_FOREGROUND">
5665
       </colorOverride>
5666
       <colorOverride
5667
             id="org.eclipse.jdt.ui.pf_coloring_argument"
5668
             value="COLOR_LIST_SELECTION">
5669
       </colorOverride>
5670
       <colorOverride
5671
             id="org.eclipse.jdt.ui.pf_coloring_assignment"
5672
             value="COLOR_LIST_FOREGROUND">
5673
       </colorOverride>
5674
       <colorOverride
5675
             id="org.eclipse.jdt.ui.pf_coloring_comment"
5676
             value="COLOR_LIST_SELECTION">
5677
       </colorOverride>
5678
       <colorOverride
5679
             id="org.eclipse.jdt.ui.staticFieldTextHighlighting"
5680
             value="COLOR_LIST_SELECTION">
5681
       </colorOverride>
5682
       <colorOverride
5683
             id="org.eclipse.jdt.ui.staticFinalFieldTextHighlighting"
5684
             value="COLOR_LIST_FOREGROUND">
5685
       </colorOverride>
5686
       <colorOverride
5687
             id="org.eclipse.jdt.ui.fieldHighlighting"
5688
             value="COLOR_LIST_SELECTION">
5689
       </colorOverride>
5690
       <colorOverride
5691
             id="org.eclipse.jdt.ui.autoboxHighlighting"
5692
             value="COLOR_WIDGET_DARK_SHADOW">
5693
       </colorOverride>
5694
       <colorOverride
5695
             id="org.eclipse.jdt.ui.staticMethodDeclarionHighlighting"
5696
             value="COLOR_LIST_FOREGROUND">
5697
       </colorOverride>
5698
       <colorOverride
5699
             id="org.eclipse.jdt.ui.annotationReferenceElementHighlighting"
5700
             value="COLOR_LIST_FOREGROUND">
5701
       </colorOverride>
5702
       <colorOverride
5703
             id="org.eclipse.jdt.ui.abstractMethodInvocationHighlighting"
5704
             value="COLOR_LIST_FOREGROUND">
5705
       </colorOverride>
5706
       <colorOverride
5707
             id="org.eclipse.jdt.ui.inheritedMethodInvocationHighlighting"
5708
             value="COLOR_LIST_SELECTION">
5709
       </colorOverride>
5710
       <colorOverride
5711
             id="org.eclipse.jdt.ui.methodInvocationHighlighting"
5712
             value="COLOR_LIST_FOREGROUND">
5713
       </colorOverride>
5714
       <colorOverride
5715
             id="org.eclipse.jdt.ui.localVariableDeclarionHighlighting"
5716
             value="COLOR_LIST_FOREGROUND">
5717
       </colorOverride>
5718
       <colorOverride
5719
             id="org.eclipse.jdt.ui.localVariableHighlighting"
5720
             value="COLOR_LIST_FOREGROUND">
5721
       </colorOverride>
5722
       <colorOverride
5723
             id="org.eclipse.jdt.ui.parameterVariableDeclarionHighlighting"
5724
             value="COLOR_LIST_FOREGROUND">
5725
       </colorOverride>
5726
       <colorOverride
5727
             id="org.eclipse.jdt.ui.deprecatedMemberHighlighting"
5728
             value="COLOR_LIST_FOREGROUND">
5729
       </colorOverride>
5730
       <fontOverride
5731
             id="org.eclipse.jdt.ui.typeVariableDeclarationHighlighting"
5732
             value="COLOR_WIDGET_DARK_SHADOW">
5733
       </fontOverride>
5734
       <colorOverride
5735
             id="org.eclipse.jdt.ui.classHighlighting"
5736
             value="WIDGET_DARK_SHADOW">
5737
       </colorOverride>
5738
       <colorOverride
5739
             id="org.eclipse.jdt.ui.enumHighlighting"
5740
             value="COLOR_WIDGET_DARK_SHADOW">
5741
       </colorOverride>
5742
       <colorOverride
5743
             id="org.eclipse.jdt.ui.interfaceHighlighting"
5744
             value="COLOR_LIST_SELECTION">
5745
       </colorOverride>
5746
       <colorOverride
5747
             id="org.eclipse.jdt.ui.annotationHighlighting"
5748
             value="COLOR_WIDGET_DARK_SHADOW">
5749
       </colorOverride>
5750
       <colorOverride
5751
             id="org.eclipse.jdt.ui.typeArgumentHighlighting"
5752
             value="COLOR_WIDGET_DARK_SHADOW">
5753
       </colorOverride>
5754
       <colorOverride
5755
             id="org.eclipse.jdt.ui.methodDeclarationHighlighting"
5756
             value="COLOR_LIST_FOREGROUND">
5757
       </colorOverride>
5758
    </theme>
5759
 </extension>
5578
     
5760
     
5579
</plugin>
5761
</plugin>
(-)ui/org/eclipse/jdt/internal/ui/javaeditor/ISemanticHighlightingsThemeConstants.java (+77 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
10
 *******************************************************************************/
11
package org.eclipse.jdt.internal.ui.javaeditor;
12
13
import org.eclipse.jdt.ui.JavaUI;
14
15
/**
16
 * ISemanticHighlightingsThemeConstants defines the set of constants in the
17
 * themes used by {@link SemanticHighlightings}
18
 * 
19
 */
20
public interface ISemanticHighlightingsThemeConstants {
21
22
	static String ID_PREFIX = JavaUI.ID_PLUGIN + "."; //$NON-NLS-1$
23
24
	static String STATIC_FIELD_TEXT_HIGHLIGHTING = ID_PREFIX + "staticFieldTextHighlighting"; //$NON-NLS-1$
25
26
	static String STATIC_FINAL_FIELD_HIGHLIGHTING = ID_PREFIX + "staticFinalFieldTextHighlighting";//$NON-NLS-1$
27
28
	static String FIELD_HIGHLIGHTING = ID_PREFIX + "fieldHighlighting";//$NON-NLS-1$
29
30
	static String AUTOBOX_HIGHLIGHTING = ID_PREFIX + "autoboxHighlighting";//$NON-NLS-1$
31
32
	static String STATIC_METHOD_DECLARATION_HIGHLIGHTING = ID_PREFIX
33
			+ "staticMethodDeclarionHighlighting";//$NON-NLS-1$
34
35
	static String ANNOTATION_REFERENCE_ELEMENT_HIGHLIGHTING = ID_PREFIX
36
			+ "annotationReferenceElementHighlighting";//$NON-NLS-1$
37
38
	static String ABSTRACT_METHOD_INVOCATION_HIGHLIGHTING = ID_PREFIX
39
			+ "abstractMethodInvocationHighlighting";//$NON-NLS-1$
40
41
	static String INHERITED_METHOD_INVOCATION_HIGHLIGHTING = ID_PREFIX
42
			+ "inheritedMethodInvocationHighlighting";//$NON-NLS-1$
43
44
	static String METHOD_INVOCATION_HIGHLIGHTING = ID_PREFIX
45
			+ "methodInvocationHighlighting";//$NON-NLS-1$
46
47
	static String LOCAL_VARIABLE_DECLARATION_HIGHLIGHTING = ID_PREFIX
48
			+ "localVariableDeclarionHighlighting";//$NON-NLS-1$
49
50
	static String LOCAL_VARIABLE_HIGHLIGHTING = ID_PREFIX
51
			+ "localVariableHighlighting";//$NON-NLS-1$
52
53
	static String PARAMETER_VARIABLE_HIGHLIGHTING = ID_PREFIX
54
			+ "parameterVariableDeclarionHighlighting";//$NON-NLS-1$
55
56
	static String DEPRECATED_MEMBER_HIGHLIGHTING = ID_PREFIX
57
			+ "deprecatedMemberHighlighting";//$NON-NLS-1$
58
59
	static String TYPE_VARIABLE_HIGHLIGHTING = ID_PREFIX
60
			+ "typeVariableDeclarationHighlighting";//$NON-NLS-1$
61
62
	static String CLASS_HIGHLIGHTING = ID_PREFIX + "classHighlighting";//$NON-NLS-1$
63
64
	static String ENUM_HIGHLIGHTING = ID_PREFIX + "enumHighlighting";//$NON-NLS-1$
65
66
	static String INTERFACE_HIGHLIGHTING = ID_PREFIX + "interfaceHighlighting";//$NON-NLS-1$
67
68
	static String ANNOTATION_HIGHLIGHTING = ID_PREFIX
69
			+ "annotationHighlighting"; //$NON-NLS-1$
70
71
	static String TYPE_ARGUMENT_HIGHLIGHTING = ID_PREFIX
72
			+ "typeArgumentHighlighting"; //$NON-NLS-1$
73
74
	static String METHOD_DECLARATION_HIGHLIGHTING = ID_PREFIX
75
			+ "methodDeclarationHighlighting"; //$NON-NLS-1$
76
77
}
(-)ui/org/eclipse/jdt/internal/ui/IJDTThemeConstants.java (+195 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
10
 *******************************************************************************/
11
12
package org.eclipse.jdt.internal.ui;
13
14
import org.eclipse.jdt.ui.JavaUI;
15
import org.eclipse.jdt.ui.PreferenceConstants;
16
17
/**
18
 * IJDTThemeConstants are the constants for themes that map to the JDT constants
19
 * in {@link PreferenceConstants}
20
 * 
21
 */
22
public interface IJDTThemeConstants {
23
24
	static String ID_PREFIX = JavaUI.ID_PLUGIN + "."; //$NON-NLS-1$
25
26
	/**
27
	 * A named theme constant that holds the color used to highlight matching
28
	 * brackets.
29
	 * 
30
	 */
31
	public final static String EDITOR_MATCHING_BRACKETS_COLOR = ID_PREFIX
32
			+ PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR;
33
34
	/**
35
	 * A named theme constant that holds the color used to render multi-line
36
	 * comments.
37
	 * 
38
	 */
39
	public final static String EDITOR_MULTI_LINE_COMMENT_COLOR = ID_PREFIX
40
			+ PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR;
41
42
	/**
43
	 * A named theme constant that holds the color used to render java keywords.
44
	 * 
45
	 */
46
	public final static String EDITOR_JAVA_KEYWORD_COLOR = ID_PREFIX
47
			+ PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR;
48
49
	/**
50
	 * A theme constant that holds the color used to render string constants.
51
	 */
52
	public final static String EDITOR_STRING_COLOR = ID_PREFIX
53
			+ PreferenceConstants.EDITOR_STRING_COLOR;
54
55
	/**
56
	 * A theme constant that holds the color used to render single line
57
	 * comments.
58
	 */
59
	public final static String EDITOR_SINGLE_LINE_COMMENT_COLOR = ID_PREFIX
60
			+ PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR;
61
62
	/**
63
	 * A theme constant that holds the color used to render operators.
64
	 */
65
	public final static String EDITOR_JAVA_OPERATOR_COLOR = ID_PREFIX
66
			+ PreferenceConstants.EDITOR_JAVA_OPERATOR_COLOR;
67
68
	/**
69
	 * A theme constant that holds the color used to render java default text.
70
	 */
71
	public final static String EDITOR_JAVA_DEFAULT_COLOR = ID_PREFIX
72
			+ PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR;
73
74
	/**
75
	 * A theme constant that holds the color used to render the 'return'
76
	 * keyword.
77
	 */
78
	public final static String EDITOR_JAVA_KEYWORD_RETURN_COLOR = ID_PREFIX
79
			+ PreferenceConstants.EDITOR_JAVA_KEYWORD_RETURN_COLOR;
80
81
	/**
82
	 * A theme constant that holds the color used to render javadoc keywords.
83
	 */
84
	public final static String EDITOR_JAVADOC_KEYWORD_COLOR = ID_PREFIX
85
			+ PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR;
86
87
	/**
88
	 * A theme constant that holds the color used to render javadoc tags.
89
	 */
90
	public final static String EDITOR_JAVADOC_TAG_COLOR = ID_PREFIX
91
			+ PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR;
92
93
	/**
94
	 * A theme constant that holds the color used to render brackets.
95
	 */
96
	public final static String EDITOR_JAVA_BRACKET_COLOR = ID_PREFIX
97
			+ PreferenceConstants.EDITOR_JAVA_BRACKET_COLOR;
98
99
	/**
100
	 * A theme constant that holds the color used to render task tags.
101
	 */
102
	public final static String EDITOR_TASK_TAG_COLOR = ID_PREFIX
103
			+ PreferenceConstants.EDITOR_TASK_TAG_COLOR;
104
105
	/**
106
	 * A theme constant that holds the color used to render javadoc links.
107
	 */
108
	public final static String EDITOR_JAVADOC_LINKS_COLOR = ID_PREFIX
109
			+ PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR;
110
111
	/**
112
	 * A theme constant that holds the color used to render javadoc default
113
	 * text.
114
	 */
115
	public final static String EDITOR_JAVADOC_DEFAULT_COLOR = ID_PREFIX
116
			+ PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR;
117
118
	/**
119
	 * A theme constant that holds the background color used in the code assist
120
	 * selection dialog.
121
	 */
122
	public final static String CODEASSIST_PROPOSALS_BACKGROUND = ID_PREFIX
123
			+ PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND;
124
125
	/**
126
	 * A theme constant that holds the foreground color used in the code assist
127
	 * selection dialog.
128
	 */
129
	public final static String CODEASSIST_PROPOSALS_FOREGROUND = ID_PREFIX
130
			+ PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND;
131
132
	/**
133
	 * A theme constant that holds the background color used for parameter
134
	 * hints.
135
	 */
136
	public final static String CODEASSIST_PARAMETERS_BACKGROUND = ID_PREFIX
137
			+ PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND;
138
139
	/**
140
	 * A theme constant that holds the foreground color used in the code assist
141
	 * selection dialog.
142
	 */
143
	public final static String CODEASSIST_PARAMETERS_FOREGROUND = ID_PREFIX
144
			+ PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND;
145
146
	/**
147
	 * A named preference that holds the background color used in the code
148
	 * assist selection dialog to mark replaced code.
149
	 */
150
	public final static String CODEASSIST_REPLACEMENT_BACKGROUND = ID_PREFIX
151
			+ PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND;
152
153
	/**
154
	 * A named preference that holds the foreground color used in the code
155
	 * assist selection dialog to mark replaced code.
156
	 */
157
	public final static String CODEASSIST_REPLACEMENT_FOREGROUND = ID_PREFIX
158
			+ PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND;
159
160
	/**
161
	 * A named preference that holds the color used to render values in a
162
	 * properties file.
163
	 */
164
	public static final String PROPERTIES_FILE_COLORING_VALUE = ID_PREFIX
165
			+ PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE;
166
167
	/**
168
	 * A named preference that holds the color used to render keys in a
169
	 * properties file.
170
	 */
171
	public static final String PROPERTIES_FILE_COLORING_KEY = ID_PREFIX
172
			+ PreferenceConstants.PROPERTIES_FILE_COLORING_KEY;
173
174
	/**
175
	 * A named preference that holds the color used to render arguments in a
176
	 * properties file.
177
	 */
178
	public static final String PROPERTIES_FILE_COLORING_ARGUMENT = ID_PREFIX
179
			+ PreferenceConstants.PROPERTIES_FILE_COLORING_ARGUMENT;
180
181
	/**
182
	 * A named preference that holds the color used to render assignments in a
183
	 * properties file.
184
	 */
185
	public static final String PROPERTIES_FILE_COLORING_ASSIGNMENT = ID_PREFIX
186
			+ PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT;
187
188
	/**
189
	 * A named preference that holds the color used to render comments in a
190
	 * properties file.
191
	 */
192
	public static final String PROPERTIES_FILE_COLORING_COMMENT = ID_PREFIX
193
			+ PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT;
194
195
}

Return to bug 22243