Attachment 181926 Details for Bug 328708 – Additional Fix

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

[patch] Additional Fix

patch-4.txt (text/plain), 4.82 KB, created by Dani Megert

on 2010-10-28 08:06:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2010-10-28 08:06:00 EDT

Size: 4.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java,v
>retrieving revision 1.74
>diff -u -r1.74 ColorsAndFontsPreferencePage.java
>--- Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java	27 Oct 2010 17:43:30 -0000	1.74
>+++ Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java	28 Oct 2010 12:05:32 -0000
>@@ -1024,7 +1024,7 @@
>         String id = definition.getId();
>         RGB updatedRGB = (RGB) colorPreferencesToSet.get(id);
>         if (updatedRGB == null) {
>-            updatedRGB = (RGB) colorValuesToSet.get(id);
>+			updatedRGB = colorRegistry.getRGB(id);
>             if (updatedRGB == null)
> 				updatedRGB = currentTheme.getColorRegistry().getRGB(id);
>         }
>@@ -1092,7 +1092,7 @@
>         String id = definition.getId();
>         FontData[] updatedFD = (FontData[]) fontPreferencesToSet.get(id);
>         if (updatedFD == null) {
>-            updatedFD = (FontData[]) fontValuesToSet.get(id);
>+			updatedFD = fontRegistry.getFontData(id);
>             if (updatedFD == null)
> 				updatedFD = currentTheme.getFontRegistry().getFontData(id);
>         }
>@@ -1275,7 +1275,9 @@
>     private boolean isDefault(ColorDefinition definition) {
>         String id = definition.getId();
> 
>-        if (colorPreferencesToSet.containsKey(id)) {
>+		if (colorPreferencesToSet.containsKey(id)) {
>+			if (colorPreferencesToSet.get(id) == null)
>+				return true;
>             if (definition.getValue() != null) { // value-based color
>                 if (colorPreferencesToSet.get(id).equals(definition.getValue()))
> 					return true;
>@@ -1299,7 +1301,9 @@
>     private boolean isDefault(FontDefinition definition) {
>         String id = definition.getId();
> 
>-        if (fontPreferencesToSet.containsKey(id)) {
>+		if (fontPreferencesToSet.containsKey(id)) {
>+			if (fontPreferencesToSet.get(id) == null)
>+				return true;
>             if (definition.getValue() != null) { // value-based font
>                 if (Arrays.equals((FontData[]) fontPreferencesToSet.get(id), definition.getValue()))
> 					return true;
>@@ -1377,11 +1381,15 @@
>             String id = (String) i.next();
>             String key = ThemeElementHelper.createPreferenceKey(currentTheme, id);
>             RGB rgb = (RGB) colorPreferencesToSet.get(id);
>-            String rgbString = StringConverter.asString(rgb);
>-            String storeString = getPreferenceStore().getString(key);
>+			if (rgb == null)
>+				getPreferenceStore().setToDefault(key);
>+			else {
>+				String rgbString = StringConverter.asString(rgb);
>+				String storeString = getPreferenceStore().getString(key);
> 
>-            if (!rgbString.equals(storeString))
>-                getPreferenceStore().setValue(key, rgbString);
>+				if (!rgbString.equals(storeString))
>+					getPreferenceStore().setValue(key, rgbString);
>+			}
>         }
> 
>         colorValuesToSet.clear();
>@@ -1417,12 +1425,15 @@
>             String id = (String) i.next();
>             String key = ThemeElementHelper.createPreferenceKey(currentTheme, id);
>             FontData[] fd = (FontData[]) fontPreferencesToSet.get(id);
>+			if (fd == null)
>+				getPreferenceStore().setToDefault(key);
>+			else {
>+				String fdString = PreferenceConverter.getStoredRepresentation(fd);
>+				String storeString = getPreferenceStore().getString(key);
> 
>-            String fdString = PreferenceConverter.getStoredRepresentation(fd);
>-            String storeString = getPreferenceStore().getString(key);
>-
>-            if (!fdString.equals(storeString))
>-                getPreferenceStore().setValue(key, fdString);
>+				if (!fdString.equals(storeString))
>+					getPreferenceStore().setValue(key, fdString);
>+			}
>         }
> 
>         fontValuesToSet.clear();
>@@ -1461,7 +1472,7 @@
> 			if (definition.getDefaultsTo() != null) {
> 				newRGB = getColorAncestorValue(definition);
> 				setDescendantRegistryValues(definition, newRGB);
>-				colorPreferencesToSet.remove(definition.getId());
>+				colorPreferencesToSet.put(definition.getId(), null);
> 			} else {
> 				newRGB = definition.getValue();
> 				setColorPreferenceValue(definition, newRGB);
>@@ -1479,7 +1490,7 @@
> 			if (definition.getDefaultsTo() != null) {
> 				newFD = getFontAncestorValue(definition);
> 				setDescendantRegistryValues(definition, newFD);
>-				fontPreferencesToSet.remove(definition.getId());
>+				fontPreferencesToSet.put(definition.getId(), null);
> 			} else {
> 				newFD = PreferenceConverter.getDefaultFontDataArray(getPreferenceStore(),
> 						ThemeElementHelper.createPreferenceKey(currentTheme, definition.getId()));

Actions: View | Diff

Attachments on bug 328708: 181818 | 181917 | 181926