diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java index e00a363bfe0..eb2cce6b4bd 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java @@ -95,7 +95,23 @@ public URLImageDataProvider(String url) { public ImageData getImageData(int zoom) { return URLImageDescriptor.getImageData(url, zoom); } - +// +// @Override +// public ImageData getCustomizedImageData(int zoom, int flag) { +// return URLImageDescriptor.getCustomizedImageData(url, zoom, flag); +// } + +// @Override +// public boolean supportsRasterizationFlag(int flag) { +// boolean supportsFlag = flag == SWT.IMAGE_DISABLE || flag == SWT.IMAGE_GRAY || flag == SWT.IMAGE_COPY; +// URL tempURL = getURL(url); +// if (tempURL != null) { +// if (tempURL.toString().endsWith(".svg") && supportsFlag) { //$NON-NLS-1$ +// return true; +// } +// } +// return false; +// } } private static long cumulativeTime; @@ -139,6 +155,9 @@ public ImageData getImageData(int zoom) { private static ImageData getImageData(String url, int zoom) { URL tempURL = getURL(url); if (tempURL != null) { +// if (tempURL.toString().endsWith(".svg")) { //$NON-NLS-1$ +// return getImageData(tempURL, zoom); +// } if (zoom == 100) { return getImageData(tempURL); } @@ -177,6 +196,28 @@ private static ImageData getImageData(URL url) { return result; } +// private static ImageData getImageData(URL url, int zoom, int flag) { +// ImageData result = null; +// try (InputStream in = getStream(url)) { +// if (in != null) { +// result = new ImageData(in, zoom, flag); +// } +// } catch (SWTException e) { +// if (e.code != SWT.ERROR_INVALID_IMAGE) { +// throw e; +// // fall through otherwise +// } +// } catch (IOException e) { +// Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e)); +// } +// return result; +// } +// +// private static ImageData getCustomizedImageData(String url, int zoom, int flag) { +// URL tempURL = getURL(url); +// return getImageData(tempURL, zoom, flag); +// } + /** * Returns a stream on the image contents. Returns null if a stream could * not be opened. diff --git a/features/org.eclipse.e4.rcp/feature.xml b/features/org.eclipse.e4.rcp/feature.xml index a9c6104ed35..d9657478cde 100644 --- a/features/org.eclipse.e4.rcp/feature.xml +++ b/features/org.eclipse.e4.rcp/feature.xml @@ -294,6 +294,10 @@ arch="aarch64" version="0.0.0"/> + +