105260 [BIDI] need to add $nl$/ to icon paths for reversed icons

3 files changed, 28 insertions, 14 deletions

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
index c09a6c14eb9..c26c86cec82 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
@@ -140,7 +140,7 @@ class SearchPageDescriptor implements IPluginContribution, Comparable {
 		if (imageName == null)
 			return null;
 		Bundle bundle = Platform.getBundle(getPluginId());
-		return SearchPluginImages.createImageDescriptor(bundle, new Path(imageName));
+		return SearchPluginImages.createImageDescriptor(bundle, new Path(imageName), true);
 	}
 
 	/**
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPluginImages.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPluginImages.java
index aa4576d76be..2f58b7ff8c3 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPluginImages.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPluginImages.java
@@ -74,37 +74,51 @@ public class SearchPluginImages {
 	}
 	
 	private static ImageDescriptor createManaged(String prefix, String name) {
-		ImageDescriptor result= create(prefix, name.substring(NAME_PREFIX_LENGTH));
-		if (result == null) {
-			result= ImageDescriptor.getMissingImageDescriptor();
-		}
+		ImageDescriptor result= create(prefix, name.substring(NAME_PREFIX_LENGTH), true);
 		PLUGIN_REGISTRY.put(name, result);
 		return result;
 	}
 	
-	private static ImageDescriptor create(String prefix, String name) {
+	/*
+	 * Creates an image descriptor for the given prefix and name in the Search plugin bundle. The path can
+	 * contain variables like $NL$.
+	 * If no image could be found, <code>useMissingImageDescriptor</code> decides if either
+	 * the 'missing image descriptor' is returned or <code>null</code>.
+	 * or <code>null</code>.
+	 */
+	private static ImageDescriptor create(String prefix, String name, boolean useMissingImageDescriptor) {
 		IPath path= ICONS_PATH.append(prefix).append(name);
-		return createImageDescriptor(SearchPlugin.getDefault().getBundle(), path);
+		return createImageDescriptor(SearchPlugin.getDefault().getBundle(), path, useMissingImageDescriptor);
 	}
-
+	
 	/*
 	 * Sets all available image descriptors for the given action.
 	 */	
 	public static void setImageDescriptors(IAction action, String type, String relPath) {
 		relPath= relPath.substring(NAME_PREFIX_LENGTH);
-		action.setDisabledImageDescriptor(create("d" + type, relPath)); //$NON-NLS-1$
-		action.setHoverImageDescriptor(create("e" + type, relPath)); //$NON-NLS-1$
-		action.setImageDescriptor(create("e" + type, relPath)); //$NON-NLS-1$
+		
+		action.setDisabledImageDescriptor(create("d" + type, relPath, false)); //$NON-NLS-1$
+		
+		ImageDescriptor desc= create("e" + type, relPath, true); //$NON-NLS-1$
+		action.setHoverImageDescriptor(desc); 
+		action.setImageDescriptor(desc);
 	}
 	
 	/*
-	 * Since 3.1.1. Load from icon paths with $NL$
+	 * Creates an image descriptor for the given path in a bundle. The path can contain variables
+	 * like $NL$.
+	 * If no image could be found, <code>useMissingImageDescriptor</code> decides if either
+	 * the 'missing image descriptor' is returned or <code>null</code>.
+	 * Added for 3.1.1.
 	 */
-	public static ImageDescriptor createImageDescriptor(Bundle bundle, IPath path) {
+	public static ImageDescriptor createImageDescriptor(Bundle bundle, IPath path, boolean useMissingImageDescriptor) {
 		URL url= Platform.find(bundle, path);
 		if (url != null) {
 			return ImageDescriptor.createFromURL(url);
 		}
+		if (useMissingImageDescriptor) {
+			return ImageDescriptor.getMissingImageDescriptor();
+		}
 		return null;
 	}
 	
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SorterDescriptor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SorterDescriptor.java
index 2440c532a8b..d2490c28cbb 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SorterDescriptor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SorterDescriptor.java
@@ -78,7 +78,7 @@ class SorterDescriptor {
 		if (imageName == null)
 			return null;
 		Bundle bundle = Platform.getBundle(fElement.getNamespace());
-		return SearchPluginImages.createImageDescriptor(bundle, new Path(imageName));
+		return SearchPluginImages.createImageDescriptor(bundle, new Path(imageName), true);
 	}
 
 	/**