Leverage new ImageData.save API

Author: HannesWell

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java

@@ -16,6 +16,7 @@
 
 
 import java.io.*;
+import java.nio.file.Path;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
@@ -173,9 +174,7 @@ IShellLink createShellLink (MenuItem item) {
 				} else {
 					data = image.getImageData (DPIUtil.getDeviceZoom ());
 				}
-				ImageLoader loader = new ImageLoader ();
-				loader.data = new ImageData [] {data};
-				loader.save (icon, SWT.IMAGE_ICO);
+				data.save(Path.of(icon));
 			}
 		}
 		if (icon != null) {

examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet246.java

@@ -19,6 +19,8 @@
  * For a list of all SWT example snippets see
  * http://www.eclipse.org/swt/snippets/
  */
+import java.nio.file.Path;
+
 import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.*;
@@ -62,9 +64,7 @@ private static void createImage() {
 		gc.drawString("T", 124, 10);
 		gc.dispose();
 
-		ImageLoader loader = new ImageLoader();
-		loader.data = new ImageData[] { image.getImageData() };
-		loader.save("swt.png", SWT.IMAGE_PNG);
+		image.getImageData().save(Path.of("swt.png"));
 		image.dispose();
 		font.dispose();
 	}

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug547529_ControlPrintBroken.java

@@ -12,7 +12,7 @@
  *     Andrey Loskutov - initial API and implementation
  *******************************************************************************/
 package org.eclipse.swt.tests.gtk.snippets;
-import java.io.File;
+import java.nio.file.Path;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
@@ -89,15 +89,11 @@ private static void snapshot(Display display, Composite composite, String filena
 		composite.print(gc);
 		gc.dispose();
 
-		ImageLoader loader = new ImageLoader();
-		loader.data = new ImageData[] { image.getImageData() };
-		File file = new File(filename + ".png");
-		file.delete();
-		loader.save(filename + ".png", SWT.IMAGE_PNG);
-
+		Path file = Path.of(filename + ".png");
+		image.getImageData().save(file);
 
-		loader = new ImageLoader();
-		ImageData[] loaded = loader.load(file.getAbsolutePath());
+		ImageLoader loader = new ImageLoader();
+		ImageData[] loaded = loader.load(file.toAbsolutePath().toString());
 		Shell shell = display.getShells()[0];
 		for (ImageData d : loaded) {
 			Label l = new Label(shell, SWT.NONE);

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug547529_ImageLoaderStriping.java

@@ -13,13 +13,14 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.gtk.snippets;
 
+import java.nio.file.Path;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Button;
@@ -56,7 +57,7 @@ public void widgetSelected(SelectionEvent e) {
 				dialog.setFileName("Untitled.png");
 				String filename = dialog.open();
 				if ((filename != null) && !filename.isEmpty()) {
-					saveImage(composite, filename, SWT.IMAGE_PNG);
+					saveImage(composite, Path.of(filename));
 				}
 			}
 		});
@@ -71,15 +72,13 @@ public void widgetSelected(SelectionEvent e) {
 		display.dispose();
 	}
 
-	private static void saveImage(Control control, String filename, int format) {
+	private static void saveImage(Control control, Path file) {
 		Image image = new Image(control.getDisplay(), control.getBounds());
 		GC gc = new GC(image);
 		control.print(gc);
 		gc.dispose();
 		ImageData data = image.getImageData();
-		ImageLoader loader = new ImageLoader();
-		loader.data = new ImageData[] { data };
-		loader.save(filename, format);
+		data.save(file);
 		image.dispose();
 	}
 }

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug547557_ShellPrintGC.java

@@ -14,13 +14,13 @@
 package org.eclipse.swt.tests.gtk.snippets;
 
 
+import java.nio.file.Path;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Button;
@@ -50,7 +50,7 @@ public void widgetSelected(SelectionEvent e) {
 				// String filename = "/home/<user>/shell_test.png";
 				String filename = "";
 				if ((filename != null) && !filename.isEmpty()) {
-					saveImage(shell, filename, SWT.IMAGE_PNG);
+					saveImage(shell, Path.of(filename));
 				}
 			}
 		});
@@ -64,18 +64,15 @@ public void widgetSelected(SelectionEvent e) {
 		display.dispose();
 	}
 
-	private static void saveImage(Shell shell, String filename, int format) {
+	private static void saveImage(Shell shell, Path file) {
 		Rectangle bounds = shell.getBounds();
 		Image image = new Image(shell.getDisplay(), bounds);
 		// Printing the client area will result in a warning and only the client area being printed
 //		Image image = new Image(shell.getDisplay(), shell.getClientArea());
 		GC gc = new GC(image);
 		shell.print(gc);
 		gc.dispose();
-		ImageData data = image.getImageData();
-		ImageLoader loader = new ImageLoader();
-		loader.data = new ImageData[] { data };
-		loader.save(filename, format);
+		image.getImageData().save(file);
 		image.dispose();
 	}
 }

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug553240_ImageLoaderSavingStriped.java

@@ -56,13 +56,8 @@ static void initUI() throws Exception {
 		ImageLoader loader = new ImageLoader();
 		final ImageData[] loadedImageData = loader.load("./images/map.png");
 		final ImageData tileImageData = loadedImageData[0];
-		final ImageLoader imageLoader = new ImageLoader();
-		imageLoader.data = new ImageData[] { tileImageData };
-
-		final int imageType = tileImageData.type;
 		file.delete();
-		final String imageFilePath = file.getAbsolutePath();
-		imageLoader.save(imageFilePath, imageType);
+		tileImageData.save(file.toPath());
 		text.setText(file.getAbsolutePath());
 
 		Composite composite = new Composite(shell, SWT.NONE);