From c72f60b4f63078bf89f9fcfd079e70114f83e12a Mon Sep 17 00:00:00 2001 From: "Torkild U. Resheim" Date: Mon, 20 Oct 2014 13:16:20 +0200 Subject: [PATCH] Fix #1: Correct execution environment https://github.com/DawnScience/dawn-eclipse/issues/issue/1 --- org.eclipse.dawnsci.analysis.api/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 +++---- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.dawnsci.hdf5.editor/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 7 +++---- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.dawnsci.slicing.api/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- 9 files changed, 21 insertions(+), 23 deletions(-) diff --git a/org.eclipse.dawnsci.analysis.api/.classpath b/org.eclipse.dawnsci.analysis.api/.classpath index ad32c83..098194c 100644 --- a/org.eclipse.dawnsci.analysis.api/.classpath +++ b/org.eclipse.dawnsci.analysis.api/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.dawnsci.analysis.api/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.dawnsci.analysis.api/.settings/org.eclipse.jdt.core.prefs index 5a59d69..aa9d698 100644 --- a/org.eclipse.dawnsci.analysis.api/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.dawnsci.analysis.api/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -102,7 +102,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=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 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX @@ -189,7 +189,6 @@ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false org.eclipse.jdt.core.formatter.indentation.size=4 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert diff --git a/org.eclipse.dawnsci.analysis.api/META-INF/MANIFEST.MF b/org.eclipse.dawnsci.analysis.api/META-INF/MANIFEST.MF index 13e0abe..4891d51 100644 --- a/org.eclipse.dawnsci.analysis.api/META-INF/MANIFEST.MF +++ b/org.eclipse.dawnsci.analysis.api/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: Analysis API Bundle Bundle-SymbolicName: org.eclipse.dawnsci.analysis.api;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Diamond Light Source -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.eclipse.dawnsci.analysis.api, org.eclipse.dawnsci.analysis.api.dataset, org.eclipse.dawnsci.analysis.api.diffraction, diff --git a/org.eclipse.dawnsci.hdf5.editor/.classpath b/org.eclipse.dawnsci.hdf5.editor/.classpath index 8a8f166..098194c 100644 --- a/org.eclipse.dawnsci.hdf5.editor/.classpath +++ b/org.eclipse.dawnsci.hdf5.editor/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.eclipse.dawnsci.hdf5.editor/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.dawnsci.hdf5.editor/.settings/org.eclipse.jdt.core.prefs index d127976..11f6e46 100644 --- a/org.eclipse.dawnsci.hdf5.editor/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.dawnsci.hdf5.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Tue Jan 18 13:59:31 CET 2011 eclipse.preferences.version=1 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.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/org.eclipse.dawnsci.hdf5.editor/META-INF/MANIFEST.MF b/org.eclipse.dawnsci.hdf5.editor/META-INF/MANIFEST.MF index 01181fa..9b1d0de 100644 --- a/org.eclipse.dawnsci.hdf5.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.dawnsci.hdf5.editor/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.dawnsci.hdf5, org.eclipse.dawnsci.analysis.api;bundle-version="1.0.0", ncsa.hdf;bundle-version="2.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.ui, org.eclipse.ui.dialogs, diff --git a/org.eclipse.dawnsci.slicing.api/.classpath b/org.eclipse.dawnsci.slicing.api/.classpath index ad32c83..098194c 100644 --- a/org.eclipse.dawnsci.slicing.api/.classpath +++ b/org.eclipse.dawnsci.slicing.api/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.dawnsci.slicing.api/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.dawnsci.slicing.api/.settings/org.eclipse.jdt.core.prefs index c537b63..f42de36 100644 --- a/org.eclipse.dawnsci.slicing.api/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.dawnsci.slicing.api/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 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.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/org.eclipse.dawnsci.slicing.api/META-INF/MANIFEST.MF b/org.eclipse.dawnsci.slicing.api/META-INF/MANIFEST.MF index 7000d41..0854659 100644 --- a/org.eclipse.dawnsci.slicing.api/META-INF/MANIFEST.MF +++ b/org.eclipse.dawnsci.slicing.api/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.dawnsci.doe;bundle-version="1.2.0", org.apache.commons.beanutils;bundle-version="[1.9.1,1.9.2)", ncsa.hdf;bundle-version="2.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.dawnsci.slicing.api, org.eclipse.dawnsci.slicing.api.data,