From ab410d88ac3d72129fc571910db7cb3981f8a7b8 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 17 Dec 2013 18:16:35 -0500 Subject: [PATCH] tmf: Switch tmf.ui.tests to Java 7 + fix warnings Change-Id: I9acdba36689fa95d422a96606663e936d6fcd1ca Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/19930 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam IP-Clean: Matthew Khouzam --- org.eclipse.linuxtools.tmf.ui.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +++++----- .../META-INF/MANIFEST.MF | 2 +- .../statistics/TmfBaseStatisticsDataTest.java | 2 +- .../statistics/TmfStatisticsTreeNodeTest.java | 2 +- .../tmf/ui/tests/trace/CustomTxtIndexTest.java | 12 ++++++------ .../tmf/ui/tests/trace/CustomXmlIndexTest.java | 16 ++++++++-------- .../trace/CustomXmlTraceBadlyFormedTest.java | 2 +- .../tests/trace/CustomXmlTraceInvalidTest.java | 2 +- .../ui/tests/trace/CustomXmlTraceValidTest.java | 2 +- .../loader/TmfUml2SDSyncLoaderFilterTest.java | 2 +- .../views/uml2sd/loader/Uml2SDTestFacility.java | 2 +- .../tmf/ui/tests/uml2sd/load/TestLoaders.java | 8 ++++---- .../test/stub/adaption/TsfImplProvider.java | 2 +- .../timegraph/test/stub/model/TraceImpl.java | 2 +- .../test/stub/views/TsfTraceAnalysisView.java | 2 +- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.ui.tests/.classpath b/org.eclipse.linuxtools.tmf.ui.tests/.classpath index 6bf6b70078..403a3962e1 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/.classpath +++ b/org.eclipse.linuxtools.tmf.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs index ccd0247adc..ea5fccc222 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -24,7 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=error org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=error @@ -75,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=error org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error @@ -110,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF index d364e2a652..0578a002bf 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.tmf.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.runtime, diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java index fe96cbbaea..c00ed83053 100755 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java @@ -124,7 +124,7 @@ public class TmfBaseStatisticsDataTest { treeNode = childrenTreeNode.iterator().next(); assertEquals("getChildren", Messages.TmfStatisticsData_EventTypes, treeNode.getName()); - Vector keyExpected = new Vector(); + Vector keyExpected = new Vector<>(); keyExpected.add(fEvent1.getType().getName()); keyExpected.add(fEvent3.getType().getName()); // Getting children of a category diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java index d757137ebb..cab8b0f15f 100755 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java @@ -110,7 +110,7 @@ public class TmfStatisticsTreeNodeTest { treeNode = childrenTreeNode.iterator().next(); assertEquals(Messages.TmfStatisticsData_EventTypes, treeNode.getName()); - Vector keyExpected = new Vector(); + Vector keyExpected = new Vector<>(); keyExpected.add(fTypeId1); keyExpected.add(fTypeId2); keyExpected.add(fTypeId3); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java index 98765209be..7a4cd61f7d 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java @@ -51,13 +51,13 @@ public class CustomTxtIndexTest extends AbstractCustomTraceIndexTest { protected TestTrace createTrace() throws Exception { CustomTxtTraceDefinition definition = createDefinition(); final File file = new File(TRACE_PATH); - BufferedWriter writer = new BufferedWriter(new FileWriter(file)); - for (int i = 0; i < NB_EVENTS; ++i) { - SimpleDateFormat f = new SimpleDateFormat(TIMESTAMP_FORMAT); - String eventStr = f.format(new Date(i)) + " hello world\n"; - writer.write(eventStr); + try (BufferedWriter writer = new BufferedWriter(new FileWriter(file));) { + for (int i = 0; i < NB_EVENTS; ++i) { + SimpleDateFormat f = new SimpleDateFormat(TIMESTAMP_FORMAT); + String eventStr = f.format(new Date(i)) + " hello world\n"; + writer.write(eventStr); + } } - writer.close(); return new TestTxtTrace(file.toString(), definition, BLOCK_SIZE); } diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java index bb8b2d6115..6798f5352b 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java @@ -51,15 +51,15 @@ public class CustomXmlIndexTest extends AbstractCustomTraceIndexTest { protected TestTrace createTrace() throws Exception { CustomXmlTraceDefinition definition = createDefinition(); final File file = new File(TRACE_PATH); - BufferedWriter writer = new BufferedWriter(new FileWriter(file)); - writer.write(""); - for (int i = 0; i < NB_EVENTS; ++i) { - SimpleDateFormat f = new SimpleDateFormat(TIMESTAMP_FORMAT); - String eventStr = "message\n"; - writer.write(eventStr); + try (BufferedWriter writer = new BufferedWriter(new FileWriter(file));) { + writer.write(""); + for (int i = 0; i < NB_EVENTS; ++i) { + SimpleDateFormat f = new SimpleDateFormat(TIMESTAMP_FORMAT); + String eventStr = "message\n"; + writer.write(eventStr); + } + writer.write(""); } - writer.write(""); - writer.close(); return new TestXmlTrace(file.toString(), definition, BLOCK_SIZE); } diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceBadlyFormedTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceBadlyFormedTest.java index 8fa426d950..a5e6e71c98 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceBadlyFormedTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceBadlyFormedTest.java @@ -42,7 +42,7 @@ public class CustomXmlTraceBadlyFormedTest extends CustomXmlTraceTest { @Parameters(name = "{index}: path {0}") public static Collection getFiles() { File[] malformedFiles = (new File(pathname)).listFiles(); - Collection params = new ArrayList(); + Collection params = new ArrayList<>(); for (File f : malformedFiles) { Object[] arr = new Object[] { f.getAbsolutePath() }; params.add(arr); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceInvalidTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceInvalidTest.java index 642b3b0127..f5a1209b61 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceInvalidTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceInvalidTest.java @@ -43,7 +43,7 @@ public class CustomXmlTraceInvalidTest extends CustomXmlTraceTest{ @Parameters(name = "{index}: path {0}") public static Collection getFiles() { File[] invalidFiles = (new File(pathname)).listFiles(); - Collection params = new ArrayList(); + Collection params = new ArrayList<>(); for (File f : invalidFiles) { Object[] arr = new Object[] { f.getAbsolutePath() }; params.add(arr); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceValidTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceValidTest.java index 5d70f5e612..970d66175b 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceValidTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceValidTest.java @@ -43,7 +43,7 @@ public class CustomXmlTraceValidTest extends CustomXmlTraceTest { @Parameters(name = "{index}: path {0}") public static Collection getFiles() { File[] validFiles = (new File(pathname)).listFiles(); - Collection params = new ArrayList(); + Collection params = new ArrayList<>(); for (File f : validFiles) { Object[] arr = new Object[] { f.getAbsolutePath() }; params.add(arr); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/TmfUml2SDSyncLoaderFilterTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/TmfUml2SDSyncLoaderFilterTest.java index d84403a164..90df11c936 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/TmfUml2SDSyncLoaderFilterTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/TmfUml2SDSyncLoaderFilterTest.java @@ -49,7 +49,7 @@ public class TmfUml2SDSyncLoaderFilterTest { fFacility.selectExperiment(); /* Create Filter Criteria */ - filterToSave = new ArrayList(); + filterToSave = new ArrayList<>(); Criteria criteria = new Criteria(); criteria.setLifeLineSelected(true); criteria.setExpression(IUml2SDTestConstants.FIRST_PLAYER_NAME); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java index 3d342faee8..43a4aad190 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java @@ -321,7 +321,7 @@ public class Uml2SDTestFacility { */ public void createFilterCriteria() { // Create Filter Criteria and save tme - final List filterToSave = new ArrayList(); + final List filterToSave = new ArrayList<>(); Criteria criteria = new Criteria(); criteria.setLifeLineSelected(true); criteria.setExpression(IUml2SDTestConstants.FIRST_PLAYER_NAME); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java index 5c5cabfee3..0dcba3472a 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java @@ -54,7 +54,7 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro public SDView v; public int page; - private List findResults = new ArrayList(); + private List findResults = new ArrayList<>(); private Criteria findCriteria; private int currentFindIndex = 0; @@ -233,7 +233,7 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro return false; } if (findResults == null || findCriteria == null || !findCriteria.compareTo(toSearch)) { - findResults = new ArrayList(); + findResults = new ArrayList<>(); findCriteria = toSearch; if (findCriteria.isLifeLineSelected()) { for (int i = 0; i < frame.lifeLinesCount(); i++) { @@ -243,7 +243,7 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro } } - ArrayList msgs = new ArrayList(); + ArrayList msgs = new ArrayList<>(); if (findCriteria.isSyncMessageSelected()) { for (int i = 0; i < frame.syncMessageCount(); i++) { if (findCriteria.matches(frame.getSyncMessage(i).getName())) { @@ -264,7 +264,7 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro // findResults.addAll(Arrays.asList(temp)); // } - msgs = new ArrayList(); + msgs = new ArrayList<>(); if (findCriteria.isAsyncMessageSelected()) { for (int i = 0; i < frame.asyncMessageCount(); i++) { if (findCriteria.matches(frame.getAsyncMessage(i).getName())) { diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java index 1553dc5a03..1184e1c1db 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java @@ -33,7 +33,7 @@ public class TsfImplProvider extends TimeGraphPresentationProvider { @Override public Map getEventHoverToolTipInfo(ITimeEvent revent) { - Map toolTipEventMsgs = new HashMap(); + Map toolTipEventMsgs = new HashMap<>(); if (revent instanceof EventImpl) { toolTipEventMsgs.put("Test Tip1", "Test Value tip1"); toolTipEventMsgs.put("Test Tip2", "Test Value tip2"); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java index 4f7a7f24e5..62f6f3680c 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java @@ -29,7 +29,7 @@ public class TraceImpl implements ITimeGraphEntry { private long startTime = 0; private long stopTime = 1; private String className = "defaultClassName"; - private Vector traceEvents = new Vector(); + private Vector traceEvents = new Vector<>(); // ======================================================================== // Constructor diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java index c8506e1db5..09d122b8f8 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java @@ -135,7 +135,7 @@ public class TsfTraceAnalysisView extends ViewPart implements public TreeParent(String name) { super(name); - children = new ArrayList(); + children = new ArrayList<>(); } public void addChild(TreeObject child) { -- 2.34.1