tmf: Switch tmf.ui.tests to Java 7 + fix warnings
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Tue, 17 Dec 2013 23:16:35 +0000 (18:16 -0500)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Thu, 19 Dec 2013 01:04:08 +0000 (20:04 -0500)
Change-Id: I9acdba36689fa95d422a96606663e936d6fcd1ca
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/19930
Tested-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
IP-Clean: Matthew Khouzam <matthew.khouzam@ericsson.com>

16 files changed:
org.eclipse.linuxtools.tmf.ui.tests/.classpath
org.eclipse.linuxtools.tmf.ui.tests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceBadlyFormedTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceInvalidTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceValidTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/TmfUml2SDSyncLoaderFilterTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java

index 6bf6b70078b7359251b2835df2149d6bb1d0633e..403a3962e1a88c6c90b53f3313d26d7820139a24 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="widgetStubs"/>
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 d364e2a652ad87daf36a85ebb382e8f96a39fd95..0578a002bf1484bb6674c78ffb13c3c9ee95e704 100644 (file)
@@ -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,
index fe96cbbaeab1ac4559dd8a8ad6c009abf4884dee..c00ed830530b0adb0c221720989279c111a43e55 100755 (executable)
@@ -124,7 +124,7 @@ public class TmfBaseStatisticsDataTest {
         treeNode = childrenTreeNode.iterator().next();
         assertEquals("getChildren", Messages.TmfStatisticsData_EventTypes, treeNode.getName());
 
-        Vector<String> keyExpected = new Vector<String>();
+        Vector<String> keyExpected = new Vector<>();
         keyExpected.add(fEvent1.getType().getName());
         keyExpected.add(fEvent3.getType().getName());
         // Getting children of a category
index d757137ebba1405b611106ac4627901efd04ae4f..cab8b0f15f0851e9a79e436783fee12e62685d82 100755 (executable)
@@ -110,7 +110,7 @@ public class TmfStatisticsTreeNodeTest {
         treeNode = childrenTreeNode.iterator().next();
         assertEquals(Messages.TmfStatisticsData_EventTypes, treeNode.getName());
 
-        Vector<String> keyExpected = new Vector<String>();
+        Vector<String> keyExpected = new Vector<>();
         keyExpected.add(fTypeId1);
         keyExpected.add(fTypeId2);
         keyExpected.add(fTypeId3);
index 98765209bea6813c870d2f2974acc962defa7f97..7a4cd61f7d84ce9d9e1ce356e98753f982becb2e 100644 (file)
@@ -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);
     }
index bb8b2d6115ad82b34d30b980519e200963989442..6798f5352b25620e95c91a7e3f52c5286e7d7308 100644 (file)
@@ -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("<trace>");
-        for (int i = 0; i < NB_EVENTS; ++i) {
-            SimpleDateFormat f = new SimpleDateFormat(TIMESTAMP_FORMAT);
-            String eventStr = "<element time=\"" + f.format(new Date(i)) + "\">message</element>\n";
-            writer.write(eventStr);
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(file));) {
+            writer.write("<trace>");
+            for (int i = 0; i < NB_EVENTS; ++i) {
+                SimpleDateFormat f = new SimpleDateFormat(TIMESTAMP_FORMAT);
+                String eventStr = "<element time=\"" + f.format(new Date(i)) + "\">message</element>\n";
+                writer.write(eventStr);
+            }
+            writer.write("</trace>");
         }
-        writer.write("</trace>");
-        writer.close();
 
         return new TestXmlTrace(file.toString(), definition, BLOCK_SIZE);
     }
index 8fa426d950367ebdbbef87afcefcf1b1d1da693f..a5e6e71c9853c9299589a894add9e284f98eb9d0 100644 (file)
@@ -42,7 +42,7 @@ public class CustomXmlTraceBadlyFormedTest extends CustomXmlTraceTest {
     @Parameters(name = "{index}: path {0}")
     public static Collection<Object[]> getFiles() {
         File[] malformedFiles = (new File(pathname)).listFiles();
-        Collection<Object[]> params = new ArrayList<Object[]>();
+        Collection<Object[]> params = new ArrayList<>();
         for (File f : malformedFiles) {
             Object[] arr = new Object[] { f.getAbsolutePath() };
             params.add(arr);
index 642b3b01274a11181c8b1b77bf46c179b5589bad..f5a1209b61ea76e2f895985fb3c22a135f42d2d4 100644 (file)
@@ -43,7 +43,7 @@ public class CustomXmlTraceInvalidTest extends CustomXmlTraceTest{
     @Parameters(name = "{index}: path {0}")
     public static Collection<Object[]> getFiles() {
         File[] invalidFiles = (new File(pathname)).listFiles();
-        Collection<Object[]> params = new ArrayList<Object[]>();
+        Collection<Object[]> params = new ArrayList<>();
         for (File f : invalidFiles) {
             Object[] arr = new Object[] { f.getAbsolutePath() };
             params.add(arr);
index 5d70f5e612029550a4d58c7268dad572845f7c78..970d66175bd843f501650a0dfdfdb0197540e3d0 100644 (file)
@@ -43,7 +43,7 @@ public class CustomXmlTraceValidTest extends CustomXmlTraceTest {
     @Parameters(name = "{index}: path {0}")
     public static Collection<Object[]> getFiles() {
         File[] validFiles = (new File(pathname)).listFiles();
-        Collection<Object[]> params = new ArrayList<Object[]>();
+        Collection<Object[]> params = new ArrayList<>();
         for (File f : validFiles) {
             Object[] arr = new Object[] { f.getAbsolutePath() };
             params.add(arr);
index d84403a164a7be277becbba660fb316f9eaa2239..90df11c93677cfafa582589ff5850191fa8ad341 100644 (file)
@@ -49,7 +49,7 @@ public class TmfUml2SDSyncLoaderFilterTest {
         fFacility.selectExperiment();
 
         /* Create Filter Criteria */
-        filterToSave = new ArrayList<FilterCriteria>();
+        filterToSave = new ArrayList<>();
         Criteria criteria = new Criteria();
         criteria.setLifeLineSelected(true);
         criteria.setExpression(IUml2SDTestConstants.FIRST_PLAYER_NAME);
index 3d342faee87e6c5304a50e25abc554291c51faeb..43a4aad19025cddd4961852efb4df7b52613227e 100644 (file)
@@ -321,7 +321,7 @@ public class Uml2SDTestFacility {
      */
     public void createFilterCriteria() {
         // Create Filter Criteria and save tme
-        final List<FilterCriteria> filterToSave = new ArrayList<FilterCriteria>();
+        final List<FilterCriteria> filterToSave = new ArrayList<>();
         Criteria criteria = new Criteria();
         criteria.setLifeLineSelected(true);
         criteria.setExpression(IUml2SDTestConstants.FIRST_PLAYER_NAME);
index 5c5cabfee3e40d1c0e077979c966f823c1bc971c..0dcba3472a8f9f48645206cb23881e3edd3f9f69 100644 (file)
@@ -54,7 +54,7 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro
 
     public SDView v;
     public int page;
-    private List<GraphNode> findResults = new ArrayList<GraphNode>();
+    private List<GraphNode> 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<GraphNode>();
+            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<GraphNode> msgs = new ArrayList<GraphNode>();
+            ArrayList<GraphNode> 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<GraphNode>();
+            msgs = new ArrayList<>();
             if (findCriteria.isAsyncMessageSelected()) {
                 for (int i = 0; i < frame.asyncMessageCount(); i++) {
                     if (findCriteria.matches(frame.getAsyncMessage(i).getName())) {
index 1553dc5a031a14f9403f3d88273112aaae6438da..1184e1c1db00de3e8795b4972e0ef2e2bd309043 100644 (file)
@@ -33,7 +33,7 @@ public class TsfImplProvider extends TimeGraphPresentationProvider {
 
        @Override
        public Map<String, String> getEventHoverToolTipInfo(ITimeEvent revent) {
-               Map<String, String> toolTipEventMsgs = new HashMap<String, String>();
+               Map<String, String> toolTipEventMsgs = new HashMap<>();
                if (revent instanceof EventImpl) {
                        toolTipEventMsgs.put("Test Tip1", "Test Value tip1");
                        toolTipEventMsgs.put("Test Tip2", "Test Value tip2");
index 4f7a7f24e52af387a81e9cd750216117a24aa859..62f6f3680c54a67d4e73f0e5c49b58d697518a9c 100644 (file)
@@ -29,7 +29,7 @@ public class TraceImpl implements ITimeGraphEntry {
     private long startTime = 0;
     private long stopTime = 1;
     private String className = "defaultClassName";
-    private Vector<ITimeEvent> traceEvents = new Vector<ITimeEvent>();
+    private Vector<ITimeEvent> traceEvents = new Vector<>();
 
     // ========================================================================
     // Constructor
index c8506e1db5554de2976efcbab884db72cfd6f345..09d122b8f8e4102e6c4f4f966cf6984527b89295 100644 (file)
@@ -135,7 +135,7 @@ public class TsfTraceAnalysisView extends ViewPart implements
 
         public TreeParent(String name) {
             super(name);
-            children = new ArrayList<TreeObject>();
+            children = new ArrayList<>();
         }
 
         public void addChild(TreeObject child) {
This page took 0.032672 seconds and 5 git commands to generate.