Make an independent bundle out of SWT SVG fragment

HeikoKlare · HeikoKlare · commit c700b66f3283 · 2026-03-11T09:58:25.000+01:00
org.eclipse.swt.svg was implemented as a fragment for the SWT host. This requires a complex setup due to the SVG fragment depending on the effective SWT API provided by the native fragments. With the SVG rasterizer being provided via an OSGi capability anyway, the reason for having the SVG bundle as a fragment became obsolete. This change makes org.eclipse.swt.svg an ordinary bundle. The according tests are extracted into a separate bundle as well, making the SWT tests properly independent from the tests for the specific SVG rasterizer. Contributes to #3129
diff --git a/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.swt.svg
 Bundle-Version: 3.132.100.qualifier
 Automatic-Module-Name: org.eclipse.swt.svg
-Bundle-Name: %fragmentName
+Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Localization: fragment
+Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-21
-Fragment-Host: org.eclipse.swt
+Require-Bundle: org.eclipse.swt
 Import-Package: com.github.weisj.jsvg;version="[2.0.0,3.0.0)",
  com.github.weisj.jsvg.parser;version="[2.0.0,3.0.0)",
  com.github.weisj.jsvg.view;version="[2.0.0,3.0.0)"
diff --git a/bundles/org.eclipse.swt.svg/META-INF/p2.inf b/bundles/org.eclipse.swt.svg/META-INF/p2.inf
diff --git a/bundles/org.eclipse.swt.svg/build.properties b/bundles/org.eclipse.swt.svg/build.properties
@@ -17,15 +17,6 @@ source.. = src/,\
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               fragment.properties,\
+               plugin.properties,\
                about.html
 src.includes = about.html
-
-jars.extra.classpath = platform:/plugin/org.eclipse.swt.cocoa.macosx.aarch64,\
-                       platform:/plugin/org.eclipse.swt.cocoa.macosx.x86_64,\
-                       platform:/plugin/org.eclipse.swt.gtk.linux.aarch64,\
-                       platform:/plugin/org.eclipse.swt.gtk.linux.ppc64le,\
-                       platform:/plugin/org.eclipse.swt.gtk.linux.riscv64,\
-                       platform:/plugin/org.eclipse.swt.gtk.linux.x86_64,\
-                       platform:/plugin/org.eclipse.swt.win32.win32.aarch64,\
-                       platform:/plugin/org.eclipse.swt.win32.win32.x86_64
diff --git a/bundles/org.eclipse.swt.svg/plugin.properties b/bundles/org.eclipse.swt.svg/plugin.properties
@@ -10,5 +10,5 @@
 # Contributors:
 #     Michael Bangas (Vector Informatik GmbH) - initial API and implementation
 ###############################################################################
-fragmentName = SWT SVG Rendering Support
+pluginName = SWT SVG Rendering Support
 providerName = Eclipse.org
diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Export-Package:
  org.eclipse.swt.events,
  org.eclipse.swt.graphics,
  org.eclipse.swt.internal;x-internal:=true,
- org.eclipse.swt.internal.image;x-internal:=true,
+ org.eclipse.swt.internal.image;x-friends:="org.eclipse.swt.svg",
  org.eclipse.swt.layout,
  org.eclipse.swt.opengl,
  org.eclipse.swt.printing,
diff --git a/pom.xml b/pom.xml
@@ -236,6 +236,7 @@
     <module>examples/org.eclipse.swt.examples.ole.win32</module>
     <module>examples/org.eclipse.swt.examples.views</module>
     <module>tests/org.eclipse.swt.tests</module>
+    <module>tests/org.eclipse.swt.svg.tests</module>
     <module>features/org.eclipse.swt.tools.feature</module>
   </modules>
 </project>
diff --git a/tests/org.eclipse.swt.svg.tests/.classpath b/tests/org.eclipse.swt.svg.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.swt.svg.tests/.project b/tests/org.eclipse.swt.svg.tests/.project
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.swt.svg.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>.settings/org.eclipse.jdt.core.prefs</name>
+			<type>1</type>
+			<locationURI>SHARED_SETTINGS/org.eclipse.jdt.core.prefs</locationURI>
+		</link>
+	</linkedResources>
+	<variableList>
+		<variable>
+			<name>SHARED_SETTINGS</name>
+			<value>$%7BPARENT-2-PROJECT_LOC%7D/examples/.settings_shared</value>
+		</variable>
+	</variableList>
+</projectDescription>
diff --git a/tests/org.eclipse.swt.svg.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.swt.svg.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.swt.svg.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.swt.svg.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse SWT Tests SVG
+Fragment-Host: org.eclipse.swt.svg
+Bundle-SymbolicName: org.eclipse.swt.svg.tests
+Bundle-Version: 3.0.0.qualifier
+Automatic-Module-Name: org.eclipse.swt.svg.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)",
+ org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
+ org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
+
diff --git a/tests/org.eclipse.swt.svg.tests/build.properties b/tests/org.eclipse.swt.svg.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
+
+pom.model.packaging = eclipse-test-plugin
+pom.model.property.testClass = org.eclipse.swt.svg.AllSVGTests
diff --git a/tests/org.eclipse.swt.svg.tests/src/org/eclipse/swt/svg/AllSVGTests.java b/tests/org.eclipse.swt.svg.tests/src/org/eclipse/swt/svg/AllSVGTests.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Vector Informatik GmbH and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.swt.svg;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ //
+		JSVGRasterizerTest.class, //
+})
+public class AllSVGTests {
+}
diff --git a/tests/org.eclipse.swt.svg.tests/src/org/eclipse/swt/svg/JSVGRasterizerTest.java b/tests/org.eclipse.swt.svg.tests/src/org/eclipse/swt/svg/JSVGRasterizerTest.java
@@ -11,9 +11,8 @@
  * Contributors:
  *     Yatta Solutions - initial API and implementation
  *******************************************************************************/
-package org.eclipse.swt.tests.junit;
+package org.eclipse.swt.svg;
 
-import static org.eclipse.swt.tests.junit.SwtTestUtil.assertSWTProblem;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -23,10 +22,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.svg.JSVGRasterizer;
 import org.junit.jupiter.api.Test;
 
-@SuppressWarnings("restriction")
 class JSVGRasterizerTest {
 
 	private final JSVGRasterizer rasterizer = new JSVGRasterizer();
@@ -51,13 +48,7 @@ void testRasterizeWithZoom() {
 
 	@Test
 	void testRasterizeWithZoomNegative() {
-		try {
-			rasterizer.rasterizeSVG(svgStream(svgString), -100);
-
-		} catch (IllegalArgumentException e) {
-			assertSWTProblem("Incorrect exception thrown for negative zoom", SWT.ERROR_INVALID_ARGUMENT, e);
-		}
-
+		assertThrows(IllegalArgumentException.class, () -> rasterizer.rasterizeSVG(svgStream(svgString), -100));
 	}
 
 	@Test
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java
@@ -48,7 +48,6 @@ public class AllNonBrowserTests {
 			AllWidgetTests.class, //
 			// Rest of tests alphabetically
 			DPIUtilTests.class, //
-			JSVGRasterizerTest.class, //
 			Test_org_eclipse_swt_accessibility_Accessible.class, //
 			Test_org_eclipse_swt_accessibility_AccessibleControlEvent.class, //
 			Test_org_eclipse_swt_accessibility_AccessibleEvent.class, //

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+eclipse.preferences.version=1`
	`2`	`+encoding/<project>=UTF-8`