From 2d223a34df4a52f468153ca49fb4e2a6b668a619 Mon Sep 17 00:00:00 2001
From: Francois Chouinard <fchouinard@gmail.com>
Date: Tue, 29 May 2012 16:20:18 -0400
Subject: [PATCH] Fix unnecessary @SuppressWarning and removed dead code.

---
 .../lttng/core/trace/LTTngTextTrace.java      | 30 +++++++++----------
 .../tmf/core/tests/TmfCorePluginTest.java     |  2 +-
 .../tmf/core/tests/TmfCoreTestPlugin.java     |  2 +-
 .../tests/component/TmfEventProviderTest.java |  2 +-
 .../component/TmfProviderManagerTest.java     |  2 +-
 .../tests/ctfadaptor/CtfTmfTraceTest.java     |  3 +-
 .../tmf/core/tests/event/AllTests.java        |  2 +-
 .../tmf/core/tests/request/AllTests.java      |  2 +-
 .../request/TmfCoalescedDataRequestTest.java  |  2 +-
 .../request/TmfCoalescedEventRequestTest.java |  2 +-
 .../tests/request/TmfRequestExecutorTest.java |  2 +-
 .../tmf/core/tests/trace/AllTests.java        |  2 +-
 .../TmfExperimentCheckpointIndexTest.java     |  2 +-
 .../core/tests/trace/TmfExperimentTest.java   |  2 +-
 .../tmf/core/tests/trace/TmfTraceTest.java    |  2 +-
 .../tmf/core/tests/uml2sd/AllTests.java       |  2 +-
 .../tmf/core/tests/util/AllTests.java         |  2 +-
 .../tests/stubs/component/TmfClientStub.java  |  2 +-
 .../TmfSyntheticEventProviderStub.java        |  2 +-
 19 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTextTrace.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTextTrace.java
index 9517564a2c..80d2c538db 100644
--- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTextTrace.java
+++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTextTrace.java
@@ -51,7 +51,7 @@ public class LTTngTextTrace extends TmfTrace<LttngEvent> implements ITmfEventPar
 
     private int cpuNumber = -1;
 
-    private final  boolean showDebug = false;
+//    private final  boolean showDebug = false;
 
     public LTTngTextTrace(final IResource resource, final String path) throws Exception {
         this(resource, path, true); // false);
@@ -136,11 +136,11 @@ public class LTTngTextTrace extends TmfTrace<LttngEvent> implements ITmfEventPar
             if ( skipPosition < 0 )
                 skipPosition = 0L;
 
-            if ( showDebug == true ) {
-                System.out.println("skipToPosition(Long skipPosition)"); //$NON-NLS-1$
-                System.out.println("\tSkipping to : " + skipPosition); //$NON-NLS-1$
-                System.out.println();
-            }
+//            if ( showDebug == true ) {
+//                System.out.println("skipToPosition(Long skipPosition)"); //$NON-NLS-1$
+//                System.out.println("\tSkipping to : " + skipPosition); //$NON-NLS-1$
+//                System.out.println();
+//            }
             positionToFirstEvent();
             final long nbSkipped = br.skip(skipPosition);
             if ( nbSkipped != skipPosition)
@@ -222,10 +222,10 @@ public class LTTngTextTrace extends TmfTrace<LttngEvent> implements ITmfEventPar
                 // We should check in a better way (string comparison and such) but it make the whole process to weight a lot more
                 // Conclusion : this is ugly but fast.
                 if ( tmpCurIndex < 0 ) {
-                    if ( showDebug == true ) {
-                        System.out.println("END OF FILE."); //$NON-NLS-1$
-                        System.out.println();
-                    }
+//                    if ( showDebug == true ) {
+//                        System.out.println("END OF FILE."); //$NON-NLS-1$
+//                        System.out.println();
+//                    }
                     return null;
                 }
 
@@ -376,11 +376,11 @@ public class LTTngTextTrace extends TmfTrace<LttngEvent> implements ITmfEventPar
 
                 returnedEvent = currentLttngEvent;
             }
-            else if ( showDebug == true ) {
-                System.out.println("NULL READING"); //$NON-NLS-1$
-                System.out.println();
-                returnedEvent = null;
-            }
+//            else if ( showDebug == true ) {
+//                System.out.println("NULL READING"); //$NON-NLS-1$
+//                System.out.println();
+//                returnedEvent = null;
+//            }
         }
         catch (final Exception e) {
             System.out.println("Pos is :" + nbCharRead); //$NON-NLS-1$
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java
index f6b835c14f..bd6d76e7a7 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java
@@ -21,7 +21,7 @@ import org.eclipse.linuxtools.internal.tmf.core.Activator;
  * <p>
  * Test the TMF core plug-in activator
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfCorePluginTest extends TestCase {
 
 	// ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java
index 70f8cb4059..257dcc684f 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
  * <p>
  * The activator class controls the plug-in life cycle
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfCoreTestPlugin extends Plugin {
 
     // ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
index 086b1640f8..eb254bb750 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
@@ -35,7 +35,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
  * <p>
  * Test suite for the TmfEventProvider class.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfEventProviderTest extends TestCase {
 
     TmfEventProviderStub fEventProvider;
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java
index 297b7d9c04..d78bf57401 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java
@@ -25,7 +25,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
  * <p>
  * Test suite for the TmfProviderManager class.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfProviderManagerTest extends TestCase {
 
 	public TmfProviderManagerTest(String name) {
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java
index 2b90e67895..5a309f7e4b 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
  * @author ematkho
  * @version $Revision: 1.0 $
  */
-@SuppressWarnings("restriction")
 public class CtfTmfTraceTest {
     private static final String PATH = TestParams.getPath();
 
@@ -906,4 +905,4 @@ public class CtfTmfTraceTest {
     public static void main(String[] args) {
         new org.junit.runner.JUnitCore().run(CtfTmfTraceTest.class);
     }
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java
index 2ed7b58d33..ebe265af8c 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java
@@ -21,7 +21,7 @@ import org.eclipse.linuxtools.internal.tmf.core.Activator;
 /**
  * Test suite for org.eclipse.linuxtools.tmf.core.event
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class AllTests {
 
     public static Test suite() {
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java
index 0e33340ea9..ba88793638 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java
@@ -5,7 +5,7 @@ import junit.framework.TestSuite;
 
 import org.eclipse.linuxtools.internal.tmf.core.Activator;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class AllTests {
 
 	public static Test suite() {
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java
index d5401eee4b..4bdf3bb010 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java
@@ -25,7 +25,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.request.TmfDataRequestStub;
  * <p>
  * Test suite for the TmfCoalescedDataRequest class.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfCoalescedDataRequestTest extends TestCase {
 
 	// ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
index ea10bc2ccb..6a5cde095c 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
@@ -44,7 +44,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
  * <p>
  * Test suite for the TmfCoalescedEventRequest class.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfCoalescedEventRequestTest extends TestCase {
 
 	// ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java
index 0f18f2a7e6..4ed9e99150 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java
@@ -23,7 +23,7 @@ import org.eclipse.linuxtools.internal.tmf.core.request.TmfRequestExecutor;
  *
  * Test suite for the TmfRequestExecutor class.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfRequestExecutorTest extends TestCase {
 
 	// ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java
index 169560421b..cc0f583370 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java
@@ -21,7 +21,7 @@ import org.eclipse.linuxtools.internal.tmf.core.Activator;
 /**
  * Test suite for org.eclipse.linuxtools.tmf.core.trace
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class AllTests {
 
 	public static Test suite() {
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java
index 5210f8047e..d0a55d42d3 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java
@@ -40,7 +40,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
 /**
  * Test suite for the TmfCheckpointIndexTest class.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfExperimentCheckpointIndexTest extends TestCase {
 
     // ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
index 598568f6dc..8a89d8e397 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
@@ -43,7 +43,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
 /**
  * Test suite for the TmfExperiment class (single trace).
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfExperimentTest extends TestCase {
 
     // ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
index 379ebb3c63..20d621d2ed 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
@@ -43,7 +43,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
 /**
  * Test suite for the TmfTrace class.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfTraceTest extends TestCase {
 
     // ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java
index 01d6327e36..d37cc454ef 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java
@@ -5,7 +5,7 @@ import junit.framework.TestSuite;
 
 import org.eclipse.linuxtools.internal.tmf.core.Activator;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class AllTests {
 
 	public static Test suite() {
diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java
index 1693f2aa40..1a881308ae 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java
@@ -5,7 +5,7 @@ import junit.framework.TestSuite;
 
 import org.eclipse.linuxtools.internal.tmf.core.Activator;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class AllTests {
 
 	public static Test suite() {
diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java
index 4274eff126..0107bf547e 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java
@@ -22,7 +22,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub;
  * <p>
  * TODO: Implement me. Please.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfClientStub extends TmfComponent {
 
     private TmfDataProvider<TmfSyntheticEventStub>[] fProviders;
diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java
index 664de2142f..678cb711a2 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java
@@ -31,7 +31,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub;
  * <p>
  * TODO: Implement me. Please.
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings({ "nls" })
 public class TmfSyntheticEventProviderStub extends TmfEventProvider<TmfSyntheticEventStub> {
 
     public static final int BLOCK_SIZE = 100;
-- 
2.34.1