From 4b0ce820fdff4786de8b5827400873901c3da408 Mon Sep 17 00:00:00 2001 From: Michael Bangas Date: Wed, 11 Dec 2024 09:04:51 +0100 Subject: [PATCH] Refactor names of SVGRasterizer and ISVGRasterizer --- .../src/org/eclipse/jface/resource/URLImageDescriptor.java | 6 +++--- .../eclipseui/org/eclipse/ui/internal/Workbench.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 297b5151c97..1151a2fb5c3 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 @@ -35,7 +35,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.SWTException; import org.eclipse.swt.graphics.Device; -import org.eclipse.swt.graphics.ISVGRasterizer; +import org.eclipse.swt.graphics.SVGRasterizer; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageDataProvider; @@ -62,7 +62,7 @@ public URLImageFileNameProvider(String url) { public String getImagePath(int zoom) { URL tempURL = getURL(url); if (tempURL != null) { - ISVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer(); + SVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer(); if (rasterizer != null) { try (InputStream in = getStream(tempURL)) { if (SVGUtil.isSVGFile(in)) { @@ -152,7 +152,7 @@ public ImageData getImageData(int zoom) { private static ImageData getImageData(String url, int zoom) { URL tempURL = getURL(url); if (tempURL != null) { - ISVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer(); + SVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer(); if (rasterizer != null) { try { try (InputStream in = getStream(tempURL)) { diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java index 02a1512a2a4..992bef47b51 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java @@ -156,7 +156,7 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.graphics.Transform; -import org.eclipse.swt.svg.SVGRasterizer; +import org.eclipse.swt.svg.JSVGRasterizer; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Monitor; @@ -568,7 +568,7 @@ public static Workbench getInstance() { */ public static int createAndRunWorkbench(final Display display, final WorkbenchAdvisor advisor) { final int[] returnCode = new int[1]; - SVGRasterizer.intializeSVGRasterizer(); + JSVGRasterizer.intializeJSVGRasterizer(); Realm.runWithDefault(DisplayRealm.getRealm(display), () -> { boolean showProgress = PrefUtil.getAPIPreferenceStore() .getBoolean(IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP);