515561: TextSearchControl looks for both clear_co.gif and png

Change-Id: Ie347a6f3ff6b1bd4190b68ce26348d7087aa3d26
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=515561
Signed-off-by: Jaxsun McCarthy Huggan <jaxsun.mccarthy@tasktop.com>
diff --git a/org.eclipse.mylyn.commons.workbench/src/org/eclipse/mylyn/commons/workbench/search/TextSearchControl.java b/org.eclipse.mylyn.commons.workbench/src/org/eclipse/mylyn/commons/workbench/search/TextSearchControl.java
index bb47f83..f339467 100644
--- a/org.eclipse.mylyn.commons.workbench/src/org/eclipse/mylyn/commons/workbench/search/TextSearchControl.java
+++ b/org.eclipse.mylyn.commons.workbench/src/org/eclipse/mylyn/commons/workbench/search/TextSearchControl.java
@@ -94,6 +94,10 @@
 	static {
 		ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID,
 				"$nl$/icons/full/etool16/clear_co.gif"); //$NON-NLS-1$
+		if (descriptor == null) {
+			descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID,
+					"$nl$/icons/full/etool16/clear_co.png"); //$NON-NLS-1$
+		}
 		if (descriptor != null) {
 			JFaceResources.getImageRegistry().put(CLEAR_ICON, descriptor);
 		}
@@ -160,7 +164,7 @@
 					Messages.TextControl_AccessibleListenerFindButton, Messages.TextControl_FindToolTip, ICON_SEARCH);
 			clearControl = createLabelButtonControl(this, textControl,
 					JFaceResources.getImageRegistry().getDescriptor(CLEAR_ICON),
-					WorkbenchMessages.FilteredTree_ClearToolTip,//FilteredTree_AccessibleListenerClearButton,
+					WorkbenchMessages.FilteredTree_ClearToolTip, //FilteredTree_AccessibleListenerClearButton,
 					WorkbenchMessages.FilteredTree_ClearToolTip, ICON_CANCEL);
 			addModifyListener(new ModifyListener() {
 
@@ -240,7 +244,8 @@
 	}
 
 	private Control createLabelButtonControl(Composite parent, final Text textControl,
-			ImageDescriptor activeImageDescriptor, final String accessibilityText, String toolTipText, final int detail) {
+			ImageDescriptor activeImageDescriptor, final String accessibilityText, String toolTipText,
+			final int detail) {
 
 		final Image nativeImage = parent.getDisplay().getSystemImage(detail);