Bug 565208: Remove calls to Color.dispose

As these calls are no longer needed, remove the calls
and related code around such dispose that is also
now redundant.

Change-Id: Ifc0f908e50a7ab4398acf6515904c82aad4969f2

11 files changed, 1 insertions, 65 deletions

diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/resources/SWTResourcesRegistry.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/resources/SWTResourcesRegistry.java
index 3c3c28fa3da..44ad47de0f0 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/resources/SWTResourcesRegistry.java
+++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/resources/SWTResourcesRegistry.java
@@ -84,12 +84,7 @@ public class SWTResourcesRegistry extends AbstractResourcesRegistry {
 	@Override
 	public void disposeResource(Object type, Object key, Object resource) {
 		// Dispose SWT Resource
-		if (resource instanceof Color) {
-			((Color)resource).dispose();
-			//TODO replace with eclipse logging
-			//			if (logger.isDebugEnabled())
-			//				logger.debug("Dispose SWT Color key=" + key);
-		} else if (resource instanceof Cursor) {
+		if (resource instanceof Cursor) {
 			((Cursor)resource).dispose();
 			//TODO replace with eclipse logging
 			//			if (logger.isDebugEnabled())
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/TitleAreaDialog.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/TitleAreaDialog.java
index 02aefa270ba..40ae60789fb 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/TitleAreaDialog.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/TitleAreaDialog.java
@@ -213,12 +213,6 @@ public class TitleAreaDialog extends TrayDialog {
 	 */
 	private Control createTitleArea(Composite parent) {
 
-		// add a dispose listener
-		parent.addDisposeListener(e -> {
-			if (titleAreaColor != null) {
-				titleAreaColor.dispose();
-			}
-		});
 		// Determine the background color of the title bar
 		Display display = parent.getDisplay();
 		Color background;
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/FieldAssistColors.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/FieldAssistColors.java
index df147cfb086..2cc08563508 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/FieldAssistColors.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/FieldAssistColors.java
@@ -195,11 +195,6 @@ public class FieldAssistColors {
 			// color or else the comparison between this color and the one
 			// in the map will fail.
 			displays.remove(color);
-			// Dispose it
-			if (DEBUG) {
-				System.out.println("Disposing color " + color); //$NON-NLS-1$
-			}
-			color.dispose();
 		}
 		if (DEBUG) {
 			System.out.println("Display map is " + displays); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/ColorSelector.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/ColorSelector.java
index 83c85eaeba7..873360b7599 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/ColorSelector.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/ColorSelector.java
@@ -79,10 +79,6 @@ public class ColorSelector extends EventManager {
 				fImage.dispose();
 				fImage = null;
 			}
-			if (fColor != null) {
-				fColor.dispose();
-				fColor = null;
-			}
 		});
 		fButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
 			@Override
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ColorRegistry.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ColorRegistry.java
index cd925f87d37..25dcffdcf29 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ColorRegistry.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ColorRegistry.java
@@ -16,7 +16,6 @@ package org.eclipse.jface.resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -146,18 +145,6 @@ public class ColorRegistry extends ResourceRegistry {
 	}
 
 	/**
-	 * Dispose of all of the <code>Color</code>s in this iterator.
-	 *
-	 * @param iterator over <code>Collection</code> of <code>Color</code>
-	 */
-	private void disposeColors(Iterator<Color> iterator) {
-		while (iterator.hasNext()) {
-			Object next = iterator.next();
-			((Color) next).dispose();
-		}
-	}
-
-	/**
 	 * Returns the <code>color</code> associated with the given symbolic color
 	 * name, or <code>null</code> if no such definition exists.
 	 *
@@ -240,8 +227,6 @@ public class ColorRegistry extends ResourceRegistry {
 
 	@Override
 	protected void clearCaches() {
-		disposeColors(stringToColor.values().iterator());
-		disposeColors(staleColors.iterator());
 		stringToColor.clear();
 		staleColors.clear();
 		display = null;
diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/FormColors.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/FormColors.java
index a99d84ea1b3..9be6ef0fbb5 100644
--- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/FormColors.java
+++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/FormColors.java
@@ -633,7 +633,6 @@ public class FormColors {
 		Color color = getColor(key);
 		if (color != null) {
 			colorRegistry.remove(key);
-			color.dispose();
 		}
 	}
 
diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java
index a26aa2bd716..1990d72f0c1 100644
--- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java
+++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java
@@ -124,8 +124,6 @@ public class FormImages {
 			gc.setBackground(color1);
 			gc.fillGradientRectangle(0, fMarginHeight + 2, 1, fTheight - 2, true);
 			gc.dispose();
-			color1.dispose();
-			color2.dispose();
 			return image;
 		}
 	}
@@ -192,10 +190,6 @@ public class FormImages {
 			Color bg = fBgRGB == null ? null : new Color(device, fBgRGB);
 			drawTextGradient(gc, width, height, colors, fPercents, fVertical, bg);
 			gc.dispose();
-			for (Color color : colors)
-				color.dispose();
-			if (bg != null)
-				bg.dispose();
 			return gradient;
 		}
 
@@ -291,8 +285,6 @@ public class FormImages {
 			gc.setBackground(originalBgColor);
 			gc.fillRectangle(0, fTheight - fMarginHeight - 4, 1, 4);
 			gc.dispose();
-			color1.dispose();
-			originalBgColor.dispose();
 			return image;
 		}
 	}
@@ -318,8 +310,6 @@ public class FormImages {
 			gc.setBackground(color1);
 			gc.fillGradientRectangle(0, fMarginHeight + 2, 1, fTheight - 2, true);
 			gc.dispose();
-			color1.dispose();
-			color2.dispose();
 
 			return image;
 		}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java
index 09882fbf5b8..7b32ea3eef9 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java
@@ -265,15 +265,6 @@ public class HeapStatus extends Composite {
 			disabledGcImage.dispose();
 		}
 
-		if (usedMemCol != null) {
-			usedMemCol.dispose();
-		}
-		if (lowMemCol != null) {
-			lowMemCol.dispose();
-		}
-		if (freeMemCol != null) {
-			freeMemCol.dispose();
-		}
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java
index 2dfdda8807d..f8ef8cfb7af 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java
@@ -218,7 +218,6 @@ public class ShowViewDialog extends Dialog implements ISelectionChangedListener,
 		Control treeControl = treeViewer.getControl();
 		RGB dimmedRGB = blend(treeControl.getForeground().getRGB(), treeControl.getBackground().getRGB(), 60);
 		dimmedForeground = new Color(treeControl.getDisplay(), dimmedRGB);
-		treeControl.addDisposeListener(e -> dimmedForeground.dispose());
 
 		treeViewer
 				.setLabelProvider(new ViewLabelProvider(context, modelService, partService, window, dimmedForeground));
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/SupportTray.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/SupportTray.java
index dd6359403d0..3a336fd3f38 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/SupportTray.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/SupportTray.java
@@ -180,7 +180,6 @@ public class SupportTray extends DialogTray implements ISelectionChangedListener
 		gc.drawPolygon(shape);
 		gc.dispose();
 
-		backgroundHot.dispose();
 	}
 
 	/**
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java
index 4bd811bb182..8af0357d090 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java
@@ -156,13 +156,6 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler {
 		return monitor;
 	}
 
-	@Override
-	public void dispose() {
-		if (foreground != null)
-			foreground.dispose();
-		super.dispose();
-	}
-
 	/**
 	 * Set the foreground text color. This method has no effect after
 	 * {@link #getBundleProgressMonitor()} has been invoked.