changelog: Update to Java 1.7.

Change-Id: I45c94ad9295f2ba8664a402e75188afc68f657b1
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/21097
Tested-by: Hudson CI

5 files changed, 28 insertions, 24 deletions

diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/.classpath b/changelog/org.eclipse.linuxtools.changelog.tests/.classpath
index ad32c83a78..098194ca4b 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/.classpath
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.tests/.settings/org.eclipse.jdt.core.prefs
index 69021e683e..5e4b16fe86 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,13 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 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
@@ -43,6 +44,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warni
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
@@ -55,7 +57,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
@@ -63,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
@@ -86,6 +89,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.tests/META-INF/MANIFEST.MF
index e9f7f895e6..0016305a3c 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/META-INF/MANIFEST.MF
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle:
  org.eclipse.jdt.ui,
  org.junit;bundle-version="4.8.1"
 Fragment-Host: org.eclipse.linuxtools.changelog.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.core.model,
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/core/tests/ChangeLogWriterTest.java b/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/core/tests/ChangeLogWriterTest.java
index ef208b87dd..d366b3c2f5 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/core/tests/ChangeLogWriterTest.java
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/core/tests/ChangeLogWriterTest.java
@@ -214,13 +214,13 @@ public class ChangeLogWriterTest {
 		
 		// Read in content written to file
 		StringBuffer actualContent = new StringBuffer();
-		BufferedReader br = new BufferedReader(new InputStreamReader(
-				new FileInputStream(changelogFile.getLocation().toFile())));
-		String line;
-		while ( (line = br.readLine()) != null ) {
-			actualContent.append(line + "\n");
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(
+				new FileInputStream(changelogFile.getLocation().toFile())))) {
+			String line;
+			while ((line = br.readLine()) != null) {
+				actualContent.append(line + "\n");
+			}
 		}
-		br.close();
 		// Assert proper content has been added
 		assertEquals(expectedContent, actualContent.toString());
 		EditorHelper.closeEditor(editorContent);
@@ -282,13 +282,13 @@ public class ChangeLogWriterTest {
 		
 		// Read in content written to file
 		StringBuffer actualContent = new StringBuffer();
-		BufferedReader br = new BufferedReader(new InputStreamReader(
-				new FileInputStream(emptyChangeLogFile.getLocation().toFile())));
-		String line;
-		while ( (line = br.readLine()) != null ) {
-			actualContent.append(line + "\n");
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(
+				new FileInputStream(emptyChangeLogFile.getLocation().toFile())))) {
+			String line;
+			while ((line = br.readLine()) != null) {
+				actualContent.append(line + "\n");
+			}
 		}
-		br.close();
 		// Assert proper content has been added
 		assertEquals(expectedChangeLogEntry, actualContent.toString());
 		EditorHelper.closeEditor(editorContent);
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/tests/fixtures/TestChangeLogTestProject.java b/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/tests/fixtures/TestChangeLogTestProject.java
index d487a594c8..12d61e6ffb 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/tests/fixtures/TestChangeLogTestProject.java
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/tests/fixtures/TestChangeLogTestProject.java
@@ -88,11 +88,11 @@ public class TestChangeLogTestProject {
 		assertTrue(createdFile instanceof IFile);
 
 		// Content should be "some content"
-		BufferedReader br = new BufferedReader(new InputStreamReader(
-				new FileInputStream(createdFile.getLocation().toFile())));
-		String actualContent = br.readLine();
-		br.close();
-		assertEquals(fileContent, actualContent);
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(
+				new FileInputStream(createdFile.getLocation().toFile())))) {
+			String actualContent = br.readLine();
+			assertEquals(fileContent, actualContent);
+		}
 		
 		// this should throw an IllegalStateException
 		boolean exceptionTrown = false;