Use try-with-resources in filesystem FileStore

Author: HannesWell

resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/provider/FileStore.java

@@ -14,11 +14,22 @@
  *******************************************************************************/
 package org.eclipse.core.filesystem.provider;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URI;
-import org.eclipse.core.filesystem.*;
-import org.eclipse.core.internal.filesystem.*;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.filesystem.IFileSystem;
+import org.eclipse.core.internal.filesystem.FileCache;
+import org.eclipse.core.internal.filesystem.Messages;
+import org.eclipse.core.internal.filesystem.Policy;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.PlatformObject;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.osgi.util.NLS;
 
 /**
@@ -57,7 +68,7 @@ public abstract class FileStore extends PlatformObject implements IFileStore {
 	private static final void transferStreams(InputStream source, OutputStream destination, long length, String path, IProgressMonitor monitor) throws CoreException {
 		byte[] buffer = new byte[8192];
 		SubMonitor subMonitor = SubMonitor.convert(monitor, length >= 0 ? 1 + (int) (length / buffer.length) : 1000);
-		try {
+		try (source; destination) {
 			while (true) {
 				int bytesRead = -1;
 				try {
@@ -78,9 +89,7 @@ private static final void transferStreams(InputStream source, OutputStream desti
 				}
 				subMonitor.worked(1);
 			}
-		} finally {
-			Policy.safeClose(source);
-			Policy.safeClose(destination);
+		} catch (IOException e) { // ignore
 		}
 	}
 
@@ -193,16 +202,13 @@ protected void copyFile(IFileInfo sourceInfo, IFileStore destination, int option
 		long length = sourceInfo.getLength();
 		String sourcePath = toString();
 		SubMonitor subMonitor = SubMonitor.convert(monitor, NLS.bind(Messages.copying, sourcePath), 100);
-		InputStream in = null;
-		OutputStream out = null;
-		try {
-			in = openInputStream(EFS.NONE, subMonitor.newChild(1));
-			out = destination.openOutputStream(EFS.NONE, subMonitor.newChild(1));
+		try (InputStream in = openInputStream(EFS.NONE, subMonitor.newChild(1)); //
+				OutputStream out = destination.openOutputStream(EFS.NONE, subMonitor.newChild(1));) {
 			transferStreams(in, out, length, sourcePath, subMonitor.newChild(98));
 			transferAttributes(sourceInfo, destination);
+		} catch (IOException e) {
+			// ignore
 		} catch (CoreException e) {
-			Policy.safeClose(in);
-			Policy.safeClose(out);
 			//if we failed to write, try to cleanup the half written file
 			if (!destination.fetchInfo(0, null).exists())
 				destination.delete(EFS.NONE, null);

resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/Policy.java

@@ -13,8 +13,6 @@
  *******************************************************************************/
 package org.eclipse.core.internal.filesystem;
 
-import java.io.*;
-import java.util.Date;
 import org.eclipse.core.internal.runtime.RuntimeLog;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Status;
@@ -25,20 +23,6 @@
 public class Policy {
 	public static final String PI_FILE_SYSTEM = "org.eclipse.core.filesystem"; //$NON-NLS-1$
 
-	/**
-	 * Print a debug message to the console.
-	 * Pre-pend the message with the current date and the name of the current thread.
-	 */
-	public static void debug(String message) {
-		StringBuilder buffer = new StringBuilder();
-		buffer.append(new Date(System.currentTimeMillis()));
-		buffer.append(" - ["); //$NON-NLS-1$
-		buffer.append(Thread.currentThread().getName());
-		buffer.append("] "); //$NON-NLS-1$
-		buffer.append(message);
-		System.out.println(buffer.toString());
-	}
-
 	public static void error(int code, String message) throws CoreException {
 		error(code, message, null);
 	}
@@ -54,27 +38,4 @@ public static void log(int severity, String message, Throwable t) {
 		RuntimeLog.log(new Status(severity, PI_FILE_SYSTEM, 1, message, t));
 	}
 
-	/**
-	 * Closes a stream and ignores any resulting exception.
-	 */
-	public static void safeClose(InputStream in) {
-		try {
-			if (in != null)
-				in.close();
-		} catch (IOException e) {
-			//ignore
-		}
-	}
-
-	/**
-	 * Closes a stream and ignores any resulting exception.
-	 */
-	public static void safeClose(OutputStream out) {
-		try {
-			if (out != null)
-				out.close();
-		} catch (IOException e) {
-			//ignore
-		}
-	}
 }