From 25f99173c6fc97b9f64825c155c87569fc17a724 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Thu, 2 Jan 2014 16:35:55 -0500 Subject: [PATCH] tracing RCP: Build with Java 7 Change-Id: I6135dccd6d0dce2182c839b9241b68a3d1705881 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/20230 Tested-by: Hudson CI Reviewed-by: Marc-Andre Laperle IP-Clean: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../tracing.product | 18 ++++++++++-------- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +++++----- .../META-INF/MANIFEST.MF | 2 +- .../internal/tracing/rcp/ui/cli/CliParser.java | 2 +- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/.classpath b/org.eclipse.linuxtools.tracing.rcp.branding/.classpath index 3dd533f732..14129a12bf 100644 --- a/org.eclipse.linuxtools.tracing.rcp.branding/.classpath +++ b/org.eclipse.linuxtools.tracing.rcp.branding/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.jdt.core.prefs index c537b63063..f42de363af 100644 --- a/org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.tracing.rcp.branding/.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.linuxtools.tracing.rcp.branding/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tracing.rcp.branding/META-INF/MANIFEST.MF index 0d95198a05..06b273faa8 100644 --- a/org.eclipse.linuxtools.tracing.rcp.branding/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tracing.rcp.branding/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Version: 0.0.1.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.tracing.rcp.branding;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Eclipse-BundleShape: dir Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.intro diff --git a/org.eclipse.linuxtools.tracing.rcp.product/tracing.product b/org.eclipse.linuxtools.tracing.rcp.product/tracing.product index 060a717b2d..12bc663e2c 100644 --- a/org.eclipse.linuxtools.tracing.rcp.product/tracing.product +++ b/org.eclipse.linuxtools.tracing.rcp.product/tracing.product @@ -24,14 +24,15 @@ http://www.eclipse.org/legal/epl-v10.html --launcher.XXMaxPermSize 256m -data @noDefault - -Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.6 - -Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=1.6 -Dorg.eclipse.swt.internal.carbon.smallFonts - -Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.6 - -Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.6 + -Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.7 + -Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=1.7 -Dorg.eclipse.swt.internal.carbon.smallFonts + -Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.7 + -Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.7 + @@ -39,11 +40,12 @@ http://www.eclipse.org/legal/epl-v10.html + - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7 diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.classpath b/org.eclipse.linuxtools.tracing.rcp.ui/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.tracing.rcp.ui/.classpath +++ b/org.eclipse.linuxtools.tracing.rcp.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.jdt.core.prefs index 749fd0eb9a..d344e10c27 100644 --- a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled 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 @@ -24,7 +24,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=warning +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -75,7 +75,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=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning @@ -110,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore 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.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/org.eclipse.linuxtools.tracing.rcp.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tracing.rcp.ui/META-INF/MANIFEST.MF index 557cabea44..26cd4477e9 100644 --- a/org.eclipse.linuxtools.tracing.rcp.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tracing.rcp.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.tracing.rcp.ui;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.tracing.rcp.ui.TracingRcpPlugin Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.core.commands, org.eclipse.core.resources, org.eclipse.core.runtime, diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java b/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java index 9f0cb21619..27fe829334 100644 --- a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java +++ b/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java @@ -28,7 +28,7 @@ public class CliParser { private static final String OPEN_ARG = "--open"; //$NON-NLS-1$ - private final Map params = new HashMap(); + private final Map params = new HashMap<>(); /** Open key */ public static final String OPEN_FILE_LOCATION = ".,-=open=-,."; //$NON-NLS-1$ -- 2.34.1