Use try-with-resource

EcljpseB0T · jukzi · commit 88d5d57dea3f · 2023-11-30T15:14:16.000+01:00
and enable explicitlyClosedAutoCloseable=warning
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
@@ -606,9 +606,10 @@ private int[] getWeights(IMemento memento) {
 	public void partDeactivated(IWorkbenchPart part) {
 		String id = part.getSite().getId();
 		if (id.equals(getSite().getId())) {
-			try (StringWriter writer = new StringWriter()) {
-				XMLMemento memento = XMLMemento.createWriteRoot("VariablesViewMemento"); //$NON-NLS-1$
-				saveViewerState(memento);
+			StringWriter writer = new StringWriter();
+			XMLMemento memento = XMLMemento.createWriteRoot("VariablesViewMemento"); //$NON-NLS-1$
+			saveViewerState(memento);
+			try {
 				memento.save(writer);
 
 				IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
diff --git a/debug/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs
@@ -40,7 +40,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/platform/org.eclipse.platform/.settings/org.eclipse.jdt.core.prefs b/platform/org.eclipse.platform/.settings/org.eclipse.jdt.core.prefs
@@ -29,7 +29,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/resources/bundles/org.eclipse.core.filesystem/.settings/org.eclipse.jdt.core.prefs b/resources/bundles/org.eclipse.core.filesystem/.settings/org.eclipse.jdt.core.prefs
@@ -37,7 +37,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/resources/bundles/org.eclipse.core.resources.spysupport/.settings/org.eclipse.jdt.core.prefs b/resources/bundles/org.eclipse.core.resources.spysupport/.settings/org.eclipse.jdt.core.prefs
@@ -26,7 +26,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/runtime/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.core.prefs b/runtime/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.core.prefs
@@ -39,7 +39,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/runtime/bundles/org.eclipse.core.expressions/.settings/org.eclipse.jdt.core.prefs b/runtime/bundles/org.eclipse.core.expressions/.settings/org.eclipse.jdt.core.prefs
@@ -49,7 +49,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/runtime/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.core.prefs b/runtime/bundles/org.eclipse.core.jobs/.settings/org.eclipse.jdt.core.prefs
@@ -32,7 +32,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/runtime/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/runtime/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -40,7 +40,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/ProductPreferencesService.java b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/ProductPreferencesService.java
@@ -111,22 +111,13 @@ private Properties loadProperties(URL url) {
 		Properties result = new Properties();
 		if (url == null)
 			return result;
-		InputStream input = null;
-		try {
-			input = url.openStream();
+		try (InputStream input = url.openStream()) {
 			result.load(input);
 		} catch (IOException e) {
 			if (InternalPlatform.DEBUG_PLUGIN_PREFERENCES) {
 				InternalPlatform.message("Problem opening stream to preference customization file: " + url); //$NON-NLS-1$
 				e.printStackTrace();
 			}
-		} finally {
-			if (input != null)
-				try {
-					input.close();
-				} catch (IOException e) {
-					// ignore
-				}
 		}
 		return result;
 	}
diff --git a/runtime/bundles/org.eclipse.e4.core.contexts/.settings/org.eclipse.jdt.core.prefs b/runtime/bundles/org.eclipse.e4.core.contexts/.settings/org.eclipse.jdt.core.prefs
@@ -37,7 +37,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/.settings/org.eclipse.jdt.core.prefs b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/.settings/org.eclipse.jdt.core.prefs
@@ -34,7 +34,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions/.settings/org.eclipse.jdt.core.prefs b/runtime/bundles/org.eclipse.e4.core.di.extensions/.settings/org.eclipse.jdt.core.prefs
@@ -34,7 +34,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/runtime/bundles/org.eclipse.e4.core.di/.settings/org.eclipse.jdt.core.prefs b/runtime/bundles/org.eclipse.e4.core.di/.settings/org.eclipse.jdt.core.prefs
@@ -37,7 +37,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/runtime/tests/org.eclipse.core.tests.harness/.settings/org.eclipse.jdt.core.prefs b/runtime/tests/org.eclipse.core.tests.harness/.settings/org.eclipse.jdt.core.prefs
@@ -40,7 +40,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
diff --git a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemComparator.java b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemComparator.java
@@ -123,17 +123,15 @@ public Object loadSnapshot(File rootLocation) throws IOException {
 
 	public void saveSnapshot(Object toSave, File rootLocation) throws IOException {
 		File summaryFile = new File(rootLocation, SNAPSHOT_FILE_NAME);
-		PrintWriter out = new PrintWriter(new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(summaryFile))));
-		Map<?, ?> snapshot = (Map<?, ?>) toSave;
-		try {
+		try (PrintWriter out = new PrintWriter(
+				new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(summaryFile))))) {
+			Map<?, ?> snapshot = (Map<?, ?>) toSave;
 			for (Object element : snapshot.values()) {
 				FileSummary fileSummary = (FileSummary) element;
 				out.println(fileSummary.getPath());
 				out.println(fileSummary.getTimestamp());
 				out.println(fileSummary.getSize());
 			}
-		} finally {
-			out.close();
 		}
 	}
 
diff --git a/runtime/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/XmlProcessorFactoryTest.java b/runtime/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/XmlProcessorFactoryTest.java
@@ -383,11 +383,10 @@ public int getLocalPort() {
 
 		/** Example Server that will log and quit when contacted **/
 		public static void main(String[] args) throws Exception {
-			@SuppressWarnings("resource")
-			Server server = new Server();
-			System.out.println("Server startet on port: " + server.getLocalPort());
-			server.httpServerThread.join();
-			server.close();
+			try (Server server = new Server()) {
+				System.out.println("Server startet on port: " + server.getLocalPort());
+				server.httpServerThread.join();
+			}
 		}
 	}
 
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/.settings/org.eclipse.jdt.core.prefs b/runtime/tests/org.eclipse.e4.core.javax.tests/.settings/org.eclipse.jdt.core.prefs
@@ -31,7 +31,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/runtime/tests/org.eclipse.e4.core.tests/.settings/org.eclipse.jdt.core.prefs b/runtime/tests/org.eclipse.e4.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -31,7 +31,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/team/bundles/org.eclipse.compare.core/.settings/org.eclipse.jdt.core.prefs b/team/bundles/org.eclipse.compare.core/.settings/org.eclipse.jdt.core.prefs
@@ -39,7 +39,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/team/bundles/org.eclipse.core.net/.settings/org.eclipse.jdt.core.prefs b/team/bundles/org.eclipse.core.net/.settings/org.eclipse.jdt.core.prefs
@@ -38,7 +38,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/team/bundles/org.eclipse.jsch.core/.settings/org.eclipse.jdt.core.prefs b/team/bundles/org.eclipse.jsch.core/.settings/org.eclipse.jdt.core.prefs
@@ -30,7 +30,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/team/bundles/org.eclipse.team.core/.settings/org.eclipse.jdt.core.prefs b/team/bundles/org.eclipse.team.core/.settings/org.eclipse.jdt.core.prefs
@@ -38,7 +38,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java
@@ -98,18 +98,11 @@ public <T> T getAdapter(Class<T> adapter) {
 		}
 		@Override
 		public String getCharset() throws CoreException {
-			InputStream contents = getContents();
-			try {
+			try (InputStream contents = getContents()) {
 				String charSet = TeamPlugin.getCharset(getName(), contents);
 				return charSet;
 			} catch (IOException e) {
 				throw new TeamException(new Status(IStatus.ERROR, TeamPlugin.ID, IResourceStatus.FAILED_DESCRIBING_CONTENTS, NLS.bind(Messages.CachedResourceVariant_1, new String[] { getFullPath().toString() }), e));
-			} finally {
-				try {
-					contents.close();
-				} catch (IOException e1) {
-					// Ignore
-				}
 			}
 		}
 	}
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java
@@ -120,33 +120,24 @@ private void internalSetContents(InputStream stream, IProgressMonitor monitor) t
 		try {
 
 			// Open the cache file for writing
-			OutputStream out;
-			try {
-				if (state == UNINITIALIZED) {
-					out = new BufferedOutputStream(new FileOutputStream(ioFile));
-				} else {
+			try (OutputStream out = (state == UNINITIALIZED) ? new BufferedOutputStream(new FileOutputStream(ioFile))
 					// If the entry is READY, the contents must have been read in another thread.
 					// We still need to red the contents but they can be ignored since presumably they are the same
-					out = new ByteArrayOutputStream();
+					: new ByteArrayOutputStream()) {
+
+				// Transfer the contents
+				byte[] buffer = new byte[1024];
+				int read;
+				while ((read = stream.read(buffer)) >= 0) {
+					Policy.checkCanceled(monitor);
+					out.write(buffer, 0, read);
 				}
 			} catch (FileNotFoundException e) {
-				throw new TeamException(NLS.bind(Messages.RemoteContentsCache_fileError, new String[] { ioFile.getAbsolutePath() }), e);
-			}
-
-			// Transfer the contents
-			try {
-				try {
-					byte[] buffer = new byte[1024];
-					int read;
-					while ((read = stream.read(buffer)) >= 0) {
-						Policy.checkCanceled(monitor);
-						out.write(buffer, 0, read);
-					}
-				} finally {
-					out.close();
-				}
+				throw new TeamException(
+						NLS.bind(Messages.RemoteContentsCache_fileError, new String[] { ioFile.getAbsolutePath() }), e);
 			} catch (IOException e) {
-				// Make sure we don't leave the cache file around as it may not have the right contents
+				// Make sure we don't leave the cache file around as it may not have the right
+				// contents
 				cache.purgeFromCache(this);
 				throw e;
 			}
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractContentComparator.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractContentComparator.java
@@ -52,30 +52,16 @@ public boolean compare(IResource e1, IFileRevision e2, IProgressMonitor monitor)
 	}
 
 	private boolean compareObjects(Object e1, Object e2, IProgressMonitor monitor) {
-		InputStream is1 = null;
-		InputStream is2 = null;
-		try {
-			monitor.beginTask(null, 100);
-			is1 = getContents(e1, Policy.subMonitorFor(monitor, 30));
-			is2 = getContents(e2, Policy.subMonitorFor(monitor, 30));
+		monitor.beginTask(null, 100);
+		try (InputStream is1 = getContents(e1, Policy.subMonitorFor(monitor, 30));
+				InputStream is2 = getContents(e2, Policy.subMonitorFor(monitor, 30))) {
 			return contentsEqual(Policy.subMonitorFor(monitor, 40), is1, is2, shouldIgnoreWhitespace());
+		} catch (IOException e) {
+			return false;
 		} catch (TeamException e) {
 			TeamPlugin.log(e);
 			return false;
 		} finally {
-			try {
-				try {
-					if (is1 != null) {
-						is1.close();
-					}
-				} finally {
-					if (is2 != null) {
-						is2.close();
-					}
-				}
-			} catch (IOException e) {
-				// Ignore
-			}
 			monitor.done();
 		}
 	}
diff --git a/team/bundles/org.eclipse.team.ui/.settings/org.eclipse.jdt.core.prefs b/team/bundles/org.eclipse.team.ui/.settings/org.eclipse.jdt.core.prefs
@@ -38,7 +38,7 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
diff --git a/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java b/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java
@@ -1118,22 +1118,15 @@ private static String getEditorId(FileRevisionEditorInput editorInput) {
 	}
 
 	private static IContentType getContentType(FileRevisionEditorInput editorInput) {
-		IContentType type = null;
-		try {
-			InputStream contents = editorInput.getStorage().getContents();
-			try {
-				type = getContentType(editorInput.getFileRevision().getName(), contents);
-			} finally {
-				try {
-					contents.close();
-				} catch (IOException e) {
-					// ignore
-				}
-			}
+		try (InputStream contents = editorInput.getStorage().getContents()) {
+			return getContentType(editorInput.getFileRevision().getName(), contents);
+		} catch (IOException e) {
+			// ignore
 		} catch (CoreException e) {
-			TeamUIPlugin.log(IStatus.ERROR, NLS.bind("An error occurred reading the contents of file {0}", new String[] { editorInput.getName() }), e); //$NON-NLS-1$
+			TeamUIPlugin.log(IStatus.ERROR, NLS.bind("An error occurred reading the contents of file {0}", //$NON-NLS-1$
+					new String[] { editorInput.getName() }), e);
 		}
-		return type;
+		return null;
 	}
 
 	private static IContentType getContentType(String fileName, InputStream contents) {
diff --git a/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchOperation.java b/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchOperation.java
diff --git a/team/bundles/org.eclipse.ui.net/.settings/org.eclipse.jdt.core.prefs b/team/bundles/org.eclipse.ui.net/.settings/org.eclipse.jdt.core.prefs
diff --git a/team/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.jdt.core.prefs b/team/examples/org.eclipse.team.examples.filesystem/.settings/org.eclipse.jdt.core.prefs
diff --git a/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectDefinitionFile.java b/team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectDefinitionFile.java
diff --git a/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs b/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/ua/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/ua/org.eclipse.ui.cheatsheets/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.ui.cheatsheets/.settings/org.eclipse.jdt.core.prefs
diff --git a/ua/org.eclipse.ui.intro.quicklinks/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.ui.intro.quicklinks/.settings/org.eclipse.jdt.core.prefs
diff --git a/ua/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.core.prefs
diff --git a/update/org.eclipse.update.configurator/.settings/org.eclipse.jdt.core.prefs b/update/org.eclipse.update.configurator/.settings/org.eclipse.jdt.core.prefs
