Bug 577035 - Remove unused icons from e4 FilteredTree
Icons created in FilteredTree are never accessed. Most likely a
remainder of the days in which windows did not support ICONS cancel.
Change-Id: Ia4cec37f1a3bc7b6cec07af92d741cf369cee3f4
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/187268
Tested-by: Platform Bot <platform-bot@eclipse.org>
diff --git a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java
index 1fdfbfe..8f332cb 100644
--- a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java
+++ b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java
@@ -13,17 +13,11 @@
*******************************************************************************/
package org.eclipse.e4.ui.dialogs.filteredtree;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.e4.ui.dialogs.textbundles.E4DialogMessages;
-import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ISelection;
@@ -49,8 +43,6 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
/**
* Based on org.eclipse.ui.dialogs.FilteredTree.
@@ -104,21 +96,6 @@
private Composite treeComposite;
/**
- * Image descriptor for enabled clear button.
- */
- private static final String CLEAR_ICON = "org.eclipse.ui.internal.dialogs.CLEAR_ICON"; //$NON-NLS-1$
-
- /**
- * Image descriptor for disabled clear button.
- */
- private static final String DISABLED_CLEAR_ICON = "org.eclipse.ui.internal.dialogs.DCLEAR_ICON"; //$NON-NLS-1$
-
- /**
- * Image descriptor for disabled clear button.
- */
- private static final String PRESSED_CLEAR_ICON = "org.eclipse.ui.internal.dialogs.PRESSED_CLEAR_ICON"; //$NON-NLS-1$
-
- /**
* Maximum time spent expanding the tree after the filter text has been
* updated (this is only used if we were able to at least expand the visible
* nodes)
@@ -126,28 +103,6 @@
private static final long SOFT_MAX_EXPAND_TIME = 200;
/**
- * Get image descriptors for the clear button.
- */
- static {
- Bundle bundle = FrameworkUtil.getBundle(FilteredTree.class);
- IPath enabledPath = new Path("$nl$/icons/full/etool16/clear_co.png"); //$NON-NLS-1$
- URL enabledURL = FileLocator.find(bundle, enabledPath, null);
- ImageDescriptor enabledDesc = ImageDescriptor.createFromURL(enabledURL);
- if (enabledDesc != null) {
- JFaceResources.getImageRegistry().put(CLEAR_ICON, enabledDesc);
- JFaceResources.getImageRegistry().put(PRESSED_CLEAR_ICON,
- ImageDescriptor.createWithFlags(enabledDesc, SWT.IMAGE_GRAY));
- }
-
- IPath disabledPath = new Path("$nl$/icons/full/dtool16/clear_co.png"); //$NON-NLS-1$
- URL disabledURL = FileLocator.find(bundle, disabledPath, null);
- ImageDescriptor disabledDesc = ImageDescriptor.createFromURL(disabledURL);
- if (disabledDesc != null) {
- JFaceResources.getImageRegistry().put(DISABLED_CLEAR_ICON, disabledDesc);
- }
- }
-
- /**
* Create a new instance of the receiver.
*
* @param parent
