From e0838ca1bc07f909be7dc3b735962d1d1bfea83e Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Thu, 2 Jan 2014 16:27:51 -0500 Subject: [PATCH] lttng: Move to Java 7 and fix warnings Change-Id: Ic9a2ea7c526baee118adc5cd5c1c6a9566139fcb Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/20229 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 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../control/model/impl/BaseEventInfoTest.java | 2 +- .../control/model/impl/ChannelInfoTest.java | 2 +- .../control/model/impl/DomainInfoTest.java | 2 +- .../control/model/impl/SessionInfoTest.java | 2 +- .../model/impl/UstProviderInfoTest.java | 2 +- org.eclipse.linuxtools.lttng2.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../control/model/impl/BaseEventInfo.java | 2 +- .../core/control/model/impl/ChannelInfo.java | 2 +- .../core/control/model/impl/DomainInfo.java | 2 +- .../core/control/model/impl/SessionInfo.java | 2 +- .../control/model/impl/UstProviderInfo.java | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../tests/headless/GenerateTestValues.java | 112 +++++------ .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../LttngKernelStateProvider.java | 2 +- .../core/event/matching/TcpEventMatching.java | 2 +- .../event/matching/TcpLttngEventMatching.java | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../ControlFlowPresentationProvider.java | 2 +- .../ui/views/controlflow/ControlFlowView.java | 8 +- .../ResourcesPresentationProvider.java | 2 +- .../ui/views/resources/ResourcesView.java | 8 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../component/TraceControlComponentTest.java | 2 +- .../TraceControlKernelSessionTests.java | 4 +- .../TraceControlSnapshotSessionTests.java | 2 +- .../TraceControlUstSessionTests.java | 2 +- .../service/LTTngControlServiceTest.java | 18 +- .../stubs/dialogs/AddContextDialogStub.java | 6 +- .../stubs/dialogs/EnableEventsDialogStub.java | 2 +- .../stubs/shells/LTTngToolsFileShell.java | 185 +++++++++--------- org.eclipse.linuxtools.lttng2.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../control/dialogs/AddContextDialog.java | 6 +- .../dialogs/EnableKernelEventComposite.java | 4 +- .../dialogs/EnableUstEventsComposite.java | 6 +- .../views/control/dialogs/ImportDialog.java | 8 +- .../control/handlers/AssignEventHandler.java | 6 +- .../handlers/BaseEnableChannelHandler.java | 2 +- .../handlers/ChangeChannelStateHandler.java | 12 +- .../handlers/ChangeEventStateHandler.java | 6 +- .../handlers/ChangeSessionStateHandler.java | 6 +- .../handlers/DestroySessionHandler.java | 2 +- .../handlers/NewConnectionHandler.java | 4 +- .../control/handlers/SnaphshotHandler.java | 6 +- .../model/impl/TraceChannelComponent.java | 2 +- .../model/impl/TraceControlComponent.java | 4 +- .../property/BaseEventPropertySource.java | 2 +- .../property/TraceEventPropertySource.java | 2 +- .../TraceProbeEventPropertySource.java | 2 +- .../property/TraceSessionPropertySource.java | 2 +- .../ui/views/control/remote/CommandShell.java | 4 +- .../control/service/LTTngControlService.java | 18 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../callstack/LttngUstCallStackProvider.java | 4 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../META-INF/MANIFEST.MF | 2 +- 86 files changed, 334 insertions(+), 335 deletions(-) diff --git a/org.eclipse.linuxtools.lttng.alltests/.classpath b/org.eclipse.linuxtools.lttng.alltests/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng.alltests/.classpath +++ b/org.eclipse.linuxtools.lttng.alltests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng.alltests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng.alltests/.settings/org.eclipse.jdt.core.prefs index 7acb262bd4..0f49f4a53e 100644 --- a/org.eclipse.linuxtools.lttng.alltests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng.alltests/.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.lttng.alltests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF index 7072cbc0a3..7e47ba985b 100644 --- a/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng.alltests;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.linuxtools.ctf.core.tests;bundle-version="2.1.0", org.eclipse.linuxtools.gdbtrace.core.tests;bundle-version="1.1.0", diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.classpath b/org.eclipse.linuxtools.lttng2.core.tests/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/.classpath +++ b/org.eclipse.linuxtools.lttng2.core.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.jdt.core.prefs index ccd0247adc..ea5fccc222 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.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.lttng2.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF index d81c7b2860..ebfb28e627 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core.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.lttng2.core;bundle-version="3.0.0" diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java index 0f8d72ac56..b49afa5642 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java @@ -459,7 +459,7 @@ public class BaseEventInfoTest { IFieldInfo field2 = new FieldInfo("stringfield"); field2.setFieldType("string"); - List fields = new LinkedList(); + List fields = new LinkedList<>(); fields.add(field1); fields.add(field2); info.setFields(fields); diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java index 8c85058eec..b27e5dca4a 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java @@ -254,7 +254,7 @@ public class ChannelInfoTest { fixture.setNumberOfSubBuffers(1); fixture.setOutputType(""); fixture.setSubBufferSize(1L); - List events = new LinkedList(); + List events = new LinkedList<>(); for (int i = 0; i < 2; i++) { IEventInfo info = new EventInfo("event" + i); diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java index c9afadf297..772f7982eb 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java @@ -117,7 +117,7 @@ public class DomainInfoTest { assertEquals(fChannelInfo1, fDomainInfo1.getChannels()[0]); IDomainInfo domain = new DomainInfo("domain"); - List list = new LinkedList(); + List list = new LinkedList<>(); list.add(fChannelInfo1); list.add(fChannelInfo2); domain.setChannels(list); diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java index f033772a0d..880af45e78 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java @@ -129,7 +129,7 @@ public class SessionInfoTest { assertEquals(fDomainInfo1, fSessionInfo1.getDomains()[0]); ISessionInfo session = new SessionInfo("session"); - List list = new LinkedList(); + List list = new LinkedList<>(); list.add(fDomainInfo1); list.add(fDomainInfo2); session.setDomains(list); diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java index 6f65e193bb..b9938957ef 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java @@ -141,7 +141,7 @@ public class UstProviderInfoTest { public void testSetEvents_1() { UstProviderInfo fixture = new UstProviderInfo("test"); fixture.setPid(2468); - List events = new LinkedList(); + List events = new LinkedList<>(); events.add(fEventInfo1); events.add(fEventInfo2); fixture.setEvents(events); diff --git a/org.eclipse.linuxtools.lttng2.core/.classpath b/org.eclipse.linuxtools.lttng2.core/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.core/.classpath +++ b/org.eclipse.linuxtools.lttng2.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.jdt.core.prefs index 3fafa2dd97..7a4f5734b0 100644 --- a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.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.lttng2.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF index fdf6051479..3a353a5164 100644 --- a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.core.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.core.runtime Export-Package: org.eclipse.linuxtools.internal.lttng2.core;x-friends:="org.eclipse.linuxtools.lttng2.core.tests", org.eclipse.linuxtools.internal.lttng2.core.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui,org.eclipse.linuxtools.lttng2.ui.tests,org.eclipse.linuxtools.lttng2.core.tests", diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java index f6e9378bc7..9d4e58183b 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java @@ -44,7 +44,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /** * The Event fields */ - private final List fFields = new ArrayList(); + private final List fFields = new ArrayList<>(); /** * The filter expression. */ diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java index b0d0299fe9..bb6fde98fe 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java @@ -64,7 +64,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /** * The events information of the channel. */ - private final List fEvents = new ArrayList(); + private final List fEvents = new ArrayList<>(); /** * The maximum size of trace files */ diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java index fda529fc2b..f204a0e959 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java @@ -34,7 +34,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /** * The channels information of the domain. */ - private final List fChannels = new ArrayList(); + private final List fChannels = new ArrayList<>(); private boolean fIsKernel = false; private BufferType fBufferType = BufferType.BUFFER_TYPE_UNKNOWN; diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java index ac660757e3..32bec07553 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java @@ -45,7 +45,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /** * The domains information of this session. */ - private final List fDomains = new ArrayList(); + private final List fDomains = new ArrayList<>(); /** * Flag to indicate whether trace is streamed over network or not. */ diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java index 400b6af1c4..0f6ff8b41e 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java @@ -40,7 +40,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /** * List of event information. */ - private final List fEvents = new ArrayList(); + private final List fEvents = new ArrayList<>(); // ------------------------------------------------------------------------ // Constructors diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/.classpath b/org.eclipse.linuxtools.lttng2.kernel.core.tests/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/.classpath +++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.kernel.core.tests/.settings/org.eclipse.jdt.core.prefs index 0af67dab87..7c849a029c 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.kernel.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=warning 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.lttng2.kernel.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF index 83dd1378d5..28fae597c6 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core.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.tmf.core;bundle-version="3.0.0", diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/headless/GenerateTestValues.java b/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/headless/GenerateTestValues.java index 90546d8dfc..5d93abb34e 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/headless/GenerateTestValues.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/headless/GenerateTestValues.java @@ -58,66 +58,66 @@ public class GenerateTestValues { File stateFile = File.createTempFile("test-values", ".ht"); stateFile.deleteOnExit(); File logFile = File.createTempFile("TestValues", ".java"); - PrintWriter writer = new PrintWriter(new FileWriter(logFile), true); - - /* Build and query the state system */ - ITmfStateProvider input = new LttngKernelStateProvider(testTrace.getTrace()); - ITmfStateSystem ssq = TmfStateSystemFactory.newFullHistory(stateFile, input, true); - List fullState = ssq.queryFullState(targetTimestamp); - - /* Start printing the java file's contents */ - writer.println("interface TestValues {"); - writer.println(); - writer.println(INDENT + "static final int size = " + fullState.size() +";"); - writer.println(); - - /* Print the array contents */ - writer.println(INDENT + "static final long[] startTimes = {"); - for (ITmfStateInterval interval : fullState) { - writer.println(INDENT + INDENT + String.valueOf(interval.getStartTime()) + "L,"); - } - writer.println(INDENT + "};"); - writer.println(); + try (PrintWriter writer = new PrintWriter(new FileWriter(logFile), true);) { + + /* Build and query the state system */ + ITmfStateProvider input = new LttngKernelStateProvider(testTrace.getTrace()); + ITmfStateSystem ssq = TmfStateSystemFactory.newFullHistory(stateFile, input, true); + List fullState = ssq.queryFullState(targetTimestamp); + + /* Start printing the java file's contents */ + writer.println("interface TestValues {"); + writer.println(); + writer.println(INDENT + "static final int size = " + fullState.size() + ";"); + writer.println(); + + /* Print the array contents */ + writer.println(INDENT + "static final long[] startTimes = {"); + for (ITmfStateInterval interval : fullState) { + writer.println(INDENT + INDENT + String.valueOf(interval.getStartTime()) + "L,"); + } + writer.println(INDENT + "};"); + writer.println(); - writer.println(INDENT + "static final long[] endTimes = {"); - for (ITmfStateInterval interval : fullState) { - writer.println(INDENT + INDENT + String.valueOf(interval.getEndTime())+ "L,"); - } - writer.println(INDENT + "};"); - writer.println(); - - writer.println(INDENT + "static final ITmfStateValue[] values = {"); - for (ITmfStateInterval interval : fullState) { - ITmfStateValue val = interval.getStateValue(); - writer.print(INDENT + INDENT); - - switch (val.getType()) { - case NULL: - writer.println("TmfStateValue.nullValue(),"); - break; - case INTEGER: - writer.println("TmfStateValue.newValueInt(" + val.unboxInt() + "),"); - break; - case LONG: - writer.println("TmfStateValue.newValueLong(" + val.unboxLong() +"),"); - break; - case DOUBLE: - writer.println("TmfStateValue.newValueDouble(" + val.unboxDouble() +"),"); - break; - case STRING: - writer.println("TmfStateValue.newValueString(\"" + val.unboxStr() + "\"),"); - break; - default: - writer.println(val.toString()); - break; + writer.println(INDENT + "static final long[] endTimes = {"); + for (ITmfStateInterval interval : fullState) { + writer.println(INDENT + INDENT + String.valueOf(interval.getEndTime()) + "L,"); } - } - writer.println(INDENT + "};"); + writer.println(INDENT + "};"); + writer.println(); + + writer.println(INDENT + "static final ITmfStateValue[] values = {"); + for (ITmfStateInterval interval : fullState) { + ITmfStateValue val = interval.getStateValue(); + writer.print(INDENT + INDENT); + + switch (val.getType()) { + case NULL: + writer.println("TmfStateValue.nullValue(),"); + break; + case INTEGER: + writer.println("TmfStateValue.newValueInt(" + val.unboxInt() + "),"); + break; + case LONG: + writer.println("TmfStateValue.newValueLong(" + val.unboxLong() + "),"); + break; + case DOUBLE: + writer.println("TmfStateValue.newValueDouble(" + val.unboxDouble() + "),"); + break; + case STRING: + writer.println("TmfStateValue.newValueString(\"" + val.unboxStr() + "\"),"); + break; + default: + writer.println(val.toString()); + break; + } + } + writer.println(INDENT + "};"); - writer.println("}"); - writer.println(); + writer.println("}"); + writer.println(); - writer.close(); + } System.exit(0); } diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/.classpath b/org.eclipse.linuxtools.lttng2.kernel.core/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/.classpath +++ b/org.eclipse.linuxtools.lttng2.kernel.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.jdt.core.prefs index b432a261f1..dda6b5e856 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.kernel.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=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=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=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.lttng2.kernel.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF index 2ba6f2e26e..10ca723cbe 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.kernel.core.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0", diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java index c8f3d221db..36aa89d6db 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java @@ -518,7 +518,7 @@ public class LttngKernelStateProvider extends AbstractTmfStateProvider { * TODO Replace with straight strings in the switch/case once we move to * Java 7 */ - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); map.put(LttngStrings.EXIT_SYSCALL, 1); map.put(LttngStrings.IRQ_HANDLER_ENTRY, 2); diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java index fcf65b121d..9c946c1bb8 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java @@ -75,7 +75,7 @@ public class TcpEventMatching implements ITmfNetworkMatchDefinition { */ @Override public List getUniqueField(ITmfEvent event) { - List keys = new ArrayList(); + List keys = new ArrayList<>(); keys.add(event.getContent().getField(TcpEventStrings.SEQ).getValue()); keys.add(event.getContent().getField(TcpEventStrings.ACKSEQ).getValue()); diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java index 215d3d68e8..e45b9dd947 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java @@ -63,7 +63,7 @@ public class TcpLttngEventMatching implements ITmfNetworkMatchDefinition { */ @Override public List getUniqueField(ITmfEvent event) { - List keys = new ArrayList(); + List keys = new ArrayList<>(); TmfEventField field = (TmfEventField) event.getContent(); ITmfEventField data; diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/.classpath b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/.classpath +++ b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/.settings/org.eclipse.jdt.core.prefs index ccd0247adc..ea5fccc222 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.kernel.ui.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.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF index e917574461..d6b2b034e6 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui.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.ui, diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/.classpath b/org.eclipse.linuxtools.lttng2.kernel.ui/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/.classpath +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.jdt.core.prefs index 7c72c5ede9..f2b1b729af 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.kernel.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=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.lttng2.kernel.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF index aa69287ab2..1e32206eb6 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.kernel.ui.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide, org.eclipse.core.resources, diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java index bbfd7a5d11..94bd6beaf3 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java @@ -120,7 +120,7 @@ public class ControlFlowPresentationProvider extends TimeGraphPresentationProvid @Override public Map getEventHoverToolTipInfo(ITimeEvent event) { - Map retMap = new LinkedHashMap(); + Map retMap = new LinkedHashMap<>(); if (!(event instanceof TimeEvent) || !((TimeEvent) event).hasValue() || !(event.getEntry() instanceof ControlFlowEntry)) { return retMap; diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java index 12ef3d2e1f..3a5df77ef3 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java @@ -202,13 +202,13 @@ public class ControlFlowView extends AbstractTimeGraphView { setStartTime(Long.MAX_VALUE); setEndTime(Long.MIN_VALUE); - ArrayList rootList = new ArrayList(); + ArrayList rootList = new ArrayList<>(); for (ITmfTrace aTrace : TmfTraceManager.getTraceSet(trace)) { if (monitor.isCanceled()) { return; } if (aTrace instanceof LttngKernelTrace) { - ArrayList entryList = new ArrayList(); + ArrayList entryList = new ArrayList<>(); LttngKernelTrace ctfKernelTrace = (LttngKernelTrace) aTrace; ITmfStateSystem ssq = ctfKernelTrace.getStateSystems().get(LttngKernelTrace.STATE_ID); if (!ssq.waitUntilBuilt()) { @@ -360,7 +360,7 @@ public class ControlFlowView extends AbstractTimeGraphView { try { int statusQuark = ssq.getQuarkRelative(entry.getThreadQuark(), Attributes.STATUS); List statusIntervals = ssq.queryHistoryRange(statusQuark, realStart, realEnd - 1, resolution, monitor); - eventList = new ArrayList(statusIntervals.size()); + eventList = new ArrayList<>(statusIntervals.size()); long lastEndTime = -1; for (ITmfStateInterval statusInterval : statusIntervals) { if (monitor.isCanceled()) { @@ -457,7 +457,7 @@ public class ControlFlowView extends AbstractTimeGraphView { @Override protected List getLinkList(long startTime, long endTime, long resolution, IProgressMonitor monitor) { - List list = new ArrayList(); + List list = new ArrayList<>(); ITmfTrace[] traces = TmfTraceManager.getTraceSet(getTrace()); List entryList = getEntryListMap().get(getTrace()); if (traces == null || entryList == null) { diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java index 88043dd021..a713db513e 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java @@ -149,7 +149,7 @@ public class ResourcesPresentationProvider extends TimeGraphPresentationProvider @Override public Map getEventHoverToolTipInfo(ITimeEvent event, long hoverTime) { - Map retMap = new LinkedHashMap(); + Map retMap = new LinkedHashMap<>(); if (event instanceof TimeEvent && ((TimeEvent) event).hasValue()) { TimeEvent tcEvent = (TimeEvent) event; diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java index 5bf034f62f..ceaac40573 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java @@ -90,7 +90,7 @@ public class ResourcesView extends AbstractTimeGraphView { setStartTime(Long.MAX_VALUE); setEndTime(Long.MIN_VALUE); - ArrayList entryList = new ArrayList(); + ArrayList entryList = new ArrayList<>(); for (ITmfTrace aTrace : TmfTraceManager.getTraceSet(trace)) { if (monitor.isCanceled()) { return; @@ -176,7 +176,7 @@ public class ResourcesView extends AbstractTimeGraphView { if (resourcesEntry.getType().equals(Type.CPU)) { int statusQuark = ssq.getQuarkRelative(quark, Attributes.STATUS); List statusIntervals = ssq.queryHistoryRange(statusQuark, realStart, realEnd - 1, resolution, monitor); - eventList = new ArrayList(statusIntervals.size()); + eventList = new ArrayList<>(statusIntervals.size()); long lastEndTime = -1; for (ITmfStateInterval statusInterval : statusIntervals) { if (monitor.isCanceled()) { @@ -198,7 +198,7 @@ public class ResourcesView extends AbstractTimeGraphView { } } else if (resourcesEntry.getType().equals(Type.IRQ)) { List irqIntervals = ssq.queryHistoryRange(quark, realStart, realEnd - 1, resolution, monitor); - eventList = new ArrayList(irqIntervals.size()); + eventList = new ArrayList<>(irqIntervals.size()); long lastEndTime = -1; boolean lastIsNull = true; for (ITmfStateInterval irqInterval : irqIntervals) { @@ -231,7 +231,7 @@ public class ResourcesView extends AbstractTimeGraphView { } } else if (resourcesEntry.getType().equals(Type.SOFT_IRQ)) { List softIrqIntervals = ssq.queryHistoryRange(quark, realStart, realEnd - 1, resolution, monitor); - eventList = new ArrayList(softIrqIntervals.size()); + eventList = new ArrayList<>(softIrqIntervals.size()); long lastEndTime = -1; boolean lastIsNull = true; for (ITmfStateInterval softIrqInterval : softIrqIntervals) { diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.classpath b/org.eclipse.linuxtools.lttng2.ui.tests/.classpath index 5cbdebc5ca..f1d3296b72 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/.classpath +++ b/org.eclipse.linuxtools.lttng2.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.jdt.core.prefs index ccd0247adc..ea5fccc222 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.ui.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.lttng2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF index 583ff7057c..c2e2504508 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui.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.commands, org.eclipse.core.runtime, diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java index 5ef6fabb24..2317d9e10b 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java @@ -405,7 +405,7 @@ public class TraceControlComponentTest { public void testGetAndSetChildren() { TraceControlComponent fixture = new TraceControlComponent("", new TraceControlRoot()); fixture.setToolTip(""); - List children = new LinkedList(); + List children = new LinkedList<>(); children.add(new TraceControlComponent("child1")); children.add(new TraceControlComponent("child2")); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java index ac42ca11de..6972e4ca29 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java @@ -234,7 +234,7 @@ public class TraceControlKernelSessionTests { EnableEventsDialogStub eventsDialogStub = new EnableEventsDialogStub(); eventsDialogStub.setIsTracePoints(true); - List events = new ArrayList(); + List events = new ArrayList<>(); events.add("sched_kthread_stop"); events.add("sched_kthread_stop_ret"); eventsDialogStub.setNames(events); @@ -694,7 +694,7 @@ public class TraceControlKernelSessionTests { assertEquals(1, domains.length); AddContextDialogStub addContextStub = new AddContextDialogStub(); - List contexts = new ArrayList(); + List contexts = new ArrayList<>(); contexts.add("prio"); contexts.add("perf:branch-misses"); contexts.add("perf:cache-misses"); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlSnapshotSessionTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlSnapshotSessionTests.java index e3a147e8d7..1215cd5546 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlSnapshotSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlSnapshotSessionTests.java @@ -171,7 +171,7 @@ public class TraceControlSnapshotSessionTests { IPropertyDescriptor[] descriptors = sessionSource.getPropertyDescriptors(); assertNotNull(descriptors); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(TraceSessionPropertySource.TRACE_SESSION_NAME_PROPERTY_ID, "mysession"); map.put(TraceSessionPropertySource.TRACE_SNAPSHOT_NAME_PROPERTY_ID, "snapshot-1"); map.put(TraceSessionPropertySource.TRACE_SNAPSHOT_PATH_PROPERTY_ID, "/home/user/lttng-traces/mysession-20130913-141651"); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java index 6c22f0d7a5..c3ccd9bc96 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java @@ -232,7 +232,7 @@ public class TraceControlUstSessionTests { // ------------------------------------------------------------------------ EnableEventsDialogStub eventsDialogStub = new EnableEventsDialogStub(); eventsDialogStub.setIsTracePoints(true); - List events = new ArrayList(); + List events = new ArrayList<>(); events.add("ust_tests_hello:tptest_sighandler"); eventsDialogStub.setNames(events); eventsDialogStub.setIsKernel(false); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java index ddf7ee811f..c985020da1 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java @@ -820,7 +820,7 @@ public class LTTngControlServiceTest { try { ((LTTngControlService)fService).setVersion("2.2.0"); String sessionName = "mysession2"; - List list = new ArrayList(); + List list = new ArrayList<>(); String kernelChannel0 = "mychannel0"; String kernelChannel1 = "mychannel1"; list.add(kernelChannel0); @@ -864,7 +864,7 @@ public class LTTngControlServiceTest { try { ((LTTngControlService)fService).setVersion("2.2.0"); String sessionName = "mysession2"; - List list = new ArrayList(); + List list = new ArrayList<>(); String USTChannel = "ustChannel"; list.add(USTChannel); fShell.setScenario(SCEN_CHANNEL_HANDLING); @@ -891,7 +891,7 @@ public class LTTngControlServiceTest { try { ((LTTngControlService)fService).setVersion("2.2.0"); String sessionName = "mysession2"; - List list = new ArrayList(); + List list = new ArrayList<>(); String USTChannel = "ustChannel"; list.add(USTChannel); fShell.setScenario(SCEN_CHANNEL_HANDLING); @@ -920,7 +920,7 @@ public class LTTngControlServiceTest { try { String sessionName = "mysession2"; - List list = new ArrayList(); + List list = new ArrayList<>(); String kernelChannel0 = "mychannel0"; String kernelChannel1 = "mychannel1"; list.add(kernelChannel0); @@ -943,7 +943,7 @@ public class LTTngControlServiceTest { try { String sessionName = "mysession2"; - List list = new ArrayList(); + List list = new ArrayList<>(); String kernelChannel0 = "mychannel0"; String kernelChannel1 = "mychannel1"; list.add(kernelChannel0); @@ -968,7 +968,7 @@ public class LTTngControlServiceTest { try { // 1) session name, channel = null, 3 event names, kernel String sessionName = "mysession2"; - List list = new ArrayList(); + List list = new ArrayList<>(); String eventName0 = "block_rq_remap"; String eventName1 = "block_bio_remap"; String eventName2 = "softirq_entry"; @@ -1077,7 +1077,7 @@ public class LTTngControlServiceTest { String sessionName = "mysession2"; String channelName = "mychannel"; String eventName = "ust_tests_hello:tptest_sighandler"; - List contexts = new ArrayList(); + List contexts = new ArrayList<>(); contexts.add("prio"); contexts.add("pid"); @@ -1088,7 +1088,7 @@ public class LTTngControlServiceTest { assertEquals(12, availContexts.size()); // A very "hard-coded" way to verify but it works ... - Set expectedContexts = new HashSet(); + Set expectedContexts = new HashSet<>(); expectedContexts.add("pid"); expectedContexts.add("procname"); expectedContexts.add("prio"); @@ -1119,7 +1119,7 @@ public class LTTngControlServiceTest { String sessionName = "mysession2"; String channelName = "mychannel"; String eventName = "ust_tests_hello:tptest_sighandler"; - List contexts = new ArrayList(); + List contexts = new ArrayList<>(); contexts.add("prio"); contexts.add("pid"); fShell.setScenario(SCEN_CONTEXT_ERROR_HANDLING); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/AddContextDialogStub.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/AddContextDialogStub.java index bc11566447..e1ba7f5148 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/AddContextDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/AddContextDialogStub.java @@ -35,19 +35,19 @@ public class AddContextDialogStub implements IAddContextDialog { @Override public void setAvalibleContexts(List contexts) { - fAvailableContexts = new HashSet(); + fAvailableContexts = new HashSet<>(); fAvailableContexts.addAll(contexts); } @Override public List getContexts() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.addAll(fContexts); return ret; } public void setContexts(List contexts) throws IllegalArgumentException{ - fContexts = new ArrayList(); + fContexts = new ArrayList<>(); fContexts.addAll(contexts); // If availableContexts are null we cannot verify if (fAvailableContexts != null) { diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java index 6d20f17b7a..f7ca85f79e 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java @@ -46,7 +46,7 @@ public class EnableEventsDialogStub implements IEnableEventsDialog { private TraceLogLevel fLogLevel; private LogLevelType fLogLevelType; private String fFilter; - List fNames = new ArrayList(); + private List fNames = new ArrayList<>(); // ------------------------------------------------------------------------ // Accessors diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java index 79ebc27bf3..d5b242f278 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java @@ -53,8 +53,8 @@ public class LTTngToolsFileShell extends TestCommandShell { private String fScenariofile; private String fScenario; - private final Map> fScenarioMap = new HashMap>(); - private final Map fSessionNameMap = new HashMap(); + private final Map> fScenarioMap = new HashMap<>(); + private final Map fSessionNameMap = new HashMap<>(); /** * Parse a scenario file with the format: @@ -101,118 +101,117 @@ public class LTTngToolsFileShell extends TestCommandShell { // load from file // Open the file - FileInputStream fstream = new FileInputStream(fScenariofile); + try (FileInputStream fstream = new FileInputStream(fScenariofile); + DataInputStream in = new DataInputStream(fstream); + BufferedReader br = new BufferedReader(new InputStreamReader(in));) { + String strLine; - // Get the object of DataInputStream - DataInputStream in = new DataInputStream(fstream); - BufferedReader br = new BufferedReader(new InputStreamReader(in)); - String strLine; + // Read File Line by Line - // Read File Line by Line - - // Temporary map for generating instance numbers for lttng list commands. - // The numbers are per scenario. - Map tmpSessionNameMap = new HashMap(); - while ((strLine = br.readLine()) != null) { - - // Ignore comments - if(isComment(strLine)) { - continue; - } - - if (SCENARIO_KEY.equals(strLine)) { - // scenario start + // Temporary map for generating instance numbers for lttng list + // commands. + // The numbers are per scenario. + Map tmpSessionNameMap = new HashMap<>(); + while ((strLine = br.readLine()) != null) { // Ignore comments - strLine = br.readLine(); - while (isComment(strLine)) { - strLine = br.readLine(); + if (isComment(strLine)) { + continue; } - String scenario = strLine; - Map commandMap = new HashMap(); - fScenarioMap.put(scenario, commandMap); - List output = null; - String input = null; - boolean inOutput = false; - int result = 0; - tmpSessionNameMap.clear(); - while ((strLine = br.readLine()) != null) { + if (SCENARIO_KEY.equals(strLine)) { + // scenario start + // Ignore comments - if(isComment(strLine)) { - continue; + strLine = br.readLine(); + while (isComment(strLine)) { + strLine = br.readLine(); } - if (SCENARIO_END_KEY.equals(strLine)) { - // Scenario is finished - break; - } - if (INPUT_KEY.equals(strLine)) { - strLine = br.readLine(); + String scenario = strLine; + Map commandMap = new HashMap<>(); + fScenarioMap.put(scenario, commandMap); + List output = null; + String input = null; + boolean inOutput = false; + int result = 0; + tmpSessionNameMap.clear(); + while ((strLine = br.readLine()) != null) { // Ignore comments - while (isComment(strLine)) { - strLine = br.readLine(); + if (isComment(strLine)) { + continue; } - // Read command - input = strLine; - // Handle instances of 'lttng list (); - } else if (RESULT_KEY.equals(strLine)) { - strLine = br.readLine(); - // Ignore comments - while (isComment(strLine)) { + if (INPUT_KEY.equals(strLine)) { strLine = br.readLine(); - } - // Save result value - result = Integer.parseInt(strLine); - } else if (OUTPUT_END_KEY.equals(strLine)) { - // Save output/result in command map - if (output != null) { - commandMap.put(input, new CommandResult(result, output.toArray(new String[output.size()]))); - } - inOutput = false; - } else if (OUTPUT_KEY.equals(strLine)) { - // first line of output - inOutput = true; - strLine = br.readLine(); + // Ignore comments + while (isComment(strLine)) { + strLine = br.readLine(); + } + // Read command + input = strLine; - // Ignore comments - while (isComment(strLine)) { + // Handle instances of 'lttng list + // (); + } else if (RESULT_KEY.equals(strLine)) { strLine = br.readLine(); + // Ignore comments + while (isComment(strLine)) { + strLine = br.readLine(); + } + // Save result value + result = Integer.parseInt(strLine); + } else if (OUTPUT_END_KEY.equals(strLine)) { + // Save output/result in command map + if (output != null) { + commandMap.put(input, new CommandResult(result, output.toArray(new String[output.size()]))); + } + inOutput = false; + } else if (OUTPUT_KEY.equals(strLine)) { + // first line of output + inOutput = true; + strLine = br.readLine(); + + // Ignore comments + while (isComment(strLine)) { + strLine = br.readLine(); + } + if (output != null) { + output.add(strLine); + } + } else if (inOutput) { + // subsequent lines of output + if (output != null) { + output.add(strLine); + } } - if (output != null) { - output.add(strLine); - } - } else if (inOutput) { - // subsequent lines of output - if (output != null) { - output.add(strLine); - } - } -// else { -// if (RESULT_END_KEY.equals(strLine)) { + // else { + // if (RESULT_END_KEY.equals(strLine)) { // nothing to do -// } + // } + } } } } - //Close the input stream - in.close(); } // Set the scenario to consider in executeCommand() diff --git a/org.eclipse.linuxtools.lttng2.ui/.classpath b/org.eclipse.linuxtools.lttng2.ui/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/.classpath +++ b/org.eclipse.linuxtools.lttng2.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.jdt.core.prefs index 3fafa2dd97..7a4f5734b0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.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=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.lttng2.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF index 1ce6162e34..a70dcd2167 100644 --- a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.ui.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide, org.eclipse.core.expressions, diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java index 8e10645831..b75686e137 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java @@ -69,7 +69,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { /** * The contexts to add. */ - private final List fSelectedContexts = new ArrayList(); + private final List fSelectedContexts = new ArrayList<>(); // ------------------------------------------------------------------------ // Constructors @@ -95,7 +95,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { @Override public List getContexts() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.addAll(fSelectedContexts); return ret; } @@ -320,7 +320,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { * The contexts to set */ public void setAvalibleContexts(List contexts) { - fAvailableContexts = new ArrayList(); + fAvailableContexts = new ArrayList<>(); if (contexts != null) { for (Iterator iterator = contexts.iterator(); iterator.hasNext();) { String name = iterator.next(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java index 3f7c1cb0a8..1618a6b0ed 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java @@ -182,7 +182,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern @Override public List getEventNames() { - return new ArrayList(fSelectedEvents); + return new ArrayList<>(fSelectedEvents); } @Override @@ -252,7 +252,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern // initialize tracepoint fields fIsAllTracepoints = false; - fSelectedEvents = new ArrayList(); + fSelectedEvents = new ArrayList<>(); if (fIsTracepoints) { List comps = fProviderGroup.getChildren(KernelProviderComponent.class); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java index 81444121b1..8b4fea254e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java @@ -180,7 +180,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve @Override public List getEventNames() { - return new ArrayList(fSelectedEvents); + return new ArrayList<>(fSelectedEvents); } @Override @@ -256,10 +256,10 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve // initialize tracepoint fields fIsAllTracepoints = false; - fSelectedEvents = new ArrayList(); + fSelectedEvents = new ArrayList<>(); if (fIsTracepoints) { fIsAllTracepoints = fTracepointsViewer.getChecked(fProviderGroup); - Set set = new HashSet(); + Set set = new HashSet<>(); Object[] checkedElements = fTracepointsViewer.getCheckedElements(); for (int i = 0; i < checkedElements.length; i++) { ITraceControlComponent component = (ITraceControlComponent)checkedElements[i]; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java index b82653d800..69ce02f7dc 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java @@ -112,7 +112,7 @@ public class ImportDialog extends Dialog implements IImportDialog { /** * List of traces to import */ - private final List fTraces = new ArrayList(); + private final List fTraces = new ArrayList<>(); /** * Selection index in project combo box. */ @@ -144,7 +144,7 @@ public class ImportDialog extends Dialog implements IImportDialog { @Override public List getTracePathes() { - List retList = new ArrayList(); + List retList = new ArrayList<>(); retList.addAll(fTraces); return retList; } @@ -410,8 +410,8 @@ public class ImportDialog extends Dialog implements IImportDialog { projectGroup.setLayout(layout); projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fProjects = new ArrayList(); - List projectNames = new ArrayList(); + fProjects = new ArrayList<>(); + List projectNames = new ArrayList<>(); for (IProject project : TraceUtils.getOpenedTmfProjects()) { fProjects.add(project); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java index f3e8d375f1..dc4a2ac1b0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java @@ -87,7 +87,7 @@ public class AssignEventHandler extends BaseControlViewHandler { Exception error = null; try { - List eventNames = new ArrayList(); + List eventNames = new ArrayList<>(); List events = param.getEvents(); // Create list of event names for (Iterator iterator = events.iterator(); iterator.hasNext();) { @@ -127,7 +127,7 @@ public class AssignEventHandler extends BaseControlViewHandler { @Override public boolean isEnabled() { - ArrayList events = new ArrayList(); + ArrayList events = new ArrayList<>(); TraceSessionComponent[] sessions = null; Boolean isKernel = null; @@ -225,7 +225,7 @@ public class AssignEventHandler extends BaseControlViewHandler { */ public Parameter(TraceSessionComponent[] sessions, List events, boolean isKernel) { fSessions = Arrays.copyOf(sessions, sessions.length); - fEvents = new ArrayList(); + fEvents = new ArrayList<>(); fEvents.addAll(events); fIsKernel = isKernel; } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java index 44406c63ef..eb99ff056d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java @@ -95,7 +95,7 @@ abstract class BaseEnableChannelHandler extends BaseControlViewHandler { protected IStatus run(IProgressMonitor monitor) { Exception error = null; - List channelNames = new ArrayList(); + List channelNames = new ArrayList<>(); channelNames.add(dialog.getChannelInfo().getName()); try { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java index 0696653c09..eca1454e29 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java @@ -97,7 +97,7 @@ public abstract class ChangeChannelStateHandler extends BaseControlViewHandler { if (kernelDomain != null) { session = (TraceSessionComponent)kernelDomain.getParent(); - List channelNames = new ArrayList(); + List channelNames = new ArrayList<>(); for (Iterator iterator = kernelChannels.iterator(); iterator.hasNext();) { // Enable all selected channels which are disabled TraceChannelComponent channel = iterator.next(); @@ -120,7 +120,7 @@ public abstract class ChangeChannelStateHandler extends BaseControlViewHandler { session = (TraceSessionComponent)ustDomain.getParent(); } - List channelNames = new ArrayList(); + List channelNames = new ArrayList<>(); for (Iterator iterator = ustChannels.iterator(); iterator.hasNext();) { // Enable all selected channels which are disabled TraceChannelComponent channel = iterator.next(); @@ -171,8 +171,8 @@ public abstract class ChangeChannelStateHandler extends BaseControlViewHandler { TraceDomainComponent kernelDomain = null; TraceDomainComponent ustDomain = null; - List kernelChannels = new ArrayList(); - List ustChannels = new ArrayList(); + List kernelChannels = new ArrayList<>(); + List ustChannels = new ArrayList<>(); // Check if one or more session are selected ISelection selection = page.getSelection(ControlView.ID); @@ -258,9 +258,9 @@ public abstract class ChangeChannelStateHandler extends BaseControlViewHandler { public Parameter(TraceDomainComponent kernelDomain, TraceDomainComponent ustDomain, List kernelChannels, List ustChannels) { fKernelDomain = kernelDomain; fUstDomain = ustDomain; - fKernelChannels = new ArrayList(); + fKernelChannels = new ArrayList<>(); fKernelChannels.addAll(kernelChannels); - fUstChannels = new ArrayList(); + fUstChannels = new ArrayList<>(); fUstChannels.addAll(ustChannels); } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java index e4c65f845c..5268d89018 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java @@ -96,7 +96,7 @@ public abstract class ChangeEventStateHandler extends BaseControlViewHandler { boolean isAll = false; if (param.getChannel() != null) { session = param.getChannel().getSession(); - List eventNames = new ArrayList(); + List eventNames = new ArrayList<>(); List events = param.getEvents(); for (Iterator iterator = events.iterator(); iterator.hasNext();) { @@ -160,7 +160,7 @@ public abstract class ChangeEventStateHandler extends BaseControlViewHandler { ISelection selection = page.getSelection(ControlView.ID); TraceChannelComponent channel = null; - List events = new ArrayList(); + List events = new ArrayList<>(); if (selection instanceof StructuredSelection) { StructuredSelection structered = ((StructuredSelection) selection); @@ -224,7 +224,7 @@ public abstract class ChangeEventStateHandler extends BaseControlViewHandler { /** * The list of kernel channel components the command is to be executed on. */ - private final List fEvents = new ArrayList(); + private final List fEvents = new ArrayList<>(); /** * Constructor diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java index 74d846fe81..6af69ae501 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java @@ -47,7 +47,7 @@ public abstract class ChangeSessionStateHandler extends BaseControlViewHandler { /** * The list of session components the command is to be executed on. */ - protected List fSessions = new ArrayList(); + protected List fSessions = new ArrayList<>(); // ------------------------------------------------------------------------ // Accessors @@ -86,7 +86,7 @@ public abstract class ChangeSessionStateHandler extends BaseControlViewHandler { fLock.lock(); try { - final List sessions = new ArrayList(); + final List sessions = new ArrayList<>(); sessions.addAll(fSessions); Job job = new Job(Messages.TraceControl_ChangeSessionStateJob) { @@ -125,7 +125,7 @@ public abstract class ChangeSessionStateHandler extends BaseControlViewHandler { return false; } - List sessions = new ArrayList(0); + List sessions = new ArrayList<>(0); // Check if one or more session are selected ISelection selection = page.getSelection(ControlView.ID); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java index 3f250754ff..654296f3ff 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java @@ -50,7 +50,7 @@ public class DestroySessionHandler extends BaseControlViewHandler { /** * The list of session components the command is to be executed on. */ - private final List fSessions = new ArrayList(); + private final List fSessions = new ArrayList<>(); // ------------------------------------------------------------------------ // Operations diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java index ce15e5d512..15457f989a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java @@ -147,8 +147,8 @@ public class NewConnectionHandler extends BaseControlViewHandler { private static IHost[] getSuitableHosts() { // need shells and files - ArrayList result = new ArrayList(); - ArrayList shellConnections = new ArrayList( + ArrayList result = new ArrayList<>(); + ArrayList shellConnections = new ArrayList<>( Arrays.asList(RSECorePlugin.getTheSystemRegistry() .getHostsBySubSystemConfigurationCategory("shells"))); //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/SnaphshotHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/SnaphshotHandler.java index 40046a7c9f..2a31724b50 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/SnaphshotHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/SnaphshotHandler.java @@ -46,7 +46,7 @@ public class SnaphshotHandler extends BaseControlViewHandler { /** * The list of session components the command is to be executed on. */ - protected List fSessions = new ArrayList(); + protected List fSessions = new ArrayList<>(); // ------------------------------------------------------------------------ // Operations @@ -57,7 +57,7 @@ public class SnaphshotHandler extends BaseControlViewHandler { fLock.lock(); try { // Make a copy for thread safety - final List sessions = new ArrayList(); + final List sessions = new ArrayList<>(); sessions.addAll(fSessions); Job job = new Job(Messages.TraceControl_RecordSnapshotJob) { @@ -96,7 +96,7 @@ public class SnaphshotHandler extends BaseControlViewHandler { return false; } - List sessions = new ArrayList(0); + List sessions = new ArrayList<>(0); // Check if one session is selected ISelection selection = page.getSelection(ControlView.ID); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java index 30123cce00..62af533938 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java @@ -105,7 +105,7 @@ public class TraceChannelComponent extends TraceControlComponent { public void setChannelInfo(IChannelInfo channelInfo) { fChannelInfo = channelInfo; IEventInfo[] events = fChannelInfo.getEvents(); - List eventComponents = new ArrayList(); + List eventComponents = new ArrayList<>(); for (int i = 0; i < events.length; i++) { TraceEventComponent event = null; if (events[i].getClass() == ProbeEventInfo.class) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java index 823ae10007..1ed92d6fc4 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java @@ -58,7 +58,7 @@ public class TraceControlComponent implements ITraceControlComponent { /** * The list if children components. */ - private final List fChildren = new ArrayList(); + private final List fChildren = new ArrayList<>(); /** * The list of listeners to be notified about changes. */ @@ -178,7 +178,7 @@ public class TraceControlComponent implements ITraceControlComponent { @Override public List getChildren(Class clazz) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (Iterator iterator = fChildren.iterator(); iterator.hasNext();) { ITraceControlComponent child = iterator.next(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java index f31007d9e4..da707184ec 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java @@ -92,7 +92,7 @@ public class BaseEventPropertySource extends BasePropertySource { @Override public IPropertyDescriptor[] getPropertyDescriptors() { - List list = new ArrayList (); + List list = new ArrayList<> (); list.add(new ReadOnlyTextPropertyDescriptor(BASE_EVENT_NAME_PROPERTY_ID, BASE_EVENT_NAME_PROPERTY_NAME)); list.add(new ReadOnlyTextPropertyDescriptor(BASE_EVENT_TYPE_PROPERTY_ID, BASE_EVENT_TYPE_PROPERTY_NAME)); if (fBaseEvent.getLogLevel() != TraceLogLevel.LEVEL_UNKNOWN) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java index de98bf2ee2..c23a447c72 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java @@ -102,7 +102,7 @@ public class TraceEventPropertySource extends BasePropertySource { @Override public IPropertyDescriptor[] getPropertyDescriptors() { - List list = new ArrayList (); + List list = new ArrayList<> (); list.add(new ReadOnlyTextPropertyDescriptor(TRACE_EVENT_NAME_PROPERTY_ID, TRACE_EVENT_NAME_PROPERTY_NAME)); list.add(new ReadOnlyTextPropertyDescriptor(TRACE_EVENT_TYPE_PROPERTY_ID, TRACE_EVENT_TYPE_PROPERTY_NAME)); list.add( new ReadOnlyTextPropertyDescriptor(TRACE_EVENT_STATE_PROPERTY_ID, TRACE_EVENT_STATE_PROPERTY_NAME)); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java index 6811199711..449faee229 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java @@ -88,7 +88,7 @@ public class TraceProbeEventPropertySource extends TraceEventPropertySource { IPropertyDescriptor[] superProperties = super.getPropertyDescriptors(); List superList = Arrays.asList(superProperties); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.addAll(superList); if (fEvent instanceof TraceProbeEventComponent) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java index 283e6d4a11..e84d5678e8 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java @@ -109,7 +109,7 @@ public class TraceSessionPropertySource extends BasePropertySource { @Override public IPropertyDescriptor[] getPropertyDescriptors() { - List list = new ArrayList (); + List list = new ArrayList<>(); list.add(new ReadOnlyTextPropertyDescriptor(TRACE_SESSION_NAME_PROPERTY_ID, TRACE_SESSION_NAME_PROPERTY_NAME)); list.add(new ReadOnlyTextPropertyDescriptor(TRACE_SESSION_STATE_PROPERTY_ID, TRACE_SESSION_STATE_PROPERTY_NAME)); if (fSession.isSnapshotSession()) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java index 8c56874811..8995f577aa 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java @@ -127,10 +127,10 @@ public class CommandShell implements ICommandShell { @Override public ICommandResult executeCommand(final String command, final IProgressMonitor monitor, final boolean checkReturnValue) throws ExecutionException { if (fIsConnected) { - FutureTask future = new FutureTask(new Callable() { + FutureTask future = new FutureTask<>(new Callable() { @Override public CommandResult call() throws IOException, CancellationException { - final ArrayList result = new ArrayList(); + final ArrayList result = new ArrayList<>(); synchronized (fHostShell) { // Initialize return value which will be updated in isAliasEchoResult() diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java index ac631b2f5d..84cf52c76b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java @@ -137,7 +137,7 @@ public class LTTngControlService implements ILttngControlService { // // Use lttng list for more details - ArrayList retArray = new ArrayList(); + ArrayList retArray = new ArrayList<>(); int index = 0; while (index < result.getOutput().length) { String line = result.getOutput()[index]; @@ -209,7 +209,7 @@ public class LTTngControlService implements ILttngControlService { domainInfo.setIsKernel(true); // in domain kernel - ArrayList channels = new ArrayList(); + ArrayList channels = new ArrayList<>(); index = parseDomain(result.getOutput(), index, channels, domainInfo); if (channels.size() > 0) { @@ -230,7 +230,7 @@ public class LTTngControlService implements ILttngControlService { domainInfo.setIsKernel(false); // in domain UST - ArrayList channels = new ArrayList(); + ArrayList channels = new ArrayList<>(); index = parseDomain(result.getOutput(), index, channels, domainInfo); if (channels.size() > 0) { @@ -293,7 +293,7 @@ public class LTTngControlService implements ILttngControlService { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_LIST_KERNEL); ICommandResult result = executeCommand(command.toString(), monitor, false); - List events = new ArrayList(); + List events = new ArrayList<>(); if (result.getOutput() != null) { // Ignore the following 2 cases: @@ -338,7 +338,7 @@ public class LTTngControlService implements ILttngControlService { } ICommandResult result = executeCommand(command.toString(), monitor, false); - List allProviders = new ArrayList(); + List allProviders = new ArrayList<>(); // Workaround for versions 2.0.x which causes a segmentation fault for this command // if LTTng Tools is compiled without UST support. @@ -400,7 +400,7 @@ public class LTTngControlService implements ILttngControlService { if (matcher.matches()) { provider = new UstProviderInfo(matcher.group(2).trim()); provider.setPid(Integer.valueOf(matcher.group(1).trim())); - List events = new ArrayList(); + List events = new ArrayList<>(); index = getProviderEventInfo(result.getOutput(), ++index, events); provider.setEvents(events); allProviders.add(provider); @@ -912,7 +912,7 @@ public class LTTngControlService implements ILttngControlService { String[] output = result.getOutput(); - List contexts = new ArrayList(0); + List contexts = new ArrayList<>(0); int index = 0; boolean inList = false; @@ -1156,7 +1156,7 @@ public class LTTngControlService implements ILttngControlService { } } else if (LTTngControlServiceConstants.EVENT_SECTION_PATTERN.matcher(subLine).matches()) { - List events = new ArrayList(); + List events = new ArrayList<>(); index = parseEvents(output, index, events); if (channelInfo != null) { channelInfo.setEvents(events); @@ -1331,7 +1331,7 @@ public class LTTngControlService implements ILttngControlService { index++; } else if (LTTngControlServiceConstants.EVENT_FIELD_PATTERN.matcher(line).matches()) { if (eventInfo != null) { - List fields = new ArrayList(); + List fields = new ArrayList<>(); index = getFieldInfo(output, index, fields); eventInfo.setFields(fields); } else { diff --git a/org.eclipse.linuxtools.lttng2.ust.core.tests/.classpath b/org.eclipse.linuxtools.lttng2.ust.core.tests/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.ust.core.tests/.classpath +++ b/org.eclipse.linuxtools.lttng2.ust.core.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.ust.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.ust.core.tests/.settings/org.eclipse.jdt.core.prefs index 7acb262bd4..0f49f4a53e 100644 --- a/org.eclipse.linuxtools.lttng2.ust.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.ust.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=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.lttng2.ust.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ust.core.tests/META-INF/MANIFEST.MF index 541da9ab59..7b73042027 100644 --- a/org.eclipse.linuxtools.lttng2.ust.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ust.core.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ust.core.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.resources, org.eclipse.core.runtime, diff --git a/org.eclipse.linuxtools.lttng2.ust.core/.classpath b/org.eclipse.linuxtools.lttng2.ust.core/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.ust.core/.classpath +++ b/org.eclipse.linuxtools.lttng2.ust.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.ust.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.ust.core/.settings/org.eclipse.jdt.core.prefs index 749fd0eb9a..d344e10c27 100644 --- a/org.eclipse.linuxtools.lttng2.ust.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.ust.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=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.lttng2.ust.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF index 4759022595..b0047c5a34 100644 --- a/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ust.core;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.ust.core.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.eclipse.linuxtools.internal.lttng2.ust.core;x-internal:=true, org.eclipse.linuxtools.internal.lttng2.ust.core.trace.callstack;x-internal:=true, org.eclipse.linuxtools.lttng2.ust.core.trace diff --git a/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java b/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java index ae77fb4ce8..5f5519ad79 100644 --- a/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java +++ b/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java @@ -50,10 +50,10 @@ public class LttngUstCallStackProvider extends CallStackStateProvider { private static final String FIELD_ADDR = "addr"; //$NON-NLS-1$ /** Event names indicating function entry */ - private static final Set FUNC_ENTRY_EVENTS = new HashSet(); + private static final Set FUNC_ENTRY_EVENTS = new HashSet<>(); /** Event names indicating function exit */ - private static final Set FUNC_EXIT_EVENTS = new HashSet(); + private static final Set FUNC_EXIT_EVENTS = new HashSet<>(); static { /* This seems overkill, but it will be checked every event. Gotta go FAST! */ diff --git a/org.eclipse.linuxtools.lttng2.ust.ui.tests/.classpath b/org.eclipse.linuxtools.lttng2.ust.ui.tests/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.ust.ui.tests/.classpath +++ b/org.eclipse.linuxtools.lttng2.ust.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.ust.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.ust.ui.tests/.settings/org.eclipse.jdt.core.prefs index 7acb262bd4..0f49f4a53e 100644 --- a/org.eclipse.linuxtools.lttng2.ust.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.ust.ui.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.lttng2.ust.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ust.ui.tests/META-INF/MANIFEST.MF index c037c5c040..4f5e969ee4 100644 --- a/org.eclipse.linuxtools.lttng2.ust.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ust.ui.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ust.ui.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.ui, org.eclipse.core.resources, diff --git a/org.eclipse.linuxtools.lttng2.ust.ui/.classpath b/org.eclipse.linuxtools.lttng2.ust.ui/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.lttng2.ust.ui/.classpath +++ b/org.eclipse.linuxtools.lttng2.ust.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng2.ust.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.ust.ui/.settings/org.eclipse.jdt.core.prefs index 749fd0eb9a..d344e10c27 100644 --- a/org.eclipse.linuxtools.lttng2.ust.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.lttng2.ust.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.lttng2.ust.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF index 44f3bbc198..327b07d733 100644 --- a/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ust.ui;singleton:=true Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.ust.ui.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.ui, -- 2.34.1