Attachment 91282 Details for Bug 220641 – patch

[patch] patch

patch.txt (text/plain), 4.52 KB, created by Jacek Pospychala

on 2008-03-01 17:56:12 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jacek Pospychala

Created: 2008-03-01 17:56:12 EST

Size: 4.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java,v
>retrieving revision 1.18
>diff -u -r1.18 ColorManager.java
>--- src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java	16 Jan 2008 17:07:55 -0000	1.18
>+++ src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java	1 Mar 2008 22:40:30 -0000
>@@ -21,6 +21,7 @@
> 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 {
> 
>@@ -41,7 +42,6 @@
> 	}
> 
> 	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);
>@@ -50,15 +50,15 @@
> 		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();
>-		putColor(pstore, P_DEFAULT);
>+		IPreferenceStore editors = EditorsUI.getPreferenceStore();
>+
>+		putColor(editors, P_DEFAULT);
> 		putColor(pstore, P_PROC_INSTR);
> 		putColor(pstore, P_STRING);
> 		putColor(pstore, P_EXTERNALIZED_STRING);
>@@ -66,9 +66,9 @@
> 		putColor(pstore, P_XML_COMMENT);
> 		putColor(pstore, P_HEADER_KEY);
> 		putColor(pstore, P_HEADER_OSGI);
>-		putColor(pstore, P_HEADER_VALUE);
>+		putColor(editors, P_HEADER_VALUE);
> 		putColor(pstore, P_HEADER_ATTRIBUTES);
>-		putColor(pstore, P_HEADER_ASSIGNMENT);
>+		putColor(editors, P_HEADER_ASSIGNMENT);
> 		pstore = PreferenceConstants.getPreferenceStore();
> 		for (int i = 0; i < IColorManager.PROPERTIES_COLORS.length; i++) {
> 			putColor(pstore, IColorManager.PROPERTIES_COLORS[i]);
>Index: src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.java,v
>retrieving revision 1.21
>diff -u -r1.21 IPDEColorConstants.java
>--- src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.java	28 Feb 2008 16:27:39 -0000	1.21
>+++ src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.java	1 Mar 2008 22:40:30 -0000
>@@ -17,12 +17,9 @@
> 	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);
> 
>@@ -33,12 +30,12 @@
> 	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 = "editor.color.default"; //$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 = "editor.color.header_value"; //$NON-NLS-1$
>-	String P_HEADER_ASSIGNMENT = "editor.color.header_assignment"; //$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$
> }

Actions: View | Diff

Attachments on bug 220641: 90912 | 90924 | 90925 | 90927 | 90938 | 91117 | 91282