From 3de23137c2bbc8027d8197a2edc2e077116abf3a Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Thu, 2 Jan 2014 15:30:31 -0500 Subject: [PATCH] ctf: Move CTF plugins to Java 7 and fix warnings Change-Id: I08e566e382f6c03d0bda05948dc391424aa9abfe Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/20227 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 | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../tests/ctftestsuite/CtfTestSuiteTests.java | 2 +- .../ctf/core/tests/headless/ReadTrace.java | 2 +- .../ctf/core/tests/trace/IOstructgenTest.java | 109 +++++++++--------- .../tests/types/VariantDefinitionTest.java | 2 +- org.eclipse.linuxtools.ctf.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../linuxtools/ctf/core/event/CTFClock.java | 2 +- .../ctf/core/event/types/EnumDeclaration.java | 4 +- .../core/event/types/StructDeclaration.java | 4 +- .../core/event/types/StructDefinition.java | 2 +- .../core/event/types/VariantDeclaration.java | 2 +- .../core/event/types/VariantDefinition.java | 2 +- .../linuxtools/ctf/core/trace/CTFTrace.java | 18 +-- .../ctf/core/trace/CTFTraceReader.java | 6 +- .../linuxtools/ctf/core/trace/Metadata.java | 31 +---- .../linuxtools/ctf/core/trace/Stream.java | 4 +- .../ctf/core/trace/StreamInputReader.java | 2 +- .../ctf/core/event/EventDeclaration.java | 2 +- .../core/event/metadata/DeclarationScope.java | 10 +- .../ctf/core/event/metadata/IOStructGen.java | 20 ++-- .../core/trace/StreamInputPacketIndex.java | 2 +- .../trace/StreamInputPacketIndexEntry.java | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../ctf/parser/tests/CtfLexerTest.java | 2 +- org.eclipse.linuxtools.ctf.parser/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- 33 files changed, 129 insertions(+), 157 deletions(-) diff --git a/org.eclipse.linuxtools.ctf.core.tests/.classpath b/org.eclipse.linuxtools.ctf.core.tests/.classpath index 80263e0eb4..6d73e6dfb6 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/.classpath +++ b/org.eclipse.linuxtools.ctf.core.tests/.classpath @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.linuxtools.ctf.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.ctf.core.tests/.settings/org.eclipse.jdt.core.prefs index ccd0247adc..ea5fccc222 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.ctf.core.tests/.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=error org.eclipse.jdt.core.compiler.problem.emptyStatement=error 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=error org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=error @@ -75,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=error org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error @@ -110,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=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/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF index 041e90efac..5cffa7d0b5 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.ctf.core.tests;singleton:=true Bundle-Activator: org.eclipse.linuxtools.ctf.core.tests.CtfCoreTestPlugin Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0" diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java index f5b988400c..ec0b7d8da2 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java @@ -60,7 +60,7 @@ public class CtfTestSuiteTests { */ @Parameters(name = "{index}: {0}") public static Iterable getTracePaths() { - final List dirs = new LinkedList(); + final List dirs = new LinkedList<>(); addDirsFrom(dirs, basePath + "fuzzing/metadata/fail", false); addDirsFrom(dirs, basePath + "fuzzing/metadata/pass", true); diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java index e5fecf0313..46a1dce184 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java @@ -38,7 +38,7 @@ public class ReadTrace { // Work variables Long nbEvent = 0L; - Vector benchs = new Vector(); + Vector benchs = new Vector<>(); CTFTrace trace = null; long start, stop; for (int loops = 0; loops < LOOP_COUNT; loops++) { diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/IOstructgenTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/IOstructgenTest.java index c138ce680e..0ba1b2a244 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/IOstructgenTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/IOstructgenTest.java @@ -336,80 +336,77 @@ public class IOstructgenTest { } private static void createDummyTrace(String metadata) { + File dir = new File(tempTraceDir); + if (dir.exists()) { + deltree(dir); + } + dir.mkdirs(); - try { - File dir; - dir = new File(tempTraceDir); - if (dir.exists()) { - deltree(dir); - } - dir.mkdirs(); - File metadataFile; - metadataFile = new File(tempTraceDir + "/metadata"); - FileWriter fw = new FileWriter(metadataFile); + File metadataFile = new File(tempTraceDir + "/metadata"); + try (FileWriter fw = new FileWriter(metadataFile);) { fw.write(metadata); - fw.close(); + } catch (IOException e) { + e.printStackTrace(); + } - byte magicLE[] = { (byte) 0xC1, (byte) 0x1F, (byte) 0xFC, - (byte) 0xC1 }; - byte uuid[] = { (byte) 0xb0, 0x4d, 0x39, 0x1b, (byte) 0xe7, - 0x36, 0x44, (byte) 0xc1, (byte) 0x8d, (byte) 0x89, 0x4b, - (byte) 0xb4, 0x38, (byte) 0x85, 0x7f, (byte) 0x8d }; + byte magicLE[] = { (byte) 0xC1, (byte) 0x1F, (byte) 0xFC, + (byte) 0xC1 }; + byte uuid[] = { (byte) 0xb0, 0x4d, 0x39, 0x1b, (byte) 0xe7, + 0x36, 0x44, (byte) 0xc1, (byte) 0x8d, (byte) 0x89, 0x4b, + (byte) 0xb4, 0x38, (byte) 0x85, 0x7f, (byte) 0x8d }; - Event ev = new Event(2, 2); + Event ev = new Event(2, 2); - final int nbEvents = (DATA_SIZE / ev.getSize()) - 1; - final int contentSize = (nbEvents * ev.getSize() + - HEADER_SIZE) * 8; + final int nbEvents = (DATA_SIZE / ev.getSize()) - 1; + final int contentSize = (nbEvents * ev.getSize() + + HEADER_SIZE) * 8; - ByteBuffer data = ByteBuffer.allocate(PACKET_SIZE); - data.order(ByteOrder.LITTLE_ENDIAN); - data.clear(); + ByteBuffer data = ByteBuffer.allocate(PACKET_SIZE); + data.order(ByteOrder.LITTLE_ENDIAN); + data.clear(); - // packet header - // magic number 4 - data.put(magicLE); - // uuid 16 - data.put(uuid); - // stream ID 4 - data.putInt(0); + // packet header + // magic number 4 + data.put(magicLE); + // uuid 16 + data.put(uuid); + // stream ID 4 + data.putInt(0); - // packet context - // timestamp_begin 8 - data.putLong(0xa500); + // packet context + // timestamp_begin 8 + data.putLong(0xa500); - // timestamp_end 8 - data.putLong(nbEvents * 0x10000 + 0xa5a6); + // timestamp_end 8 + data.putLong(nbEvents * 0x10000 + 0xa5a6); - // content_size 8 - data.putLong(contentSize); + // content_size 8 + data.putLong(contentSize); - // packet_size 8 - data.putLong(PACKET_SIZE * 8); + // packet_size 8 + data.putLong(PACKET_SIZE * 8); - // events_discarded 8 - data.putLong(0); + // events_discarded 8 + data.putLong(0); - // cpu_id 4 - data.putInt(0); + // cpu_id 4 + data.putInt(0); - // fill me - for (int i = 0; i < nbEvents; i++) { - ev.setEventTimestamp(i * 0x10000 + 0xa5a5); - ev.setEventContent(i); - ev.writeEvent(data); - } + // fill me + for (int i = 0; i < nbEvents; i++) { + ev.setEventTimestamp(i * 0x10000 + 0xa5a5); + ev.setEventContent(i); + ev.writeEvent(data); + } + + // The byteBuffer needs to be flipped in file writing mode + data.flip(); - File dummyFile; - dummyFile = new File(tempTraceDir + "/dummyChan"); - FileOutputStream fos = new FileOutputStream(dummyFile); - // The byteBuffer needs to be flipped in file writing mode - data.flip(); + File dummyFile = new File(tempTraceDir + "/dummyChan"); + try (FileOutputStream fos = new FileOutputStream(dummyFile);) { fos.getChannel().write(data); - fos.close(); } catch (IOException e) { e.printStackTrace(); - } finally { } } diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java index 9deda2317d..7588720494 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java @@ -289,7 +289,7 @@ public class VariantDefinitionTest { */ @Test public void testSetDefinitions() { - HashMap definitions = new HashMap(); + HashMap definitions = new HashMap<>(); fixture.setDefinitions(definitions); } diff --git a/org.eclipse.linuxtools.ctf.core/.classpath b/org.eclipse.linuxtools.ctf.core/.classpath index 84af479d23..952038856c 100644 --- a/org.eclipse.linuxtools.ctf.core/.classpath +++ b/org.eclipse.linuxtools.ctf.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.jdt.core.prefs index a954c18200..99f1ba4881 100644 --- a/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.ctf.core/.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=error org.eclipse.jdt.core.compiler.problem.emptyStatement=error 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=error org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=error @@ -75,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=error org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error @@ -110,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=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/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF index 0382f319db..5dd80186a0 100644 --- a/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.ctf.core;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.ctf.core.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.core.runtime, org.eclipse.linuxtools.ctf.parser;bundle-version="3.0.0" Export-Package: org.eclipse.linuxtools.ctf.core, diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFClock.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFClock.java index f3c2be6e85..d788f993d3 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFClock.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFClock.java @@ -34,7 +34,7 @@ public class CTFClock { /** * Field properties. */ - private final Map properties = new HashMap(); + private final Map properties = new HashMap<>(); /** * Field name. */ diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/EnumDeclaration.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/EnumDeclaration.java index 0d2dda81fb..a4919c7c1c 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/EnumDeclaration.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/EnumDeclaration.java @@ -36,7 +36,7 @@ public class EnumDeclaration implements IDeclaration { private final EnumTable fTable = new EnumTable(); private final IntegerDeclaration fContainerType; - private final Set fLabels = new HashSet(); + private final Set fLabels = new HashSet<>(); // ------------------------------------------------------------------------ // Constructors @@ -129,7 +129,7 @@ public class EnumDeclaration implements IDeclaration { */ private class EnumTable { - private final List ranges = new LinkedList(); + private final List ranges = new LinkedList<>(); public EnumTable() { } diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java index 3485acc935..a19281f14e 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java @@ -34,8 +34,8 @@ public class StructDeclaration implements IDeclaration { // Attributes // ------------------------------------------------------------------------ - private final Map fields = new HashMap(); - private final List fieldsList = new LinkedList(); + private final Map fields = new HashMap<>(); + private final List fieldsList = new LinkedList<>(); private long maxAlign; // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDefinition.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDefinition.java index bb7f1bc010..60672fa92e 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDefinition.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDefinition.java @@ -38,7 +38,7 @@ public class StructDefinition extends Definition implements IDefinitionScope { // ------------------------------------------------------------------------ private final StructDeclaration declaration; - private final Map definitions = new LinkedHashMap(); + private final Map definitions = new LinkedHashMap<>(); // ------------------------------------------------------------------------ // Constructors diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDeclaration.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDeclaration.java index 0e526ae8c7..684d1e1190 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDeclaration.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDeclaration.java @@ -34,7 +34,7 @@ public class VariantDeclaration implements IDeclaration { private String tag = null; private static final long alignment = 1; - private final Map fields = new HashMap(); + private final Map fields = new HashMap<>(); // ------------------------------------------------------------------------ // Constructors diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDefinition.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDefinition.java index c3c313cd42..120df59147 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDefinition.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDefinition.java @@ -38,7 +38,7 @@ public class VariantDefinition extends Definition implements IDefinitionScope { private VariantDeclaration declaration; private EnumDefinition tagDefinition; - private Map definitions = new HashMap(); + private Map definitions = new HashMap<>(); private String currentField; // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java index a1a9e9c431..c644cb9f73 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java @@ -117,20 +117,20 @@ public class CTFTrace implements IDefinitionScope { /** * Collection of streams contained in the trace. */ - private final Map streams = new HashMap(); + private final Map streams = new HashMap<>(); /** * Collection of environment variables set by the tracer */ - private final Map environment = new HashMap(); + private final Map environment = new HashMap<>(); /** * Collection of all the clocks in a system. */ - private final Map clocks = new HashMap(); + private final Map clocks = new HashMap<>(); /** FileInputStreams to the streams */ - private final List fileInputStreams = new LinkedList(); + private final List fileInputStreams = new LinkedList<>(); /** Handlers for the metadata files */ private static final FileFilter METADATA_FILE_FILTER = new MetadataFileFilter(); @@ -139,10 +139,10 @@ public class CTFTrace implements IDefinitionScope { /** Callsite helpers */ private CTFCallsiteComparator ctfCallsiteComparator = new CTFCallsiteComparator(); - private Map> callsitesByName = new HashMap>(); + private Map> callsitesByName = new HashMap<>(); /** Callsite helpers */ - private TreeSet callsitesByIP = new TreeSet(); + private TreeSet callsitesByIP = new TreeSet<>(); // ------------------------------------------------------------------------ // Constructors @@ -270,7 +270,7 @@ public class CTFTrace implements IDefinitionScope { */ @Deprecated public Map getEventDefs(StreamInput id) { - return new HashMap(); + return new HashMap<>(); } /** @@ -799,7 +799,7 @@ public class CTFTrace implements IDefinitionScope { fileName, lineNumber); TreeSet csl = callsitesByName.get(eventName); if (csl == null) { - csl = new TreeSet(ctfCallsiteComparator); + csl = new TreeSet<>(ctfCallsiteComparator); callsitesByName.put(eventName, csl); } @@ -819,7 +819,7 @@ public class CTFTrace implements IDefinitionScope { public TreeSet getCallsiteCandidates(String eventName) { TreeSet retVal = callsitesByName.get(eventName); if (retVal == null) { - retVal = new TreeSet(ctfCallsiteComparator); + retVal = new TreeSet<>(ctfCallsiteComparator); } return retVal; } diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java index d8e24cd95f..0485380c58 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java @@ -43,7 +43,7 @@ public class CTFTraceReader { /** * Vector of all the trace file readers. */ - private final List streamInputReaders = new ArrayList(); + private final List streamInputReaders = new ArrayList<>(); /** * Priority queue to order the trace file readers by timestamp. @@ -213,7 +213,7 @@ public class CTFTraceReader { */ private void populateStreamInputReaderHeap() throws CTFReaderException { if (this.streamInputReaders.isEmpty()) { - this.prio = new PriorityQueue(); + this.prio = new PriorityQueue<>(); return; } @@ -221,7 +221,7 @@ public class CTFTraceReader { * Create the priority queue with a size twice as bigger as the number * of reader in order to avoid constant resizing. */ - this.prio = new PriorityQueue( + this.prio = new PriorityQueue<>( this.streamInputReaders.size() * 2, new StreamInputReaderTimestampComparator()); diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java index c38eb1e5e2..d69bb84310 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java @@ -125,8 +125,7 @@ public class Metadata { * If there was a problem parsing the metadata */ public void parse() throws CTFReaderException { - FileInputStream fis = null; - FileChannel metadataFileChannel = null; + /* * Reader. It will contain a StringReader if we are using packet-based @@ -135,9 +134,8 @@ public class Metadata { */ Reader metadataTextInput = null; - try { - fis = new FileInputStream(metadataFile); - metadataFileChannel = fis.getChannel(); + try (FileInputStream fis = new FileInputStream(metadataFile); + FileChannel metadataFileChannel = fis.getChannel();) { /* Check if metadata is packet-based */ if (isPacketBased(metadataFileChannel)) { @@ -179,29 +177,6 @@ public class Metadata { throw new CtfAntlrException(e); } catch (RewriteCardinalityException e){ throw new CtfAntlrException(e); - } finally { - /* Ghetto resource management. Java 7 will deliver us from this... */ - if (metadataTextInput != null) { - try { - metadataTextInput.close(); - } catch (IOException e) { - // Do nothing - } - } - if (metadataFileChannel != null) { - try { - metadataFileChannel.close(); - } catch (IOException e) { - // Do nothing - } - } - if (fis != null) { - try { - fis.close(); - } catch (IOException e) { - // Do nothing - } - } } } diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Stream.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Stream.java index 06604d3f99..c320f40170 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Stream.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Stream.java @@ -55,12 +55,12 @@ public class Stream { /** * Maps event ids to events */ - private Map events = new HashMap(); + private Map events = new HashMap<>(); /** * The inputs associated to this stream */ - private final Set inputs = new HashSet(); + private final Set inputs = new HashSet<>(); // ------------------------------------------------------------------------ // Constructors diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java index 468ade788a..a2107b6517 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java @@ -60,7 +60,7 @@ public class StreamInputReader { private CTFTraceReader parent; /** Map of all the event types */ - private final Map eventDefs = new HashMap(); + private final Map eventDefs = new HashMap<>(); // ------------------------------------------------------------------------ // Constructors diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/EventDeclaration.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/EventDeclaration.java index 27848e2ab6..b54588884b 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/EventDeclaration.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/EventDeclaration.java @@ -73,7 +73,7 @@ public class EventDeclaration implements IEventDeclaration { private long logLevel; /** Map of this event type's custom CTF attributes */ - private final Map customAttributes = new HashMap(); + private final Map customAttributes = new HashMap<>(); // ------------------------------------------------------------------------ // Constructors diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/DeclarationScope.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/DeclarationScope.java index b399f9c12d..5a793bf4a3 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/DeclarationScope.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/DeclarationScope.java @@ -43,11 +43,11 @@ class DeclarationScope { private DeclarationScope parentScope = null; - private final Map structs = new HashMap(); - private final Map enums = new HashMap(); - private final Map variants = new HashMap(); - private final Map types = new HashMap(); - private final Map identifiers = new HashMap(); + private final Map structs = new HashMap<>(); + private final Map enums = new HashMap<>(); + private final Map variants = new HashMap<>(); + private final Map types = new HashMap<>(); + private final Map identifiers = new HashMap<>(); // ------------------------------------------------------------------------ // Constructors diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/IOStructGen.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/IOStructGen.java index 0ae4aaf5e7..4812233b71 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/IOStructGen.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/IOStructGen.java @@ -126,12 +126,12 @@ public class IOStructGen { } CommonTree traceNode = null; - List streams = new ArrayList(); - List events = new ArrayList(); - List declarations = new ArrayList(); - List environments = new ArrayList(); - List clocks = new ArrayList(); - List callsites = new ArrayList(); + List streams = new ArrayList<>(); + List events = new ArrayList<>(); + List declarations = new ArrayList<>(); + List environments = new ArrayList<>(); + List clocks = new ArrayList<>(); + List callsites = new ArrayList<>(); /* Create a new declaration scope with no parent. */ pushScope(); @@ -965,7 +965,7 @@ public class IOStructGen { CommonTree typeSpecifierList = null; CommonTree typeDeclaratorList = null; CommonTree typeDeclarator = null; - List pointers = new LinkedList(); + List pointers = new LinkedList<>(); for (CommonTree child : children) { switch (child.getType()) { @@ -1069,8 +1069,8 @@ public class IOStructGen { IDeclaration declaration = null; List children = null; - List pointers = new LinkedList(); - List lengths = new LinkedList(); + List pointers = new LinkedList<>(); + List lengths = new LinkedList<>(); CommonTree identifier = null; /* Separate the tokens by type */ @@ -2040,7 +2040,7 @@ public class IOStructGen { throw new ParseException("Variant tag must be an enum: " + variantTag); //$NON-NLS-1$ } EnumDeclaration tagDecl = (EnumDeclaration) decl; - Set intersection = new HashSet(tagDecl.getLabels()); + Set intersection = new HashSet<>(tagDecl.getLabels()); intersection.retainAll(variantDeclaration.getFields().keySet()); if (intersection.isEmpty()) { throw new ParseException("Variant contains no values of the tag, impossible to use: " + variantName); //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndex.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndex.java index 50c73ed313..6fccb996f3 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndex.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndex.java @@ -34,7 +34,7 @@ public class StreamInputPacketIndex { * Entries of the index. They are sorted by increasing begin timestamp. * index builder. */ - private final Vector entries = new Vector(); + private final Vector entries = new Vector<>(); // ------------------------------------------------------------------------ // Getters/Setters/Predicates diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndexEntry.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndexEntry.java index a237357b3e..08156da33a 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndexEntry.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndexEntry.java @@ -70,7 +70,7 @@ public class StreamInputPacketIndexEntry { /** * Attributes of this index entry */ - private final Map attributes = new HashMap(); + private final Map attributes = new HashMap<>(); // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.ctf.parser.tests/.classpath b/org.eclipse.linuxtools.ctf.parser.tests/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.ctf.parser.tests/.classpath +++ b/org.eclipse.linuxtools.ctf.parser.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.ctf.parser.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.ctf.parser.tests/.settings/org.eclipse.jdt.core.prefs index 7acb262bd4..0f49f4a53e 100644 --- a/org.eclipse.linuxtools.ctf.parser.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.ctf.parser.tests/.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.ctf.parser.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.parser.tests/META-INF/MANIFEST.MF index a5650ff981..f6245003fd 100644 --- a/org.eclipse.linuxtools.ctf.parser.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.ctf.parser.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.ctf.parser.tests;singleton:=true Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.core.runtime, org.eclipse.linuxtools.ctf.parser;bundle-version="3.0.0" diff --git a/org.eclipse.linuxtools.ctf.parser.tests/src/org/eclipse/linuxtools/ctf/parser/tests/CtfLexerTest.java b/org.eclipse.linuxtools.ctf.parser.tests/src/org/eclipse/linuxtools/ctf/parser/tests/CtfLexerTest.java index d33e968351..fbfd0b4284 100644 --- a/org.eclipse.linuxtools.ctf.parser.tests/src/org/eclipse/linuxtools/ctf/parser/tests/CtfLexerTest.java +++ b/org.eclipse.linuxtools.ctf.parser.tests/src/org/eclipse/linuxtools/ctf/parser/tests/CtfLexerTest.java @@ -39,7 +39,7 @@ public class CtfLexerTest { // Attributes // ------------------------------------------------------------------------ - private final List tokens = new LinkedList(); + private final List tokens = new LinkedList<>(); // ------------------------------------------------------------------------ // Operations diff --git a/org.eclipse.linuxtools.ctf.parser/.classpath b/org.eclipse.linuxtools.ctf.parser/.classpath index 0cda9892cd..2a738be944 100644 --- a/org.eclipse.linuxtools.ctf.parser/.classpath +++ b/org.eclipse.linuxtools.ctf.parser/.classpath @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.linuxtools.ctf.parser/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.ctf.parser/.settings/org.eclipse.jdt.core.prefs index 87231a2d0c..12e5cdbb8b 100644 --- a/org.eclipse.linuxtools.ctf.parser/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.ctf.parser/.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=ignore 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=ignore org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore 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=ignore 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.ctf.parser/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF index d269ba974c..a37a60b314 100644 --- a/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.ctf.parser -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.eclipse.linuxtools.ctf.parser;x-friends:="org.eclipse.linuxtools.ctf.core,org.eclipse.linuxtools.ctf.parser.tests" Import-Package: org.antlr.runtime;version="3.2.0", org.antlr.runtime.tree;version="3.2.0" -- 2.34.1