Bug 565208: Remove calls to Color.dispose

Conflicts:
	bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java

Change-Id: I59f5940a5ce8c473740a6d83d80b8d39e1547bbc

3 files changed, 1 insertions, 23 deletions

diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/RGBColorDescriptor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/RGBColorDescriptor.java
index c83328582d2..72fd0472f44 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/RGBColorDescriptor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/RGBColorDescriptor.java
@@ -84,10 +84,6 @@ class RGBColorDescriptor extends ColorDescriptor {
 
 	@Override
 	public void destroyColor(Color toDestroy) {
-		if (toDestroy == originalColor) {
-			return;
-		}
-
-		toDestroy.dispose();
+		// Colors do not need disposal
 	}
 }
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet007ColorLabelProvider.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet007ColorLabelProvider.java
index 6a078635c58..32f584ee926 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet007ColorLabelProvider.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet007ColorLabelProvider.java
@@ -199,10 +199,5 @@ public class Snippet007ColorLabelProvider {
 			return ((Person) element).getGender() == Gender.MALE ? maleColor : femaleColor;
 		}
 
-		@Override
-		public void dispose() {
-			super.dispose();
-			femaleColor.dispose();
-		}
 	}
 }
diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/FormColorsTest.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/FormColorsTest.java
index 4741a2723b8..fe7d9e8f22f 100644
--- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/FormColorsTest.java
+++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/FormColorsTest.java
@@ -17,7 +17,6 @@ package org.eclipse.ui.tests.forms.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Display;
@@ -74,17 +73,7 @@ public class FormColorsTest {
 		assertEquals("FormColors did not return the same instance for getBackground()", bg, fColors.getBackground());
 		assertEquals("FormColors did not return the same instance for getForeground()", fg, fColors.getForeground());
 		assertEquals("FormColors did not return the same instance for getBorderColor()", bc, fColors.getBorderColor());
-		boolean testBorderDispose = !bc.equals(fColors.getColor(IFormColors.BORDER));
-		// Create a Color which is not used inside eclipse to test if this color
-		// is disposed reliable when the FormColors object is disposed.
-		Color testColor = fColors.createColor("test", 1, 2, 3);
 		fColors.dispose();
-		assertTrue("FormColors did not dispose key: test", testColor.isDisposed());
-		assertTrue("FormColors did not dispose getInactiveBackground()", inactiveBg.isDisposed());
-		assertFalse("FormColors disposed getBackground()", bg.isDisposed());
-		assertFalse("FormColors disposed getForeground()", fg.isDisposed());
-		if (testBorderDispose)
-			assertFalse("FormColors disposed getBorderColor() when it shouldn't have", bc.isDisposed());
 	}
 
 	@Test
@@ -196,7 +185,5 @@ public class FormColorsTest {
 		assertEquals("FormColors returned wrong color for an existing key.", fColors.getColor(TEST_KEY_1), test1);
 		assertEquals("FormColors returned wrong color for an existing key.", fColors.getColor(TEST_KEY_2), test2);
 		fColors.dispose();
-		assertTrue("FormColors did not dispose a custom key.", test1.isDisposed());
-		assertTrue("FormColors did not dispose a custom key.", test2.isDisposed());
 	}
 }