Replace try finally with try with resources

core/src/main/java/info/openrocket/core/appearance/defaults/ResourceDecalImage.java

@@ -50,17 +50,13 @@ public class ResourceDecalImage implements DecalImage {
 	@Override
 	public void exportImage(File file) throws IOException {
 		InputStream is = getBytes();
-		OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
 
 		if (is == null) {
 			return;
 		}
 
-		try {
+		try (is; OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) {
 			FileUtils.copy(is, os);
-		} finally {
-			is.close();
-			os.close();
 		}
 	}
 		

core/src/main/java/info/openrocket/core/document/DecalRegistry.java

@@ -166,12 +166,9 @@ public class DecalRegistry {
 				if (!exportedFile.exists()) {
 					throw new DecalNotFoundException(exportedFile.getAbsolutePath(), this);
 				}
-				InputStream rawIs = new FileInputStream(exportedFile);
+				try (InputStream rawIs = new FileInputStream(exportedFile)) {
-				try {
 					byte[] bytes = FileUtils.readBytes(rawIs);
 					return new ByteArrayInputStream(bytes);
-				} finally {
-					rawIs.close();
 				}
 
 			}

core/src/main/java/info/openrocket/core/document/attachments/ZipFileAttachment.java

@@ -24,9 +24,7 @@ public class ZipFileAttachment extends Attachment {
 	public InputStream getBytes() throws DecalNotFoundException, IOException {
 		String name = getName();
 
-		ZipInputStream zis = new ZipInputStream(zipFileLocation.openStream());
+		try (ZipInputStream zis = new ZipInputStream(zipFileLocation.openStream())) {
-
-		try {
 			ZipEntry entry = zis.getNextEntry();
 			while (entry != null) {
 				if (entry.getName().equals(name)) {
@@ -36,8 +34,6 @@ public class ZipFileAttachment extends Attachment {
 				entry = zis.getNextEntry();
 			}
 			throw new DecalNotFoundException(name, null);
-		} finally {
-			zis.close();
 		}
 
 	}

core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java

@@ -211,9 +211,9 @@ public class GeneralRocketSaver {
 
 		// Open a zip stream to write to.
 		ZipOutputStream zos = new ZipOutputStream(output);
-		zos.setLevel(9);
 		// big try block to close the zos.
-		try {
+		try (zos) {
+			zos.setLevel(9);
 
 			ZipEntry mainFile = new ZipEntry("rocket.ork");
 			zos.putNextEntry(mainFile);
@@ -241,8 +241,6 @@ public class GeneralRocketSaver {
 			}
 
 			zos.flush();
-		} finally {
-			zos.close();
 		}
 
 	}

core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java

@@ -128,9 +128,7 @@ public abstract class RockSimComponentFileLoader {
 		if (is == null) {
 			return;
 		}
-		InputStreamReader r = null;
+		try (InputStreamReader r = new InputStreamReader(is)) {
-		try {
-			r = new InputStreamReader(is);
 
 			// Create the CSV reader. Use comma separator.
 			CSVParser parser = new CSVParserBuilder()
@@ -160,13 +158,6 @@ public abstract class RockSimComponentFileLoader {
 			return;
 		} catch (IOException | CsvValidationException e) {
 			throw new BugException("Could not read component file", e);
-		} finally {
-			if (r != null) {
-				try {
-					r.close();
-				} catch (IOException ignored) {
-				}
-			}
 		}
 
 	}

swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java

@@ -65,13 +65,10 @@ public class SlideSetLoader {
 	 */
 	public SlideSet load(String filename) throws IOException {
 		String file = baseDir + filename;
-		InputStream in = getLocalizedFile(file);
+
-		
+		try (InputStream in = getLocalizedFile(file)) {
-		try {
 			InputStreamReader reader = new InputStreamReader(in, "UTF-8");
 			return load(reader);
-		} finally {
-			in.close();
 		}
 	}
 	

swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java

@@ -120,42 +120,38 @@ public class SlideSetManager {
 	
 	private List<String> loadTourList() throws IOException {
 		InputStream in = ClassLoader.getSystemResourceAsStream(baseDir + TOURS_FILE);
-		if (in == null) {
+
-			throw new FileNotFoundException("File '" + baseDir + TOURS_FILE + "' not found.");
+		try (in) {
-		}
+			if (in == null) {
-		
+				throw new FileNotFoundException("File '" + baseDir + TOURS_FILE + "' not found.");
-		try {
+			}
-			
+
 			List<String> tours = new ArrayList<>();
 			TextLineReader reader = new TextLineReader(in);
 			while (reader.hasNext()) {
 				tours.add(reader.next());
 			}
 			return tours;
-			
+
-		} finally {
-			in.close();
 		}
 	}
 	
 	
 	private StyleSheet loadStyleSheet() throws IOException {
 		InputStream in = ClassLoader.getSystemResourceAsStream(baseDir + STYLESHEET_FILE);
-		if (in == null) {
+
-			throw new FileNotFoundException("File '" + baseDir + STYLESHEET_FILE + "' not found.");
+		try (in) {
-		}
+			if (in == null) {
-		
+				throw new FileNotFoundException("File '" + baseDir + STYLESHEET_FILE + "' not found.");
-		try {
+			}
-			
+
 			StyleSheet ss = new StyleSheet();
 			ss.addRule(String.format("p { color: rgb(%d, %d, %d, %d)",
 					textColor.getRed(), textColor.getGreen(), textColor.getBlue(), textColor.getAlpha()));
 			InputStreamReader reader = new InputStreamReader(in, "UTF-8");
 			ss.loadRules(reader, null);
 			return ss;
-			
+
-		} finally {
-			in.close();
 		}
 		
 	}

swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java

@@ -153,10 +153,8 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
 		}
 		
 		// Iterate over JAR entries searching for designs
-		JarFile jarFile = null;
+		try (JarFile jarFile = new JarFile(file)) {
-		try {
+
-			jarFile = new JarFile(file);
-			
 			// Loop through JAR entries searching for files to load
 			Enumeration<JarEntry> entries = jarFile.entries();
 			while (entries.hasMoreElements()) {
@@ -169,18 +167,11 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
 							name.substring(dirLength, name.length() - 4)));
 				}
 			}
-			
+
 		} catch (IOException e) {
 			logger.error("IOException when processing jarFile", e);
 			// Could be normal condition if not package in JAR
 			return null;
-		} finally {
-			if (jarFile != null) {
-				try {
-					jarFile.close();
-				} catch (IOException e) {
-				}
-			}
 		}
 		
 		return list.toArray(new ExampleDesignFile[0]);