Refactor stream handling

This commit refactors the stream handling by using try-with-resource for opening streams in `ImageLoader` for Cocoa and GTK.

Author: Michael5601

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java

@@ -175,18 +175,10 @@ public ImageData[] load(InputStream stream) {
  */
 public ImageData[] load(String filename) {
 	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	InputStream stream = null;
-	try {
-		stream = new FileInputStream(filename);
+	try (InputStream stream = new FileInputStream(filename)) {
 		return load(stream);
 	} catch (IOException e) {
 		SWT.error(SWT.ERROR_IO, e);
-	} finally {
-		try {
-			if (stream != null) stream.close();
-		} catch (IOException e) {
-			// Ignore error
-		}
 	}
 	return null;
 }
@@ -258,17 +250,11 @@ public void save(OutputStream stream, int format) {
  */
 public void save(String filename, int format) {
 	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	OutputStream stream = null;
-	try {
-		stream = new FileOutputStream(filename);
+	try (OutputStream stream = new FileOutputStream(filename)) {
+		save(stream, format);
 	} catch (IOException e) {
 		SWT.error(SWT.ERROR_IO, e);
 	}
-	save(stream, format);
-	try {
-		stream.close();
-	} catch (IOException e) {
-	}
 }
 
 /**

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java

@@ -291,18 +291,10 @@ boolean isInterlacedPNG(byte [] imageAsByteArray) {
  */
 public ImageData[] load(String filename) {
 	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	InputStream stream = null;
-	try {
-		stream = new FileInputStream(filename);
+	try (InputStream stream = new FileInputStream(filename)) {
 		return load(stream);
 	} catch (IOException e) {
 		SWT.error(SWT.ERROR_IO, e);
-	} finally {
-		try {
-			if (stream != null) stream.close();
-		} catch (IOException e) {
-			// Ignore error
-		}
 	}
 	return null;
 }
@@ -611,17 +603,11 @@ public void save(OutputStream stream, int format) {
  */
 public void save(String filename, int format) {
 	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	OutputStream stream = null;
-	try {
-		stream = new FileOutputStream(filename);
+	try (OutputStream stream = new FileOutputStream(filename)) {
+		save(stream, format);
 	} catch (IOException e) {
 		SWT.error(SWT.ERROR_IO, e);
 	}
-	save(stream, format);
-	try {
-		stream.close();
-	} catch (IOException e) {
-	}
 }
 
 /**