Fix Findbugs warnings
authorBernd Hufmann <bhufmann@gmail.com>
Tue, 10 Apr 2012 17:51:51 +0000 (13:51 -0400)
committerBernd Hufmann <bhufmann@gmail.com>
Tue, 10 Apr 2012 17:51:51 +0000 (13:51 -0400)
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/UstProviderInfoTest.java
org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/GetEventInfoDialogStub.java
org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/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/tests/uml2sd/trace/TmfUml2SDTestTrace.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/adaption/TsfImplProvider.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceModelImplFactory.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java

index b877ab2072a20aae55fc95fc7e6dbae00dcca283..8d10fe2973c9c6dab5d39b2c50c8c215ef4d71f3 100644 (file)
@@ -123,10 +123,6 @@ public class ProbeEventInfoTest extends TestCase {
     public void testGetAndSetter() {
         ProbeEventInfo fixture = new ProbeEventInfo("event");
         
-        // Make sure that ProbeEventInfo extends EventInfo
-        // -> so we don't need to re-test common parts
-        assertTrue(fixture instanceof EventInfo);
-        
         fixture.setAddress("0xc12344321");
         String result = fixture.getAddress();
 
index 6f96f2a404aa2359624f2c06dd90463c1c70ac72..9a7d39bd7403452573ed26c4ba63a65a74050a79 100644 (file)
@@ -53,7 +53,7 @@ public class UstProviderInfoTest extends TestCase {
         fUstProviderInfo1 = factory.getUstProviderInfo1();
         fUstProviderInfo2 = factory.getUstProviderInfo2();
         fEventInfo1 = factory.getBaseEventInfo1();
-        fEventInfo1 = factory.getBaseEventInfo2();
+        fEventInfo2 = factory.getBaseEventInfo2();
     }
 
     /**
index 97597336eb16485d0bbe4e70a4ee982147b5d6dd..ff4d8c0365dc3f24785f3d59d152db8b2560a853 100644 (file)
@@ -11,6 +11,8 @@
  **********************************************************************/
 package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs;
 
+import java.util.Arrays;
+
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IGetEventInfoDialog;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent;
@@ -38,7 +40,11 @@ public class GetEventInfoDialogStub implements IGetEventInfoDialog {
 
     @Override
     public void setSessions(TraceSessionComponent[] sessions) {
-        fSessions = sessions;
+        if (sessions != null) {
+            fSessions = Arrays.copyOf(sessions, sessions.length);
+            return;
+        }
+        fSessions = null;
     }
 
     @Override
index d106410a5af7f44dd213cfe9e6b5442b9bc45ba8..c77a2b70060eb472214a20256e7b377edb886b51 100644 (file)
@@ -88,7 +88,7 @@ public class LTTngToolsFileShell extends TestCommandShell {
      * @param scenariofile - path to scenario file
      * @throws Exception
      */
-    public void loadScenarioFile(String scenariofile) throws Exception {
+    public synchronized void loadScenarioFile(String scenariofile) throws Exception {
         fScenariofile = scenariofile;
         
         // clean up map
@@ -225,7 +225,7 @@ public class LTTngToolsFileShell extends TestCommandShell {
      */
     @SuppressWarnings("nls")
     @Override
-   public ICommandResult executeCommand(String command, IProgressMonitor monitor, boolean checkReturnValue) throws ExecutionException {
+   public synchronized ICommandResult executeCommand(String command, IProgressMonitor monitor, boolean checkReturnValue) throws ExecutionException {
         Map<String, ICommandResult> commands = fScenarioMap.get(fScenario);
 
         Matcher matcher = LTTNG_LIST_SESSION_PATTERN.matcher(command);
@@ -254,6 +254,9 @@ public class LTTngToolsFileShell extends TestCommandShell {
     // Helper methods
     // ------------------------------------------------------------------------
     private boolean isComment(String line) {
+        if (line == null) {
+            throw new RuntimeException("line is null"); //$NON-NLS-1$
+        }
         return line.matches(COMMENT_KEY);
     }
 }
index 21e4202b960413490a654065394870b773b84f5b..2c1637f8d9d172ec46f0dbaf5ed66d8b3fb0fa9b 100644 (file)
@@ -68,7 +68,7 @@ public class Uml2SDTestFacility {
     // ------------------------------------------------------------------------
     // Operations
     // ------------------------------------------------------------------------
-    public static Uml2SDTestFacility getInstance() {
+    public synchronized static Uml2SDTestFacility getInstance() {
         if (fInstance == null) {
             fInstance = new Uml2SDTestFacility();
             fInstance.init();
index 9922b20fc3f4734ef1fe791683906739ec8b006b..2170eb7ac5a94a795c1fd49c9d87171facd131e9 100644 (file)
@@ -42,22 +42,12 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro
 
     public SDView v;
     public int page;
-    protected static URL BASIC_URL = null;
-
     private List<GraphNode> findResults = new ArrayList<GraphNode>();
     private Criteria findCriteria;
     private int currentFindIndex = 0;
 
     private Frame savedFrame = null;
 
-    static {
-        try {
-            BASIC_URL = new URL("platform", "localhost", "plugin"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-        } catch (Exception E) {
-            System.err.println(E);
-        }
-    }
-
     public TestLoaders() {
         this(""); //$NON-NLS-1$
     }
@@ -422,7 +412,7 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro
         return null;
     }
 
-    public class LocalImageImpl implements IImage {
+    public static class LocalImageImpl implements IImage {
         protected Image img;
 
         public LocalImageImpl(String file) {
@@ -439,6 +429,7 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro
         public Image getResourceImage(String _name) {
             ImageDescriptor img;
             try {
+                URL BASIC_URL = new URL("platform", "localhost", "plugin");
                 URL url = new URL(BASIC_URL, (new StringBuilder("plugin/org.eclipse.linuxtools.tmf.ui/icons/")).append(_name).toString());
                 img = ImageDescriptor.createFromURL(url);
                 return img.createImage();
index efd4719a48de6a66b762aa8eb142d93eb5280bf8..d836824af2488d0760eae269d27c4298d7ef9636 100644 (file)
@@ -38,8 +38,8 @@ public class TmfUml2SDTestTrace implements ITmfEventParser<TmfEvent> {
         // Highly inefficient...
         RandomAccessFile stream = ((TmfTraceStub) eventStream).getStream();
 
-        String name = eventStream.getName();
-        name = name.substring(name.lastIndexOf('/') + 1);
+//        String name = eventStream.getName();
+//        name = name.substring(name.lastIndexOf('/') + 1);
 
         long location = 0;
         if (context != null)
index 581b6f2291768e6babb9189be5404063a65d680e..9abcddf2df6008becba34c327953ac61939fa71f 100644 (file)
@@ -100,7 +100,6 @@ public class TsfImplProvider extends TmfTimeAnalysisProvider {
        @Override\r
        public String getEventName(ITimeEvent event, boolean upper, boolean extInfo) {\r
                String name = "Unknown";\r
-               name = upper ? name : name;\r
                if (event instanceof EventImpl) {\r
                        EventImpl devent = (EventImpl) event;\r
                        name = devent.getType().toString();\r
index 3edddca6f66072a5b813d5cdf311cfbd7ce48f37..f3922c6345c08256833a1b8f25d3ec0d322eaa16 100644 (file)
@@ -61,7 +61,6 @@ public class TraceModelImplFactory {
                        long sTime = i * (long) 1E6;\r
                        trace = new TraceImpl(i, traceNames[count].name, sTime  , sTime + 20000,\r
                                        traceNames[count].groupName, traceNames[count].classNmme);\r
-                       count = i;\r
                        create5000Events(trace);\r
                        traceArr[i] = trace;\r
                }\r
@@ -228,7 +227,7 @@ public class TraceModelImplFactory {
        // ========================================================================\r
        // Inner Class\r
        // ========================================================================\r
-       private class TraceStrings {\r
+       private static class TraceStrings {\r
                public String name = "";\r
                public String classNmme = name + " class";\r
                public String groupName = "group " + classNmme;\r
index e23b4ffa90edad79fee17ce2bdc7d8609d321e30..03366cf42543b905925db94474278af042e138d4 100644 (file)
@@ -230,7 +230,7 @@ public class TsfTraceAnalysisView extends ViewPart implements
                }
        }
 
-       class ViewLabelProvider extends LabelProvider {
+       static class ViewLabelProvider extends LabelProvider {
 
                @Override
                public String getText(Object obj) {
@@ -247,7 +247,7 @@ public class TsfTraceAnalysisView extends ViewPart implements
                }
        }
 
-       class NameSorter extends ViewerSorter {
+       static class NameSorter extends ViewerSorter {
        }
 
        // ========================================================================
This page took 0.029647 seconds and 5 git commands to generate.