lttng: Move to Java 7 and fix warnings
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Thu, 2 Jan 2014 21:27:51 +0000 (16:27 -0500)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Thu, 2 Jan 2014 23:07:15 +0000 (18:07 -0500)
Change-Id: Ic9a2ea7c526baee118adc5cd5c1c6a9566139fcb
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/20229
Tested-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
IP-Clean: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
86 files changed:
org.eclipse.linuxtools.lttng.alltests/.classpath
org.eclipse.linuxtools.lttng.alltests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.core.tests/.classpath
org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java
org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java
org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java
org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java
org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java
org.eclipse.linuxtools.lttng2.core/.classpath
org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java
org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java
org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java
org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java
org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java
org.eclipse.linuxtools.lttng2.kernel.core.tests/.classpath
org.eclipse.linuxtools.lttng2.kernel.core.tests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/headless/GenerateTestValues.java
org.eclipse.linuxtools.lttng2.kernel.core/.classpath
org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java
org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java
org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java
org.eclipse.linuxtools.lttng2.kernel.ui.tests/.classpath
org.eclipse.linuxtools.lttng2.kernel.ui.tests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.kernel.ui/.classpath
org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java
org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java
org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java
org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java
org.eclipse.linuxtools.lttng2.ui.tests/.classpath
org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlSnapshotSessionTests.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java
org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/AddContextDialogStub.java
org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java
org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java
org.eclipse.linuxtools.lttng2.ui/.classpath
org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/SnaphshotHandler.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java
org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java
org.eclipse.linuxtools.lttng2.ust.core.tests/.classpath
org.eclipse.linuxtools.lttng2.ust.core.tests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.ust.core.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.ust.core/.classpath
org.eclipse.linuxtools.lttng2.ust.core/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java
org.eclipse.linuxtools.lttng2.ust.ui.tests/.classpath
org.eclipse.linuxtools.lttng2.ust.ui.tests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.ust.ui.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.ust.ui/.classpath
org.eclipse.linuxtools.lttng2.ust.ui/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF

index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 7acb262bd4f12f6409ab0cd51f5ed6c571069f76..0f49f4a53eafec80f95cc8c6d409e9263e5667f8 100644 (file)
@@ -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
index 7072cbc0a3f7df4693d66c43e9bc5ba0c58a95ae..7e47ba985bb0d90c998f875048b453bc5d297691 100644 (file)
@@ -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",
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index ccd0247adc2702aec80b71d6c9c7a66bdbf770cf..ea5fccc222b8d317bc774bc5c65e79c8f56b44da 100644 (file)
@@ -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
index d81c7b2860e557639287080b469956b4631e63b1..ebfb28e6271a5da77dbbdb3c157f0628ed35dfd0 100644 (file)
@@ -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"
index 0f8d72ac56e1bf601b7479df476aeb42454ad2df..b49afa5642b4658dec037a9d9e74bf41ccbae7e9 100644 (file)
@@ -459,7 +459,7 @@ public class BaseEventInfoTest {
         IFieldInfo field2 =  new FieldInfo("stringfield");
         field2.setFieldType("string");
 
-        List<IFieldInfo> fields = new LinkedList<IFieldInfo>();
+        List<IFieldInfo> fields = new LinkedList<>();
         fields.add(field1);
         fields.add(field2);
         info.setFields(fields);
index 8c85058eecd401bd837599f726439bc758735178..b27e5dca4ac6b2dd1c24f1624358e8a6eb2b3f27 100644 (file)
@@ -254,7 +254,7 @@ public class ChannelInfoTest {
         fixture.setNumberOfSubBuffers(1);
         fixture.setOutputType("");
         fixture.setSubBufferSize(1L);
-        List<IEventInfo> events = new LinkedList<IEventInfo>();
+        List<IEventInfo> events = new LinkedList<>();
 
         for (int i = 0; i < 2; i++) {
             IEventInfo info = new EventInfo("event" + i);
index c9afadf2976597d0cb790ced8fdc00ed8495d93e..772f7982eb04df9aaa99224f7ac1eaac30ac01c8 100644 (file)
@@ -117,7 +117,7 @@ public class DomainInfoTest {
         assertEquals(fChannelInfo1, fDomainInfo1.getChannels()[0]);
 
         IDomainInfo domain = new DomainInfo("domain");
-        List<IChannelInfo> list = new LinkedList<IChannelInfo>();
+        List<IChannelInfo> list = new LinkedList<>();
         list.add(fChannelInfo1);
         list.add(fChannelInfo2);
         domain.setChannels(list);
index f033772a0dbdeeb8a790a4757d1c712a5b7ec9a3..880af45e781b69089102a8dc34c5fc7164687d19 100644 (file)
@@ -129,7 +129,7 @@ public class SessionInfoTest {
         assertEquals(fDomainInfo1, fSessionInfo1.getDomains()[0]);
 
         ISessionInfo session = new SessionInfo("session");
-        List<IDomainInfo> list = new LinkedList<IDomainInfo>();
+        List<IDomainInfo> list = new LinkedList<>();
         list.add(fDomainInfo1);
         list.add(fDomainInfo2);
         session.setDomains(list);
index 6f65e193bb634e38899f5ec7d7e053aef1e098fe..b9938957efedd1a4ef2d3c7f96c09d72d3c60c6e 100644 (file)
@@ -141,7 +141,7 @@ public class UstProviderInfoTest {
     public void testSetEvents_1() {
         UstProviderInfo fixture = new UstProviderInfo("test");
         fixture.setPid(2468);
-        List<IBaseEventInfo> events = new LinkedList<IBaseEventInfo>();
+        List<IBaseEventInfo> events = new LinkedList<>();
         events.add(fEventInfo1);
         events.add(fEventInfo2);
         fixture.setEvents(events);
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 3fafa2dd97f52793c0dfbdcda04e3dbeeb456b24..7a4f5734b0fd6d62c9104e876cf29c4bdfe396de 100644 (file)
@@ -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
index fdf605147985cdaed3ceeb0992aecb041f730315..3a353a51640b53e05a970b28093c2b97ce5f77e1 100644 (file)
@@ -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",
index f6e9378bc739624f6617a122ca195cc642a3dc5d..9d4e58183b74afdbb1d8d8814c17b08614aa9311 100644 (file)
@@ -44,7 +44,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
     /**
      * The Event fields
      */
-    private final List<IFieldInfo> fFields = new ArrayList<IFieldInfo>();
+    private final List<IFieldInfo> fFields = new ArrayList<>();
     /**
      * The filter expression.
      */
index b0d0299fe92df6d483dd4b25b458760f0c3564cb..bb6fde98fe3be91485b910e27b7c3e000ced86c7 100644 (file)
@@ -64,7 +64,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     /**
      * The events information of the channel.
      */
-    private final List<IEventInfo> fEvents = new ArrayList<IEventInfo>();
+    private final List<IEventInfo> fEvents = new ArrayList<>();
     /**
      * The maximum size of trace files
      */
index fda529fc2b0dbebfc59a8d736369cd5513d7c3fa..f204a0e9591f93da8d6e2056058301593b4d2441 100644 (file)
@@ -34,7 +34,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
     /**
      * The channels information of the domain.
      */
-    private final List<IChannelInfo> fChannels = new ArrayList<IChannelInfo>();
+    private final List<IChannelInfo> fChannels = new ArrayList<>();
     private boolean fIsKernel = false;
     private BufferType fBufferType = BufferType.BUFFER_TYPE_UNKNOWN;
 
index ac660757e32aae93250b31f46e6f22dc2622a17f..32bec07553bec4d5dd1d453ce4398ce7fbb9a1f1 100644 (file)
@@ -45,7 +45,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
     /**
      * The domains information of this session.
      */
-    private final List<IDomainInfo> fDomains = new ArrayList<IDomainInfo>();
+    private final List<IDomainInfo> fDomains = new ArrayList<>();
     /**
      * Flag to indicate whether trace is streamed over network or not.
      */
index 400b6af1c4b06433d9cc16ccd8c416619c17e000..0f6ff8b41efa17a62d5f12af2d8b98fefea44a04 100644 (file)
@@ -40,7 +40,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
     /**
      * List of event information.
      */
-    private final List<IBaseEventInfo> fEvents = new ArrayList<IBaseEventInfo>();
+    private final List<IBaseEventInfo> fEvents = new ArrayList<>();
 
     // ------------------------------------------------------------------------
     // Constructors
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 0af67dab874e574ea41dfc4ed2e93e46964ff91c..7c849a029cafa67d2894876200d480a7da77bb33 100644 (file)
@@ -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
index 83dd1378d5eeb0bf8cddd8fe0f807f34222df693..28fae597c6fa3035903c29b4334c216fb0187e08 100644 (file)
@@ -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",
index 90546d8dfcd137499c7b21202491e733869d5089..5d93abb34e0ee4df02832e866734d1fa20539e6a 100644 (file)
@@ -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<ITmfStateInterval> 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<ITmfStateInterval> 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);
     }
 
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index b432a261f1b323b58bcce1cc3bbc007a1cb3c2ce..dda6b5e856595619e2ed269e261109dcd1ebc7ed 100644 (file)
@@ -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
index 2ba6f2e26e00df7eedc5fe9a02fa431fb86e42d2..10ca723cbe86902a853a90712737b8de8860113c 100644 (file)
@@ -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",
index c8f3d221db8865f0dd4592e5b0c593498ea2dfb5..36aa89d6db00d78e1a62ffebf04358f2a0d30c6c 100644 (file)
@@ -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<String, Integer> map = new HashMap<String, Integer>();
+        HashMap<String, Integer> map = new HashMap<>();
 
         map.put(LttngStrings.EXIT_SYSCALL, 1);
         map.put(LttngStrings.IRQ_HANDLER_ENTRY, 2);
index fcf65b121d4d31f9d65d7e7047c8e59c1da21216..9c946c1bb8a01c6515f348d9606878235be56328 100644 (file)
@@ -75,7 +75,7 @@ public class TcpEventMatching implements ITmfNetworkMatchDefinition {
      */
     @Override
     public List<Object> getUniqueField(ITmfEvent event) {
-        List<Object> keys = new ArrayList<Object>();
+        List<Object> keys = new ArrayList<>();
 
         keys.add(event.getContent().getField(TcpEventStrings.SEQ).getValue());
         keys.add(event.getContent().getField(TcpEventStrings.ACKSEQ).getValue());
index 215d3d68e80a43fb59bf37a7102757f06a4fe156..e45b9dd9471f68c34a34aac5ba6c2d3b084f8c81 100644 (file)
@@ -63,7 +63,7 @@ public class TcpLttngEventMatching implements ITmfNetworkMatchDefinition {
      */
     @Override
     public List<Object> getUniqueField(ITmfEvent event) {
-        List<Object> keys = new ArrayList<Object>();
+        List<Object> keys = new ArrayList<>();
 
         TmfEventField field = (TmfEventField) event.getContent();
         ITmfEventField data;
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index ccd0247adc2702aec80b71d6c9c7a66bdbf770cf..ea5fccc222b8d317bc774bc5c65e79c8f56b44da 100644 (file)
@@ -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
index e917574461bf3410e714d6d381fba819744c836f..d6b2b034e6eba17f95ee285a4916088d9bc8f1bd 100644 (file)
@@ -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,
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 7c72c5ede9f1bd58ebb7b3a5596a5e13a1d958e4..f2b1b729af732c3b18515c8bab9f55f57b412af8 100644 (file)
@@ -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
index aa69287ab20f25a32d3ead92007d83373e9f18c6..1e32206eb6b9b5ebfb09474eec0a0e7e1a29e2a9 100644 (file)
@@ -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,
index bbfd7a5d11f04ba96c82d860a9a60a45fe10ada7..94bd6beaf3bb0a637dd898ec0ca147a6dc713a49 100644 (file)
@@ -120,7 +120,7 @@ public class ControlFlowPresentationProvider extends TimeGraphPresentationProvid
 
     @Override
     public Map<String, String> getEventHoverToolTipInfo(ITimeEvent event) {
-        Map<String, String> retMap = new LinkedHashMap<String, String>();
+        Map<String, String> retMap = new LinkedHashMap<>();
         if (!(event instanceof TimeEvent) || !((TimeEvent) event).hasValue() ||
                 !(event.getEntry() instanceof ControlFlowEntry)) {
             return retMap;
index 12ef3d2e1f264c3b883b0e792722f96201a1d6e7..3a5df77ef306faf1f3725a543192d080ac67bc45 100644 (file)
@@ -202,13 +202,13 @@ public class ControlFlowView extends AbstractTimeGraphView {
         setStartTime(Long.MAX_VALUE);
         setEndTime(Long.MIN_VALUE);
 
-        ArrayList<ControlFlowEntry> rootList = new ArrayList<ControlFlowEntry>();
+        ArrayList<ControlFlowEntry> rootList = new ArrayList<>();
         for (ITmfTrace aTrace : TmfTraceManager.getTraceSet(trace)) {
             if (monitor.isCanceled()) {
                 return;
             }
             if (aTrace instanceof LttngKernelTrace) {
-                ArrayList<ControlFlowEntry> entryList = new ArrayList<ControlFlowEntry>();
+                ArrayList<ControlFlowEntry> 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<ITmfStateInterval> statusIntervals = ssq.queryHistoryRange(statusQuark, realStart, realEnd - 1, resolution, monitor);
-            eventList = new ArrayList<ITimeEvent>(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<ILinkEvent> getLinkList(long startTime, long endTime, long resolution, IProgressMonitor monitor) {
-        List<ILinkEvent> list = new ArrayList<ILinkEvent>();
+        List<ILinkEvent> list = new ArrayList<>();
         ITmfTrace[] traces = TmfTraceManager.getTraceSet(getTrace());
         List<TimeGraphEntry> entryList = getEntryListMap().get(getTrace());
         if (traces == null || entryList == null) {
index 88043dd0213c14e131db6238ca35ac38257d658c..a713db513ea90b662977914c13180750eafa208f 100644 (file)
@@ -149,7 +149,7 @@ public class ResourcesPresentationProvider extends TimeGraphPresentationProvider
     @Override
     public Map<String, String> getEventHoverToolTipInfo(ITimeEvent event, long hoverTime) {
 
-        Map<String, String> retMap = new LinkedHashMap<String, String>();
+        Map<String, String> retMap = new LinkedHashMap<>();
         if (event instanceof TimeEvent && ((TimeEvent) event).hasValue()) {
 
             TimeEvent tcEvent = (TimeEvent) event;
index 5bf034f62fcc8bf92083ddb128689a7dfce6330c..ceaac40573fad8a1475202f9af3c8f6a4fd7ae3b 100644 (file)
@@ -90,7 +90,7 @@ public class ResourcesView extends AbstractTimeGraphView {
         setStartTime(Long.MAX_VALUE);
         setEndTime(Long.MIN_VALUE);
 
-        ArrayList<ResourcesEntry> entryList = new ArrayList<ResourcesEntry>();
+        ArrayList<ResourcesEntry> 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<ITmfStateInterval> statusIntervals = ssq.queryHistoryRange(statusQuark, realStart, realEnd - 1, resolution, monitor);
-                eventList = new ArrayList<ITimeEvent>(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<ITmfStateInterval> irqIntervals = ssq.queryHistoryRange(quark, realStart, realEnd - 1, resolution, monitor);
-                eventList = new ArrayList<ITimeEvent>(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<ITmfStateInterval> softIrqIntervals = ssq.queryHistoryRange(quark, realStart, realEnd - 1, resolution, monitor);
-                eventList = new ArrayList<ITimeEvent>(softIrqIntervals.size());
+                eventList = new ArrayList<>(softIrqIntervals.size());
                 long lastEndTime = -1;
                 boolean lastIsNull = true;
                 for (ITmfStateInterval softIrqInterval : softIrqIntervals) {
index 5cbdebc5cac9922d19195a50da252db57892e646..f1d3296b72d0ee03de7520d7cf140734e5afc570 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="stubs"/>
index ccd0247adc2702aec80b71d6c9c7a66bdbf770cf..ea5fccc222b8d317bc774bc5c65e79c8f56b44da 100644 (file)
@@ -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
index 583ff7057cd063a8e172bf7ad890a6f22c1a3dd5..c2e25045083384fe7a2bcaea754e3b0e5d973f28 100644 (file)
@@ -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,
index 5ef6fabb24493eb590f3088c773c67eff16596a0..2317d9e10b58a285f859c71f1cd7d210772de95f 100644 (file)
@@ -405,7 +405,7 @@ public class TraceControlComponentTest {
     public void testGetAndSetChildren() {
         TraceControlComponent fixture = new TraceControlComponent("", new TraceControlRoot());
         fixture.setToolTip("");
-        List<ITraceControlComponent> children = new LinkedList<ITraceControlComponent>();
+        List<ITraceControlComponent> children = new LinkedList<>();
         children.add(new TraceControlComponent("child1"));
         children.add(new TraceControlComponent("child2"));
 
index ac42ca11de676f8695779ff83e602987fd9a8822..6972e4ca294ad997bf04d1e66129de11ba75e06e 100644 (file)
@@ -234,7 +234,7 @@ public class TraceControlKernelSessionTests {
 
         EnableEventsDialogStub eventsDialogStub = new EnableEventsDialogStub();
         eventsDialogStub.setIsTracePoints(true);
-        List<String> events = new ArrayList<String>();
+        List<String> 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<String> contexts = new ArrayList<String>();
+        List<String> contexts = new ArrayList<>();
         contexts.add("prio");
         contexts.add("perf:branch-misses");
         contexts.add("perf:cache-misses");
index e3a147e8d7cfc70f60bd89ff18f8df16539d4ead..1215cd5546eb7c77db8bb7f770bdd56081a77d48 100644 (file)
@@ -171,7 +171,7 @@ public class TraceControlSnapshotSessionTests {
         IPropertyDescriptor[] descriptors = sessionSource.getPropertyDescriptors();
         assertNotNull(descriptors);
 
-        Map<String,String> map = new HashMap<String,String>();
+        Map<String,String> 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");
index 6c22f0d7a570bb0d34c425711bcba7eebe454bae..c3ccd9bc967b6106d6cdf36a3ea1050fc28c13be 100644 (file)
@@ -232,7 +232,7 @@ public class TraceControlUstSessionTests {
         // ------------------------------------------------------------------------
         EnableEventsDialogStub eventsDialogStub = new EnableEventsDialogStub();
         eventsDialogStub.setIsTracePoints(true);
-        List<String> events = new ArrayList<String>();
+        List<String> events = new ArrayList<>();
         events.add("ust_tests_hello:tptest_sighandler");
         eventsDialogStub.setNames(events);
         eventsDialogStub.setIsKernel(false);
index ddf7ee811f90054bb1c31561f39e2f3e17cad091..c985020da1923b8e486c9ae8e063a39e09687744 100644 (file)
@@ -820,7 +820,7 @@ public class LTTngControlServiceTest {
         try {
             ((LTTngControlService)fService).setVersion("2.2.0");
             String sessionName = "mysession2";
-            List<String> list = new ArrayList<String>();
+            List<String> 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<String> list = new ArrayList<String>();
+            List<String> 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<String> list = new ArrayList<String>();
+            List<String> 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<String> list = new ArrayList<String>();
+            List<String> list = new ArrayList<>();
             String kernelChannel0 = "mychannel0";
             String kernelChannel1 = "mychannel1";
             list.add(kernelChannel0);
@@ -943,7 +943,7 @@ public class LTTngControlServiceTest {
         try {
 
             String sessionName = "mysession2";
-            List<String> list = new ArrayList<String>();
+            List<String> 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<String> list = new ArrayList<String>();
+            List<String> 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<String> contexts = new ArrayList<String>();
+            List<String> 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<String> expectedContexts = new HashSet<String>();
+            Set<String> 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<String> contexts = new ArrayList<String>();
+        List<String> contexts = new ArrayList<>();
         contexts.add("prio");
         contexts.add("pid");
         fShell.setScenario(SCEN_CONTEXT_ERROR_HANDLING);
index bc11566447c3ae96e28d633d33efa4cb45b54650..e1ba7f51480e6a0ffcadedd5f46ad38baea55d7b 100644 (file)
@@ -35,19 +35,19 @@ public class AddContextDialogStub implements IAddContextDialog {
 
     @Override
     public void setAvalibleContexts(List<String> contexts) {
-        fAvailableContexts = new HashSet<String>();
+        fAvailableContexts = new HashSet<>();
         fAvailableContexts.addAll(contexts);
     }
 
     @Override
     public List<String> getContexts() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.addAll(fContexts);
         return ret;
     }
 
     public void setContexts(List<String> contexts) throws IllegalArgumentException{
-        fContexts = new ArrayList<String>();
+        fContexts = new ArrayList<>();
         fContexts.addAll(contexts);
         // If availableContexts are null we cannot verify
         if (fAvailableContexts != null) {
index 6d20f17b7abb7679d67883dfcd71d5c60dbea295..f7ca85f79ed5412e03830881e59b5d1b7ee29b1e 100644 (file)
@@ -46,7 +46,7 @@ public class EnableEventsDialogStub implements IEnableEventsDialog {
     private TraceLogLevel fLogLevel;
     private LogLevelType fLogLevelType;
     private String fFilter;
-    List<String> fNames = new ArrayList<String>();
+    private List<String> fNames = new ArrayList<>();
 
     // ------------------------------------------------------------------------
     // Accessors
index 79ebc27bf359b2cc6c75ee21b9fb7898f295458f..d5b242f27883828f09e8c9fe093caed649bc7e8b 100644 (file)
@@ -53,8 +53,8 @@ public class LTTngToolsFileShell extends TestCommandShell {
     private String fScenariofile;
     private String fScenario;
 
-    private final Map<String, Map<String, ICommandResult>> fScenarioMap = new HashMap<String, Map<String, ICommandResult>>();
-    private final Map<String, Integer> fSessionNameMap = new HashMap<String, Integer>();
+    private final Map<String, Map<String, ICommandResult>> fScenarioMap = new HashMap<>();
+    private final Map<String, Integer> 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 <session> commands.
-        // The numbers are per scenario.
-        Map<String, Integer> tmpSessionNameMap = new HashMap<String, Integer>();
-        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
+            // <session> commands.
+            // The numbers are per scenario.
+            Map<String, Integer> 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<String, ICommandResult> commandMap = new HashMap<String, ICommandResult>();
-                fScenarioMap.put(scenario, commandMap);
-                List<String> 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<String, ICommandResult> commandMap = new HashMap<>();
+                    fScenarioMap.put(scenario, commandMap);
+                    List<String> 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 <session"-comamand
-                        Matcher matcher = LTTNG_LIST_SESSION_PATTERN.matcher(strLine);
-                        if (matcher.matches() && !input.matches(LTTNG_LIST_PROVIDER_PATTERN)) {
-                            String sessionName = matcher.group(1).trim();
-                            Integer i = tmpSessionNameMap.get(sessionName);
-                            if (i != null) {
-                                i++;
-                            } else {
-                                i = 0;
-                            }
-                            tmpSessionNameMap.put(sessionName, i);
-                            input += String.valueOf(i);
+                        if (SCENARIO_END_KEY.equals(strLine)) {
+                            // Scenario is finished
+                            break;
                         }
-                    } else if (INPUT_END_KEY.equals(strLine)) {
-                        // Initialize output array
-                        output = new ArrayList<String>();
-                    } 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
+                            // <session"-comamand
+                            Matcher matcher = LTTNG_LIST_SESSION_PATTERN.matcher(strLine);
+                            if (matcher.matches() && !input.matches(LTTNG_LIST_PROVIDER_PATTERN)) {
+                                String sessionName = matcher.group(1).trim();
+                                Integer i = tmpSessionNameMap.get(sessionName);
+                                if (i != null) {
+                                    i++;
+                                } else {
+                                    i = 0;
+                                }
+                                tmpSessionNameMap.put(sessionName, i);
+                                input += String.valueOf(i);
+                            }
+                        } else if (INPUT_END_KEY.equals(strLine)) {
+                            // Initialize output array
+                            output = new ArrayList<>();
+                        } 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()
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 3fafa2dd97f52793c0dfbdcda04e3dbeeb456b24..7a4f5734b0fd6d62c9104e876cf29c4bdfe396de 100644 (file)
@@ -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
index 1ce6162e34e579100addfba5f1a813a140a6fafe..a70dcd2167f1de31f56244db968cc4fece6d7a42 100644 (file)
@@ -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,
index 8e10645831f63b9c666422ec1b9c8a32932ac30c..b75686e1371c15c907bc0f8aa1320d5b520ec59e 100644 (file)
@@ -69,7 +69,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog  {
     /**
      * The contexts to add.
      */
-    private final List<String> fSelectedContexts = new ArrayList<String>();
+    private final List<String> fSelectedContexts = new ArrayList<>();
 
     // ------------------------------------------------------------------------
     // Constructors
@@ -95,7 +95,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog  {
 
     @Override
     public List<String> getContexts() {
-        List<String> ret = new ArrayList<String>();
+        List<String> 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<String> contexts) {
-            fAvailableContexts = new ArrayList<Context>();
+            fAvailableContexts = new ArrayList<>();
             if (contexts != null) {
                 for (Iterator<String> iterator = contexts.iterator(); iterator.hasNext();) {
                     String name = iterator.next();
index 3f7c1cb0a83e30fb1259b051811dbd390598ff5f..1618a6b0ed20c33b8450875264fbb3a5bb88a03d 100644 (file)
@@ -182,7 +182,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
 
     @Override
     public List<String> getEventNames() {
-        return new ArrayList<String>(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<String>();
+        fSelectedEvents = new ArrayList<>();
 
         if (fIsTracepoints) {
             List<ITraceControlComponent> comps = fProviderGroup.getChildren(KernelProviderComponent.class);
index 81444121b1ed5c28377e3193a00716374074443f..8b4fea254e94d1c1147aaddb999e6f7752f52989 100644 (file)
@@ -180,7 +180,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
 
     @Override
     public List<String> getEventNames() {
-        return new ArrayList<String>(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<String>();
+        fSelectedEvents = new ArrayList<>();
         if (fIsTracepoints) {
             fIsAllTracepoints = fTracepointsViewer.getChecked(fProviderGroup);
-            Set<String> set = new HashSet<String>();
+            Set<String> set = new HashSet<>();
             Object[] checkedElements = fTracepointsViewer.getCheckedElements();
             for (int i = 0; i < checkedElements.length; i++) {
                 ITraceControlComponent component = (ITraceControlComponent)checkedElements[i];
index b82653d80034de7a1dc8f2921b62101c54581d2b..69ce02f7dc124ef799b1fd788902c6899f474d8d 100644 (file)
@@ -112,7 +112,7 @@ public class ImportDialog extends Dialog implements IImportDialog {
     /**
      * List of traces to import
      */
-    private final List<ImportFileInfo> fTraces = new ArrayList<ImportFileInfo>();
+    private final List<ImportFileInfo> fTraces = new ArrayList<>();
     /**
      * Selection index in project combo box.
      */
@@ -144,7 +144,7 @@ public class ImportDialog extends Dialog implements IImportDialog {
 
     @Override
     public List<ImportFileInfo> getTracePathes() {
-        List<ImportFileInfo> retList = new ArrayList<ImportFileInfo>();
+        List<ImportFileInfo> 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<IProject>();
-        List<String> projectNames = new ArrayList<String>();
+        fProjects = new ArrayList<>();
+        List<String> projectNames = new ArrayList<>();
 
         for (IProject project : TraceUtils.getOpenedTmfProjects()) {
             fProjects.add(project);
index f3e8d375f1608c591b97b4825148621cf51fd3da..dc4a2ac1b0e04ce0d6aaf971ed7cf2696e99f913 100644 (file)
@@ -87,7 +87,7 @@ public class AssignEventHandler extends BaseControlViewHandler {
                     Exception error = null;
 
                     try {
-                        List<String> eventNames = new ArrayList<String>();
+                        List<String> eventNames = new ArrayList<>();
                         List<BaseEventComponent> events = param.getEvents();
                         // Create list of event names
                         for (Iterator<BaseEventComponent> iterator = events.iterator(); iterator.hasNext();) {
@@ -127,7 +127,7 @@ public class AssignEventHandler extends BaseControlViewHandler {
 
     @Override
     public boolean isEnabled() {
-        ArrayList<BaseEventComponent> events = new ArrayList<BaseEventComponent>();
+        ArrayList<BaseEventComponent> events = new ArrayList<>();
         TraceSessionComponent[] sessions = null;
         Boolean isKernel = null;
 
@@ -225,7 +225,7 @@ public class AssignEventHandler extends BaseControlViewHandler {
          */
         public Parameter(TraceSessionComponent[] sessions, List<BaseEventComponent> events, boolean isKernel) {
             fSessions = Arrays.copyOf(sessions, sessions.length);
-            fEvents = new ArrayList<BaseEventComponent>();
+            fEvents = new ArrayList<>();
             fEvents.addAll(events);
             fIsKernel = isKernel;
         }
index 44406c63ef0ac6d24eddbf589d0e6e47b1825c26..eb99ff056d46bb9e18ccf46ef215913cbdf7cd4d 100644 (file)
@@ -95,7 +95,7 @@ abstract class BaseEnableChannelHandler extends BaseControlViewHandler {
                 protected IStatus run(IProgressMonitor monitor) {
                     Exception error = null;
 
-                    List<String> channelNames = new ArrayList<String>();
+                    List<String> channelNames = new ArrayList<>();
                     channelNames.add(dialog.getChannelInfo().getName());
 
                     try {
index 0696653c09f2dfe438312530beb00e0fa4c30343..eca1454e298bae8ac20591d2a51b95c097eccf36 100644 (file)
@@ -97,7 +97,7 @@ public abstract class ChangeChannelStateHandler extends BaseControlViewHandler {
 
                         if (kernelDomain != null) {
                             session = (TraceSessionComponent)kernelDomain.getParent();
-                            List<String> channelNames = new ArrayList<String>();
+                            List<String> channelNames = new ArrayList<>();
                             for (Iterator<TraceChannelComponent> 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<String> channelNames = new ArrayList<String>();
+                            List<String> channelNames = new ArrayList<>();
                             for (Iterator<TraceChannelComponent> 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<TraceChannelComponent> kernelChannels = new ArrayList<TraceChannelComponent>();
-        List<TraceChannelComponent> ustChannels = new ArrayList<TraceChannelComponent>();
+        List<TraceChannelComponent> kernelChannels = new ArrayList<>();
+        List<TraceChannelComponent> 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<TraceChannelComponent> kernelChannels, List<TraceChannelComponent> ustChannels) {
             fKernelDomain = kernelDomain;
             fUstDomain = ustDomain;
-            fKernelChannels = new ArrayList<TraceChannelComponent>();
+            fKernelChannels = new ArrayList<>();
             fKernelChannels.addAll(kernelChannels);
-            fUstChannels = new ArrayList<TraceChannelComponent>();
+            fUstChannels = new ArrayList<>();
             fUstChannels.addAll(ustChannels);
         }
 
index e4c65f845c69dcdd8bf072d8e7be423b1fb5e855..5268d8901807e928692dd5572798aae086638d66 100644 (file)
@@ -96,7 +96,7 @@ public abstract class ChangeEventStateHandler extends BaseControlViewHandler {
                         boolean isAll = false;
                         if (param.getChannel() != null) {
                             session = param.getChannel().getSession();
-                            List<String> eventNames = new ArrayList<String>();
+                            List<String> eventNames = new ArrayList<>();
                             List<TraceEventComponent> events = param.getEvents();
 
                             for (Iterator<TraceEventComponent> 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<TraceEventComponent> events = new ArrayList<TraceEventComponent>();
+        List<TraceEventComponent> 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<TraceEventComponent> fEvents = new ArrayList<TraceEventComponent>();
+        private final List<TraceEventComponent> fEvents = new ArrayList<>();
 
         /**
          * Constructor
index 74d846fe815f771df88e4660668f2ba09b2694ad..6af69ae501dc398025df4abf5a3154bac49e7479 100644 (file)
@@ -47,7 +47,7 @@ public abstract class ChangeSessionStateHandler extends BaseControlViewHandler {
     /**
      * The list of session components the command is to be executed on.
      */
-    protected List<TraceSessionComponent> fSessions = new ArrayList<TraceSessionComponent>();
+    protected List<TraceSessionComponent> fSessions = new ArrayList<>();
 
     // ------------------------------------------------------------------------
     // Accessors
@@ -86,7 +86,7 @@ public abstract class ChangeSessionStateHandler extends BaseControlViewHandler {
         fLock.lock();
         try {
 
-            final List<TraceSessionComponent> sessions = new ArrayList<TraceSessionComponent>();
+            final List<TraceSessionComponent> 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<TraceSessionComponent> sessions = new ArrayList<TraceSessionComponent>(0);
+        List<TraceSessionComponent> sessions = new ArrayList<>(0);
 
         // Check if one or more session are selected
         ISelection selection = page.getSelection(ControlView.ID);
index 3f250754ffcb3a1805ee49ed00ff01be203d2833..654296f3ffbc8107c7e7230c7ad9aaaaaf204866 100644 (file)
@@ -50,7 +50,7 @@ public class DestroySessionHandler extends BaseControlViewHandler {
     /**
      * The list of session components the command is to be executed on.
      */
-    private final List<TraceSessionComponent> fSessions = new ArrayList<TraceSessionComponent>();
+    private final List<TraceSessionComponent> fSessions = new ArrayList<>();
 
     // ------------------------------------------------------------------------
     // Operations
index ce15e5d5124a4c9e05beb7d9d3916b7bfac8eae5..15457f989ab4b5f053f12cc9363cbcda7ec061ae 100644 (file)
@@ -147,8 +147,8 @@ public class NewConnectionHandler extends BaseControlViewHandler {
 
     private static IHost[] getSuitableHosts() {
         // need shells and files
-        ArrayList<IHost> result = new ArrayList<IHost>();
-        ArrayList<IHost> shellConnections = new ArrayList<IHost>(
+        ArrayList<IHost> result = new ArrayList<>();
+        ArrayList<IHost> shellConnections = new ArrayList<>(
                 Arrays.asList(RSECorePlugin.getTheSystemRegistry()
                         .getHostsBySubSystemConfigurationCategory("shells"))); //$NON-NLS-1$
 
index 40046a7c9fe791a0244b4a04db85d3529c2cb543..2a31724b504fd16f9a1ca9d86d11fb3489a885a5 100644 (file)
@@ -46,7 +46,7 @@ public class SnaphshotHandler extends BaseControlViewHandler {
     /**
      * The list of session components the command is to be executed on.
      */
-    protected List<TraceSessionComponent> fSessions = new ArrayList<TraceSessionComponent>();
+    protected List<TraceSessionComponent> fSessions = new ArrayList<>();
 
     // ------------------------------------------------------------------------
     // Operations
@@ -57,7 +57,7 @@ public class SnaphshotHandler extends BaseControlViewHandler {
         fLock.lock();
         try {
             // Make a copy for thread safety
-            final List<TraceSessionComponent> sessions = new ArrayList<TraceSessionComponent>();
+            final List<TraceSessionComponent> 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<TraceSessionComponent> sessions = new ArrayList<TraceSessionComponent>(0);
+        List<TraceSessionComponent> sessions = new ArrayList<>(0);
 
         // Check if one session is selected
         ISelection selection = page.getSelection(ControlView.ID);
index 30123cce005e4265987b6c8b8715174425461c6a..62af533938b6fdbfb866b982a1437706e91d8314 100644 (file)
@@ -105,7 +105,7 @@ public class TraceChannelComponent extends TraceControlComponent {
     public void setChannelInfo(IChannelInfo channelInfo) {
         fChannelInfo = channelInfo;
         IEventInfo[] events = fChannelInfo.getEvents();
-        List<ITraceControlComponent> eventComponents = new ArrayList<ITraceControlComponent>();
+        List<ITraceControlComponent> eventComponents = new ArrayList<>();
         for (int i = 0; i < events.length; i++) {
             TraceEventComponent event = null;
             if (events[i].getClass() == ProbeEventInfo.class) {
index 823ae100075dbd66fa45acf6ee1cc318db71c896..1ed92d6fc42ea5f862973a051cf4ebb719f61e8c 100644 (file)
@@ -58,7 +58,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     /**
      * The list if children components.
      */
-    private final List<ITraceControlComponent> fChildren = new ArrayList<ITraceControlComponent>();
+    private final List<ITraceControlComponent> fChildren = new ArrayList<>();
     /**
      * The list of listeners to be notified about changes.
      */
@@ -178,7 +178,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     @Override
     public List<ITraceControlComponent> getChildren(Class<? extends ITraceControlComponent> clazz) {
-       List<ITraceControlComponent> list = new ArrayList<ITraceControlComponent>();
+       List<ITraceControlComponent> list = new ArrayList<>();
 
        for (Iterator<ITraceControlComponent> iterator = fChildren.iterator(); iterator.hasNext();) {
            ITraceControlComponent child = iterator.next();
index f31007d9e4bd7635421c73a4940c41c535343171..da707184ec47a5e639875ee9fddb283779215190 100644 (file)
@@ -92,7 +92,7 @@ public class BaseEventPropertySource extends BasePropertySource {
 
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
-        List<IPropertyDescriptor> list = new ArrayList<IPropertyDescriptor> ();
+        List<IPropertyDescriptor> 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) {
index de98bf2ee2818ba1ece91b4af7893924bdd75c00..c23a447c722f05257e499d2c9128ffd4e6dfc668 100644 (file)
@@ -102,7 +102,7 @@ public class TraceEventPropertySource extends BasePropertySource {
 
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
-        List<IPropertyDescriptor> list = new ArrayList<IPropertyDescriptor> ();
+        List<IPropertyDescriptor> 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));
index 6811199711933e7c54c87451152a3eb656598f75..449faee229f605b3c7a3de1e01e3572989fb19e5 100644 (file)
@@ -88,7 +88,7 @@ public class TraceProbeEventPropertySource extends TraceEventPropertySource {
         IPropertyDescriptor[] superProperties = super.getPropertyDescriptors();
 
         List<IPropertyDescriptor> superList = Arrays.asList(superProperties);
-        ArrayList<IPropertyDescriptor> list = new ArrayList<IPropertyDescriptor>();
+        ArrayList<IPropertyDescriptor> list = new ArrayList<>();
         list.addAll(superList);
 
         if (fEvent instanceof TraceProbeEventComponent) {
index 283e6d4a11eb2b8f0810c1b8e8e3ac1543aba7ac..e84d5678e81d2de4264df1175d8bb5fc47266e9b 100644 (file)
@@ -109,7 +109,7 @@ public class TraceSessionPropertySource extends BasePropertySource {
 
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
-        List<IPropertyDescriptor> list = new ArrayList<IPropertyDescriptor> ();
+        List<IPropertyDescriptor> 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()) {
index 8c56874811660660af219a8665f38904da95253b..8995f577aa98337b0058f636f46f26574e2e03e0 100644 (file)
@@ -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<CommandResult> future = new FutureTask<CommandResult>(new Callable<CommandResult>() {
+            FutureTask<CommandResult> future = new FutureTask<>(new Callable<CommandResult>() {
                 @Override
                 public CommandResult call() throws IOException, CancellationException {
-                    final ArrayList<String> result = new ArrayList<String>();
+                    final ArrayList<String> result = new ArrayList<>();
 
                     synchronized (fHostShell) {
                         // Initialize return value which will be updated in isAliasEchoResult()
index ac631b2f5d8235a7f7f24c4129aa845a255c62f3..84cf52c76bf6446c7ddd25260f2a793395d13645 100644 (file)
@@ -137,7 +137,7 @@ public class LTTngControlService implements ILttngControlService {
         //
         // Use lttng list <session_name> for more details
 
-        ArrayList<String> retArray = new ArrayList<String>();
+        ArrayList<String> 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<IChannelInfo> channels = new ArrayList<IChannelInfo>();
+                ArrayList<IChannelInfo> 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<IChannelInfo> channels = new ArrayList<IChannelInfo>();
+                ArrayList<IChannelInfo> 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<IBaseEventInfo> events = new ArrayList<IBaseEventInfo>();
+        List<IBaseEventInfo> 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<IUstProviderInfo> allProviders = new ArrayList<IUstProviderInfo>();
+        List<IUstProviderInfo> 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<IBaseEventInfo> events = new ArrayList<IBaseEventInfo>();
+                List<IBaseEventInfo> 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<String> contexts = new ArrayList<String>(0);
+        List<String> 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<IEventInfo> events = new ArrayList<IEventInfo>();
+                        List<IEventInfo> 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<IFieldInfo> fields = new ArrayList<IFieldInfo>();
+                    List<IFieldInfo> fields = new ArrayList<>();
                     index = getFieldInfo(output, index, fields);
                     eventInfo.setFields(fields);
                 } else {
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 7acb262bd4f12f6409ab0cd51f5ed6c571069f76..0f49f4a53eafec80f95cc8c6d409e9263e5667f8 100644 (file)
@@ -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
index 541da9ab592fcecc7e08c9370aad2b0590f3b3df..7b73042027228d52769cf1f312411b09994ca772 100644 (file)
@@ -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,
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 749fd0eb9ab4cc173ece2dcaef913d61cecdcf9f..d344e10c270129935b8685f0ee05c81b7d5121bb 100644 (file)
@@ -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
index 4759022595cb6b8e81d1a1d3e2d44d498f8e752f..b0047c5a3496ef77591b60d42b529ae06b8f2e85 100644 (file)
@@ -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
index ae77fb4ce86afbaca6d7459762a6458321001509..5f5519ad79fd4753490acc71b5d266af09f8f514 100644 (file)
@@ -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<String> FUNC_ENTRY_EVENTS = new HashSet<String>();
+    private static final Set<String> FUNC_ENTRY_EVENTS = new HashSet<>();
 
     /** Event names indicating function exit */
-    private static final Set<String> FUNC_EXIT_EVENTS = new HashSet<String>();
+    private static final Set<String> FUNC_EXIT_EVENTS = new HashSet<>();
 
     static {
         /* This seems overkill, but it will be checked every event. Gotta go FAST! */
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 7acb262bd4f12f6409ab0cd51f5ed6c571069f76..0f49f4a53eafec80f95cc8c6d409e9263e5667f8 100644 (file)
@@ -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
index c037c5c0408144b3858635c1af522867c324bcb9..4f5e969ee4eec19567f054aac5a6b7f2ffe6930b 100644 (file)
@@ -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,
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
index 749fd0eb9ab4cc173ece2dcaef913d61cecdcf9f..d344e10c270129935b8685f0ee05c81b7d5121bb 100644 (file)
@@ -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
index 44f3bbc19876b543662c775a6ab720c150669529..327b07d733e14cbb63eb3c7bcb08a6fad98467e8 100644 (file)
@@ -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,
This page took 0.076698 seconds and 5 git commands to generate.