diff options
author | Christian W. Damus | 2015-02-10 13:51:10 +0000 |
---|---|---|
committer | Christian W. Damus | 2015-02-10 13:52:32 +0000 |
commit | 47a579d759aa402fc63cde46060488164a4b5a44 (patch) | |
tree | 910adbc474fb6747078fba226f8f7bd8e8db4b7c /plugins/infra/emf | |
parent | 467e8e699117a7bd578222321107bc41e2950407 (diff) | |
download | org.eclipse.papyrus-47a579d759aa402fc63cde46060488164a4b5a44.tar.gz org.eclipse.papyrus-47a579d759aa402fc63cde46060488164a4b5a44.tar.xz org.eclipse.papyrus-47a579d759aa402fc63cde46060488164a4b5a44.zip |
Bug 459543: Various classes in Papyrus use features from Java SE 1.7
https://bugs.eclipse.org/bugs/show_bug.cgi?id=459543
Fix inconsistencies between bundle manifest BREE, JDT classpath/compiler settings,
and the source code's requirement of J2SE 1.7.
Diffstat (limited to 'plugins/infra/emf')
4 files changed, 8 insertions, 8 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.classpath index ad32c83a788..098194ca4b7 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.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/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs index 410244d65a6..9ca8e68231b 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ 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
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF index d259619ae52..62828ca9f46 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF @@ -42,5 +42,5 @@ Bundle-Name: EMF Tools Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ECollections2.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ECollections2.java index ec2da80a741..7d8b218fc98 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ECollections2.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ECollections2.java @@ -72,7 +72,7 @@ public class ECollections2 { } @SafeVarargs - public ImmutableEListBuilder<E> add(E element1, E element2, E element3, E element4, E... elements) { + public final ImmutableEListBuilder<E> add(E element1, E element2, E element3, E element4, E... elements) { helper.add(element1); helper.add(element2); helper.add(element3); @@ -98,7 +98,7 @@ public class ECollections2 { } } - private static class ImmutableEListBuilderHelper<E> extends BasicEList<E> { + private static final class ImmutableEListBuilderHelper<E> extends BasicEList<E> { private static final long serialVersionUID = 1L; void addAll(Iterable<? extends E> elements) { @@ -112,7 +112,7 @@ public class ECollections2 { } @SafeVarargs - void addAll(E... elements) { + final void addAll(E... elements) { for (int i = 0; i < elements.length; i++) { add(elements[i]); } |