remove inner class DynamicImageFileFormat and make SVGFileFormat directly inherit FileFormat

Author: Michael5601

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java

@@ -87,16 +87,6 @@ List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom)
 		}
 	}
 
-	static abstract class DynamicImageFileFormat extends FileFormat {
-
-		abstract ImageData[] loadFromByteStream(int targetZoom);
-
-		@Override
-		List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom) {
-			return Arrays.stream(loadFromByteStream(targetZoom)).map(d -> new ElementAtZoom<>(d, fileZoom)).toList();
-		}
-	}
-
 	LEDataInputStream inputStream;
 	LEDataOutputStream outputStream;
 	ImageLoader loader;

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/SVGFileFormat.java

@@ -19,24 +19,35 @@
 import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.image.FileFormat.*;
+import org.eclipse.swt.internal.DPIUtil.*;
 
-public class SVGFileFormat extends DynamicImageFileFormat {
+/**
+ * A {@link FileFormat} implementation for handling SVG (Scalable Vector Graphics) files.
+ * <p>
+ * This class detects SVG files based on their header and uses a registered
+ * {@link SVGRasterizer} service to rasterize SVG content.
+ * </p>
+ */
+public class SVGFileFormat extends FileFormat {
 
 	/** The instance of the registered {@link SVGRasterizer}. */
 	private static final SVGRasterizer RASTERIZER = ServiceLoader.load(SVGRasterizer.class).findFirst().orElse(null);
 
 	@Override
 	boolean isFileFormat(LEDataInputStream stream) throws IOException {
 		byte[] firstBytes = new byte[5];
-	    int bytesRead = stream.read(firstBytes);
-	    stream.unread(firstBytes);
-	    String header = new String(firstBytes, 0, bytesRead, StandardCharsets.UTF_8).trim();
-	    return header.startsWith("<?xml") || header.startsWith("<svg");
+		int bytesRead = stream.read(firstBytes);
+		stream.unread(firstBytes);
+		String header = new String(firstBytes, 0, bytesRead, StandardCharsets.UTF_8).trim();
+		return header.startsWith("<?xml") || header.startsWith("<svg");
 	}
 
 	@Override
-	ImageData[] loadFromByteStream(int targetZoom) {
+	List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom) {
+		return Arrays.stream(loadFromByteStream(targetZoom)).map(d -> new ElementAtZoom<>(d, fileZoom)).toList();
+	}
+
+	private ImageData[] loadFromByteStream(int targetZoom) {
 		try {
 			if (RASTERIZER != null && targetZoom != 0) {
 				return RASTERIZER.rasterizeSVG(inputStream, targetZoom);