Attachment #91282 for bug #220641




import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.editors.text.EditorsUI;

public class ColorManager implements IColorManager, IPDEColorConstants {


	}

	public static void initializeDefaults(IPreferenceStore store) {
		PreferenceConverter.setDefault(store, P_DEFAULT, DEFAULT);
		PreferenceConverter.setDefault(store, P_PROC_INSTR, PROC_INSTR);
		PreferenceConverter.setDefault(store, P_STRING, STRING);
		PreferenceConverter.setDefault(store, P_EXTERNALIZED_STRING, EXTERNALIZED_STRING);

		PreferenceConverter.setDefault(store, P_HEADER_KEY, HEADER_KEY);
		PreferenceConverter.setDefault(store, P_HEADER_OSGI, HEADER_OSGI);
		store.setDefault(P_HEADER_OSGI + IPDEColorConstants.P_BOLD_SUFFIX, true);
		PreferenceConverter.setDefault(store, P_HEADER_VALUE, HEADER_VALUE);
		PreferenceConverter.setDefault(store, P_HEADER_ATTRIBUTES, HEADER_ATTRIBUTES);
		store.setDefault(P_HEADER_ATTRIBUTES + IPDEColorConstants.P_ITALIC_SUFFIX, true);
		PreferenceConverter.setDefault(store, P_HEADER_ASSIGNMENT, HEADER_ASSIGNMENT);
	}

	private void initialize() {
		IPreferenceStore pstore = PDEPlugin.getDefault().getPreferenceStore();
		IPreferenceStore editors = EditorsUI.getPreferenceStore();

		putColor(editors, P_DEFAULT);
		putColor(pstore, P_PROC_INSTR);
		putColor(pstore, P_STRING);
		putColor(pstore, P_EXTERNALIZED_STRING);

		putColor(pstore, P_XML_COMMENT);
		putColor(pstore, P_HEADER_KEY);
		putColor(pstore, P_HEADER_OSGI);
		putColor(editors, P_HEADER_VALUE);
		putColor(pstore, P_HEADER_ATTRIBUTES);
		putColor(editors, P_HEADER_ASSIGNMENT);
		pstore = PreferenceConstants.getPreferenceStore();
		for (int i = 0; i < IColorManager.PROPERTIES_COLORS.length; i++) {
			putColor(pstore, IColorManager.PROPERTIES_COLORS[i]);




	RGB PROC_INSTR = new RGB(128, 128, 128);
	RGB STRING = new RGB(0, 128, 0);
	RGB EXTERNALIZED_STRING = new RGB(128, 0, 128);
	RGB DEFAULT = new RGB(0, 0, 0);
	RGB TAG = new RGB(0, 0, 128);

	RGB HEADER_KEY = new RGB(128, 0, 0);
	RGB HEADER_VALUE = new RGB(0, 0, 0);
	RGB HEADER_ASSIGNMENT = new RGB(0, 0, 0);
	RGB HEADER_OSGI = new RGB(128, 0, 0);
	RGB HEADER_ATTRIBUTES = new RGB(128, 128, 0);


	String P_PROC_INSTR = "editor.color.instr"; //$NON-NLS-1$
	String P_STRING = "editor.color.string"; //$NON-NLS-1$
	String P_EXTERNALIZED_STRING = "editor.color.externalized_string"; //$NON-NLS-1$
	String P_DEFAULT = org.eclipse.ui.texteditor.AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND;
	String P_TAG = "editor.color.tag"; //$NON-NLS-1$

	String P_HEADER_KEY = "editor.color.header_key"; //$NON-NLS-1$
	String P_HEADER_VALUE = org.eclipse.ui.texteditor.AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND;
	String P_HEADER_ASSIGNMENT = org.eclipse.ui.texteditor.AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND;
	String P_HEADER_OSGI = "editor.color.header_osgi"; //$NON-NLS-1$
	String P_HEADER_ATTRIBUTES = "editor.color.header_attributes"; //$NON-NLS-1$
}

Return to bug 220641

Lines 17-28 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.java (-6 / +3 lines)
17	RGB PROC_INSTR = new RGB(128, 128, 128);	17	RGB PROC_INSTR = new RGB(128, 128, 128);
18	RGB STRING = new RGB(0, 128, 0);	18	RGB STRING = new RGB(0, 128, 0);
19	RGB EXTERNALIZED_STRING = new RGB(128, 0, 128);	19	RGB EXTERNALIZED_STRING = new RGB(128, 0, 128);
20	RGB DEFAULT = new RGB(0, 0, 0);
21	RGB TAG = new RGB(0, 0, 128);	20	RGB TAG = new RGB(0, 0, 128);
22		21
23	RGB HEADER_KEY = new RGB(128, 0, 0);	22	RGB HEADER_KEY = new RGB(128, 0, 0);
24	RGB HEADER_VALUE = new RGB(0, 0, 0);
25	RGB HEADER_ASSIGNMENT = new RGB(0, 0, 0);
26	RGB HEADER_OSGI = new RGB(128, 0, 0);	23	RGB HEADER_OSGI = new RGB(128, 0, 0);
27	RGB HEADER_ATTRIBUTES = new RGB(128, 128, 0);	24	RGB HEADER_ATTRIBUTES = new RGB(128, 128, 0);
28		25
Lines 33-44 Link Here
33	String P_PROC_INSTR = "editor.color.instr"; //$NON-NLS-1$	30	String P_PROC_INSTR = "editor.color.instr"; //$NON-NLS-1$
34	String P_STRING = "editor.color.string"; //$NON-NLS-1$	31	String P_STRING = "editor.color.string"; //$NON-NLS-1$
35	String P_EXTERNALIZED_STRING = "editor.color.externalized_string"; //$NON-NLS-1$	32	String P_EXTERNALIZED_STRING = "editor.color.externalized_string"; //$NON-NLS-1$
36	String P_DEFAULT = "editor.color.default"; //$NON-NLS-1$	33	String P_DEFAULT = org.eclipse.ui.texteditor.AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND;
37	String P_TAG = "editor.color.tag"; //$NON-NLS-1$	34	String P_TAG = "editor.color.tag"; //$NON-NLS-1$
38		35
39	String P_HEADER_KEY = "editor.color.header_key"; //$NON-NLS-1$	36	String P_HEADER_KEY = "editor.color.header_key"; //$NON-NLS-1$
40	String P_HEADER_VALUE = "editor.color.header_value"; //$NON-NLS-1$	37	String P_HEADER_VALUE = org.eclipse.ui.texteditor.AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND;
41	String P_HEADER_ASSIGNMENT = "editor.color.header_assignment"; //$NON-NLS-1$	38	String P_HEADER_ASSIGNMENT = org.eclipse.ui.texteditor.AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND;
42	String P_HEADER_OSGI = "editor.color.header_osgi"; //$NON-NLS-1$	39	String P_HEADER_OSGI = "editor.color.header_osgi"; //$NON-NLS-1$
43	String P_HEADER_ATTRIBUTES = "editor.color.header_attributes"; //$NON-NLS-1$	40	String P_HEADER_ATTRIBUTES = "editor.color.header_attributes"; //$NON-NLS-1$
44	}	41	}

Lines 21-26 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java (-6 / +6 lines)
21	import org.eclipse.swt.graphics.Color;	21	import org.eclipse.swt.graphics.Color;
22	import org.eclipse.swt.graphics.RGB;	22	import org.eclipse.swt.graphics.RGB;
23	import org.eclipse.swt.widgets.Display;	23	import org.eclipse.swt.widgets.Display;
		24	import org.eclipse.ui.editors.text.EditorsUI;
24		25
25	public class ColorManager implements IColorManager, IPDEColorConstants {	26	public class ColorManager implements IColorManager, IPDEColorConstants {
26		27
Lines 41-47 Link Here
41	}	42	}
42		43
43	public static void initializeDefaults(IPreferenceStore store) {	44	public static void initializeDefaults(IPreferenceStore store) {
44	PreferenceConverter.setDefault(store, P_DEFAULT, DEFAULT);
45	PreferenceConverter.setDefault(store, P_PROC_INSTR, PROC_INSTR);	45	PreferenceConverter.setDefault(store, P_PROC_INSTR, PROC_INSTR);
46	PreferenceConverter.setDefault(store, P_STRING, STRING);	46	PreferenceConverter.setDefault(store, P_STRING, STRING);
47	PreferenceConverter.setDefault(store, P_EXTERNALIZED_STRING, EXTERNALIZED_STRING);	47	PreferenceConverter.setDefault(store, P_EXTERNALIZED_STRING, EXTERNALIZED_STRING);
Lines 50-64 Link Here
50	PreferenceConverter.setDefault(store, P_HEADER_KEY, HEADER_KEY);	50	PreferenceConverter.setDefault(store, P_HEADER_KEY, HEADER_KEY);
51	PreferenceConverter.setDefault(store, P_HEADER_OSGI, HEADER_OSGI);	51	PreferenceConverter.setDefault(store, P_HEADER_OSGI, HEADER_OSGI);
52	store.setDefault(P_HEADER_OSGI + IPDEColorConstants.P_BOLD_SUFFIX, true);	52	store.setDefault(P_HEADER_OSGI + IPDEColorConstants.P_BOLD_SUFFIX, true);
53	PreferenceConverter.setDefault(store, P_HEADER_VALUE, HEADER_VALUE);
54	PreferenceConverter.setDefault(store, P_HEADER_ATTRIBUTES, HEADER_ATTRIBUTES);	53	PreferenceConverter.setDefault(store, P_HEADER_ATTRIBUTES, HEADER_ATTRIBUTES);
55	store.setDefault(P_HEADER_ATTRIBUTES + IPDEColorConstants.P_ITALIC_SUFFIX, true);	54	store.setDefault(P_HEADER_ATTRIBUTES + IPDEColorConstants.P_ITALIC_SUFFIX, true);
56	PreferenceConverter.setDefault(store, P_HEADER_ASSIGNMENT, HEADER_ASSIGNMENT);
57	}	55	}
58		56
59	private void initialize() {	57	private void initialize() {
60	IPreferenceStore pstore = PDEPlugin.getDefault().getPreferenceStore();	58	IPreferenceStore pstore = PDEPlugin.getDefault().getPreferenceStore();
61	putColor(pstore, P_DEFAULT);	59	IPreferenceStore editors = EditorsUI.getPreferenceStore();
		60
		61	putColor(editors, P_DEFAULT);
62	putColor(pstore, P_PROC_INSTR);	62	putColor(pstore, P_PROC_INSTR);
63	putColor(pstore, P_STRING);	63	putColor(pstore, P_STRING);
64	putColor(pstore, P_EXTERNALIZED_STRING);	64	putColor(pstore, P_EXTERNALIZED_STRING);
Lines 66-74 Link Here
66	putColor(pstore, P_XML_COMMENT);	66	putColor(pstore, P_XML_COMMENT);
67	putColor(pstore, P_HEADER_KEY);	67	putColor(pstore, P_HEADER_KEY);
68	putColor(pstore, P_HEADER_OSGI);	68	putColor(pstore, P_HEADER_OSGI);
69	putColor(pstore, P_HEADER_VALUE);	69	putColor(editors, P_HEADER_VALUE);
70	putColor(pstore, P_HEADER_ATTRIBUTES);	70	putColor(pstore, P_HEADER_ATTRIBUTES);
71	putColor(pstore, P_HEADER_ASSIGNMENT);	71	putColor(editors, P_HEADER_ASSIGNMENT);
72	pstore = PreferenceConstants.getPreferenceStore();	72	pstore = PreferenceConstants.getPreferenceStore();
73	for (int i = 0; i < IColorManager.PROPERTIES_COLORS.length; i++) {	73	for (int i = 0; i < IColorManager.PROPERTIES_COLORS.length; i++) {
74	putColor(pstore, IColorManager.PROPERTIES_COLORS[i]);	74	putColor(pstore, IColorManager.PROPERTIES_COLORS[i]);