From: Francois Chouinard <fchouinard@gmail.com>
Date: Wed, 25 Apr 2012 14:06:04 +0000 (-0400)
Subject: Fix Sonar findings for TmfEvent and TmfTrace
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=afc86f78c7ee4c24f00e401d9c6d2ee8b38bf58e;p=deliverable%2Ftracecompass.git

Fix Sonar findings for TmfEvent and TmfTrace
---

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 b76963e52c..615b30f850 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
@@ -143,7 +143,8 @@ public class TmfEventField implements ITmfEventField {
      */
     @Override
     public ITmfEventField[] getFields() {
-        return (fFields != null) ? Arrays.copyOf(fFields, fFields.length) : null;
+        ITmfEventField[] result = (fFields != null) ? Arrays.copyOf(fFields, fFields.length) : null;
+        return result;
     }
 
     /* (non-Javadoc)
diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
index b683b5c7f2..b35703d6bc 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
@@ -104,7 +104,8 @@ public class TmfEventType implements ITmfEventType {
      */
     @Override
     public String[] getFieldNames() {
-        return (fRootField != null) ? fRootField.getFieldNames() : null;
+        String[] result = (fRootField != null) ? fRootField.getFieldNames() : null;
+        return result;
     }
 
     /* (non-Javadoc)
@@ -112,7 +113,8 @@ public class TmfEventType implements ITmfEventType {
      */
     @Override
     public String getFieldName(final int index) {
-        return (fRootField != null) ? fRootField.getFieldName(index) : null;
+        String result = (fRootField != null) ? fRootField.getFieldName(index) : null;
+        return result;
     }
 
     // ------------------------------------------------------------------------
diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java
index 2b35e0a8a1..ed82a926cf 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java
@@ -274,7 +274,7 @@ public class TmfCheckpointIndexer<T extends ITmfTrace<ITmfEvent>> implements ITm
             }
         }
         final ITmfContext context = fTrace.seekEvent(location);
-        context.setRank(index * fCheckpointInterval);
+        context.setRank((long) index * fCheckpointInterval);
         return context;
     }
 
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 9695bf812d..e72dc7350d 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
@@ -298,7 +298,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
      * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getNbEvents()
      */
     @Override
-    public long getNbEvents() {
+    public synchronized long getNbEvents() {
         return fNbEvents;
     }
 
@@ -513,7 +513,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
      */
     @Override
     @SuppressWarnings("nls")
-    public String toString() {
+    public synchronized String toString() {
         return "TmfTrace [fPath=" + fPath + ", fCacheSize=" + fCacheSize
                 + ", fNbEvents=" + fNbEvents + ", fStartTime=" + fStartTime
                 + ", fEndTime=" + fEndTime + ", fStreamingInterval=" + fStreamingInterval + "]";