Bug 565208: Remove calls to Color.dispose

Remove Color#dispose from PDE ColorManager

Change-Id: I5d198a5414a30a12e2d91c255f80848c6b5043dc
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

2 files changed, 8 insertions, 15 deletions

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
index 5719e5b3c5..8a942a7799 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
@@ -13,7 +13,8 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.editor.text;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 import org.eclipse.jdt.ui.PreferenceConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
@@ -100,20 +101,13 @@ public class ColorManager implements IColorManager, IPDEColorConstants {
 		}
 	}
 
-	public void disposeColors(boolean resetSingleton) {
-		Iterator<Color> e = fColorTable.values().iterator();
-		while (e.hasNext())
-			e.next().dispose();
-		if (resetSingleton)
-			fColorManager = null;
-
-	}
-
 	@Override
 	public void dispose() {
 		counter--;
-		if (counter == 0)
-			disposeColors(true);
+		if (counter == 0) {
+			fColorManager = null;
+
+		}
 	}
 
 	private void putColor(IPreferenceStore pstore, String property) {
@@ -123,9 +117,9 @@ public class ColorManager implements IColorManager, IPDEColorConstants {
 	private void putColor(String property, RGB setting) {
 		Color oldColor = fColorTable.get(property);
 		if (oldColor != null) {
-			if (oldColor.getRGB().equals(setting))
+			if (oldColor.getRGB().equals(setting)) {
 				return;
-			oldColor.dispose();
+			}
 		}
 		fColorTable.put(property, new Color(Display.getCurrent(), setting));
 	}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java
index e906bbdba1..d76988fd5a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java
@@ -47,7 +47,6 @@ public class EditorPreferencePage extends PreferencePage implements IWorkbenchPr
 
 	@Override
 	public void dispose() {
-		fColorManager.disposeColors(false);
 		fXMLTab.dispose();
 		fManifestTab.dispose();
 		super.dispose();