diff options
author | Lars Vogel | 2021-04-09 11:06:21 +0000 |
---|---|---|
committer | Lars Vogel | 2021-04-09 17:52:00 +0000 |
commit | 04b0e24e720518a05625236c3dec10e94e57e8f9 (patch) | |
tree | 6a404552fc3f27a966ab50ee999c6623738f2488 | |
parent | f3688636b49e616f47d5cde4934cff675630ca0a (diff) | |
download | eclipse.platform.team-04b0e24e720518a05625236c3dec10e94e57e8f9.tar.gz eclipse.platform.team-04b0e24e720518a05625236c3dec10e94e57e8f9.tar.xz eclipse.platform.team-04b0e24e720518a05625236c3dec10e94e57e8f9.zip |
Use try-with-resources in FileContentManagerI20210415-0010I20210414-1800I20210414-0330I20210413-2350I20210413-1800I20210413-1400I20210412-2130I20210412-1800I20210411-1800I20210410-1800I20210410-0630I20210409-2140I20210409-1800
Manually adjusted the JDT cleanup as the try in a try block looked
unnecessary.
Change-Id: If193933cf8396993ab29c6ba87b268b8587e2300
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java index 6063fd593..3faff38e0 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java @@ -96,18 +96,15 @@ public class FileContentManager implements IFileContentManager { if (!f.exists()) return false; - try { - DataInputStream input = new DataInputStream(new FileInputStream(f)); - try { + try (DataInputStream input = new DataInputStream(new FileInputStream(f))) { map.putAll(readOldFormatExtensionMappings(input)); - } finally { - input.close(); - f.delete(); - } } catch (IOException ex) { TeamPlugin.log(IStatus.ERROR, ex.getMessage(), ex); return false; + } finally { + f.delete(); } + return true; } |