clean up jface and refactoring

Michael5601 · Dec 6, 2024 · 88ad734 · 88ad734
1 parent a9e2963
commit 88ad734
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/bundles/org.eclipse.jface/.classpath b/bundles/org.eclipse.jface/.classpath
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="libs/jsvg-1.6.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/bundles/org.eclipse.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.jface/META-INF/MANIFEST.MF
@@ -44,5 +44,3 @@ Import-Package: javax.xml.parsers,
  org.w3c.dom,
  org.xml.sax
 Automatic-Module-Name: org.eclipse.jface
-Bundle-ClassPath: libs/jsvg-1.6.1.jar,
- .
diff --git a/bundles/org.eclipse.jface/build.properties b/bundles/org.eclipse.jface/build.properties
@@ -16,8 +16,7 @@ bin.includes = plugin.properties,\
                .,\
                META-INF/,\
                icons/,\
-               .options,\
-               libs/jsvg-1.6.1.jar
+               .options
 src.includes = about.html
 source.. = src/
 output.. = bin/

diff --git a/bundles/org.eclipse.jface/libs/jsvg-1.6.1.jar b/bundles/org.eclipse.jface/libs/jsvg-1.6.1.jar
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
@@ -40,7 +40,8 @@
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageDataProvider;
 import org.eclipse.swt.graphics.ImageFileNameProvider;
-import org.eclipse.swt.graphics.SVGRasterizerServiceLoader;
+import org.eclipse.swt.graphics.SVGRasterizerRegistry;
+import org.eclipse.swt.graphics.SVGUtil;
 
 /**
  * An ImageDescriptor that gets its information from a URL. This class is not
@@ -61,10 +62,10 @@ public URLImageFileNameProvider(String url) {
 		public String getImagePath(int zoom) {
 			URL tempURL = getURL(url);
 			if (tempURL != null) {
-				ISVGRasterizer rasterizer = SVGRasterizerServiceLoader.getRasterizer();
+				ISVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer();
 				if (rasterizer != null) {
 					try (InputStream in = getStream(tempURL)) {
-						if (rasterizer.isSVGFile(in)) {
+						if (SVGUtil.isSVGFile(in)) {
 							return getFilePath(tempURL, false);
 						}
 					} catch (IOException e) {
@@ -151,11 +152,11 @@ public ImageData getImageData(int zoom) {
 	private static ImageData getImageData(String url, int zoom) {
 		URL tempURL = getURL(url);
 		if (tempURL != null) {
-			ISVGRasterizer rasterizer = SVGRasterizerServiceLoader.getRasterizer();
+			ISVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer();
 			if (rasterizer != null) {
 				try {
 					try (InputStream in = getStream(tempURL)) {
-						if (rasterizer.isSVGFile(in)) {
+						if (SVGUtil.isSVGFile(in)) {
 							return getImageData(tempURL, zoom);
 						}
 					}

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
@@ -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.register();
+		SVGRasterizer.intializeSVGRasterizer();
 		Realm.runWithDefault(DisplayRealm.getRealm(display), () -> {
 			boolean showProgress = PrefUtil.getAPIPreferenceStore()
 					.getBoolean(IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP);