From: Francois Chouinard <fchouinard@gmail.com>
Date: Mon, 5 Mar 2012 16:43:05 +0000 (-0500)
Subject: Fix some FindBugs warnings
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=beae214a0d2f6d59246103167916d1e70301f50a;p=deliverable%2Ftracecompass.git

Fix some FindBugs warnings
---

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java
index 852c2991d8..7f71cc4552 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java
@@ -176,7 +176,7 @@ public class TmfEventField implements ITmfEventField {
      */
     protected void setValue(Object value, ITmfEventField[] fields) {
         fValue = value;
-        fFields = fields;
+        fFields = (fields != null) ? Arrays.copyOf(fields, fields.length) : null;
         populateStructs();
     }
 
diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfSimpleTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfSimpleTimestamp.java
index 211e5b3435..10d917d28d 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfSimpleTimestamp.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfSimpleTimestamp.java
@@ -106,6 +106,14 @@ public class TmfSimpleTimestamp extends TmfTimestamp {
     // Object
     // ------------------------------------------------------------------------
 
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
     /* (non-Javadoc)
      * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#equals(java.lang.Object)
      */
diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java
index a31e276b61..568d524f6f 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java
@@ -97,10 +97,10 @@ public abstract class TmfDataRequest<T extends ITmfEvent> implements ITmfDataReq
 
     private CountDownLatch startedLatch = new CountDownLatch(1);
     private CountDownLatch completedLatch = new CountDownLatch(1);
-    private boolean fRequestRunning = false;
-    private boolean fRequestCompleted = false;
-    private boolean fRequestFailed = false;
-    private boolean fRequestCanceled = false;
+    private boolean fRequestRunning;
+    private boolean fRequestCompleted;
+    private boolean fRequestFailed;
+    private boolean fRequestCanceled;
 
     // ------------------------------------------------------------------------
     // Constructors
@@ -179,6 +179,12 @@ public abstract class TmfDataRequest<T extends ITmfEvent> implements ITmfDataReq
         fBlockSize = blockSize;
         fExecType = execType;
         fNbRead = 0;
+
+        fRequestRunning = false;
+        fRequestCompleted = false;
+        fRequestFailed = false;
+        fRequestCanceled = false;
+
         if (Tracer.isRequestTraced())
             Tracer.traceRequest(this, "created"); //$NON-NLS-1$
     }
@@ -341,7 +347,7 @@ public abstract class TmfDataRequest<T extends ITmfEvent> implements ITmfDataReq
      * to handle these conditions.
      */
     @Override
-    public void handleCompleted() {
+    public synchronized void handleCompleted() {
         if (fRequestFailed) {
             handleFailure();
         } else if (fRequestCanceled) {
diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
index c0da9149f9..4996cd1be4 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
@@ -204,7 +204,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
      * @see org.eclipse.linuxtools.tmf.stream.ITmfEventStream#getNbEvents()
      */
     @Override
-    public long getNbEvents() {
+    public synchronized long getNbEvents() {
         return fNbEvents;
     }
 
@@ -323,8 +323,9 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
      * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools.tmf.event.TmfTimestamp)
      */
     @Override
-    public TmfContext seekEvent(ITmfTimestamp timestamp) {
+    public TmfContext seekEvent(ITmfTimestamp ts) {
 
+        ITmfTimestamp timestamp = ts;
         if (timestamp == null) {
             timestamp = TmfTimestamp.BigBang;
         }
@@ -342,7 +343,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
         // Position the stream at the checkpoint
         ITmfLocation<?> location;
         synchronized (fCheckpoints) {
-            if (fCheckpoints.size() > 0) {
+            if (!fCheckpoints.isEmpty()) {
                 if (index >= fCheckpoints.size()) {
                     index = fCheckpoints.size() - 1;
                 }
@@ -376,7 +377,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
         int index = (int) rank / fIndexPageSize;
         ITmfLocation<?> location;
         synchronized (fCheckpoints) {
-            if (fCheckpoints.size() == 0) {
+            if (fCheckpoints.isEmpty()) {
                 location = null;
             } else {
                 if (index >= fCheckpoints.size()) {
@@ -526,7 +527,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
                 super.handleCompleted();
             }
 
-            private void updateTrace() {
+            private synchronized void updateTrace() {
                 int nbRead = getNbRead();
                 if (nbRead != 0) {
                     fStartTime = startTime;
@@ -542,7 +543,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
             try {
                 request.waitForCompletion();
             } catch (InterruptedException e) {
-                e.printStackTrace();
+//                e.printStackTrace();
             }
     }
 
diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java
index 305f95830c..9420905b2c 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java
@@ -58,6 +58,6 @@ public class TmfTraceType {
                 typeElements.add(element);
             }
         }
-        return typeElements.toArray(new IConfigurationElement[0]);
+        return typeElements.toArray(new IConfigurationElement[typeElements.size()]);
     }
 }
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
index 87e0cbac4c..8225017ba6 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
@@ -14,7 +14,6 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java
index f045aaac96..aa5a508169 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java
@@ -580,7 +580,7 @@ public class ImportTraceWizardPage extends WizardResourceImportPage implements L
         }
 
         // Format result
-        return traceTypes.toArray(new String[0]);
+        return traceTypes.toArray(new String[traceTypes.size()]);
     }
 
     private String getCategory(IConfigurationElement ce) {