[FIXUP] Replace FileImageDescriptor by URLImageDescriptor

Author: HannesWell

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java

@@ -84,7 +84,7 @@ protected ImageDescriptor() {
 	 * @return a new image descriptor
 	 */
 	public static ImageDescriptor createFromFile(Class<?> location, String filename) {
-		return new FileImageDescriptor(location, filename);
+		return createFromURL(location.getResource(filename));
 	}
 
 	/**

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java

@@ -24,6 +24,8 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IAdaptable;
@@ -69,7 +71,7 @@ public String getImagePath(int zoom) {
 						return xResult;
 					}
 				}
-				String xpath = FileImageDescriptor.getxPath(url, zoom);
+				String xpath = getxPath(url, zoom);
 				if (xpath != null) {
 					URL xPathUrl = getURL(xpath);
 					if (xPathUrl != null) {
@@ -148,7 +150,7 @@ private static ImageData getImageData(String url, int zoom) {
 					return xdata;
 				}
 			}
-			String xpath = FileImageDescriptor.getxPath(url, zoom);
+			String xpath = getxPath(url, zoom);
 			if (xpath != null) {
 				URL xPathUrl = getURL(xpath);
 				if (xPathUrl != null) {
@@ -159,6 +161,26 @@ private static ImageData getImageData(String url, int zoom) {
 		return null;
 	}
 
+	private static final Pattern XPATH_PATTERN = Pattern.compile("(\\d+)x(\\d+)"); //$NON-NLS-1$
+
+	private static String getxPath(String name, int zoom) {
+		Matcher matcher = XPATH_PATTERN.matcher(name);
+		if (matcher.find()) {
+			try {
+				int currentWidth = Integer.parseInt(matcher.group(1));
+				int desiredWidth = Math.round((zoom / 100f) * currentWidth);
+				int currentHeight = Integer.parseInt(matcher.group(2));
+				int desiredHeight = Math.round((zoom / 100f) * currentHeight);
+				String lead = name.substring(0, matcher.start(1));
+				String tail = name.substring(matcher.end(2));
+				return lead + desiredWidth + "x" + desiredHeight + tail; //$NON-NLS-1$
+			} catch (RuntimeException e) {
+				// should never happen but if then we can't use the alternative name...
+			}
+		}
+		return null;
+	}
+
 	private static ImageData getImageData(URL url) {
 		ImageData result = null;
 		try (InputStream in = getStream(url)) {