Bug 489805 - Move the team git repository to Java 1.8

Fixes compiler warnings.

This reverts commit b8821710ffb03f8e7573be209e1ab14e27ba04b4.

Change-Id: I64b54428dc8500ab05427d505bb801e46511916b
Signed-off-by: Stefan Xenos <sxenos@gmail.com>

1 files changed, 15 insertions, 14 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/LineComparator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/LineComparator.java
index 7a557a7c1..f9e01603c 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/LineComparator.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/LineComparator.java
@@ -100,21 +100,22 @@ class LineComparator implements IRangeComparator {
 
 		TrailingLineFeedDetector trailingLineFeedDetector = new TrailingLineFeedDetector(
 				is);
-		BufferedReader br = new BufferedReader(new InputStreamReader(
-				trailingLineFeedDetector, encoding));
-		String line;
-		ArrayList ar = new ArrayList();
-		while ((line = br.readLine()) != null) {
-			ar.add(line);
-		}
-		// Add a trailing line if the last character in the file was a line
-		// feed.
-		// We do this because a BufferedReader doesn't distinguish the case
-		// where the last line has or doesn't have a trailing line separator
-		if (trailingLineFeedDetector.hadTrailingLineFeed()) {
-			ar.add(""); //$NON-NLS-1$
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(
+				trailingLineFeedDetector, encoding))) {
+			String line;
+			ArrayList ar = new ArrayList();
+			while ((line = br.readLine()) != null) {
+				ar.add(line);
+			}
+			// Add a trailing line if the last character in the file was a line
+			// feed.
+			// We do this because a BufferedReader doesn't distinguish the case
+			// where the last line has or doesn't have a trailing line separator
+			if (trailingLineFeedDetector.hadTrailingLineFeed()) {
+				ar.add(""); //$NON-NLS-1$
+			}
+			fLines = (String[]) ar.toArray(new String[ar.size()]);
 		}
-		fLines = (String[]) ar.toArray(new String[ar.size()]);
 	}
 
 	String getLine(int ix) {