More fixes of static analysis warnings for UML2SD

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / views / uml2sd / core / SyncMessage.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java
index 4ebc0688ac1db1526e5893d52d65d903a8c698b5..0092bbfc4984c797cb01cced2300c4acfbb9557c 100755 (executable)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java
@@ -19,6 +19,7 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.preferences.ISDPreferences;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.preferences.SDViewPref;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SortSyncMessageComparator;
 
 /**
@@ -68,15 +69,15 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
     /**
      * The associated message return
      */
-    protected SyncMessageReturn messageReturn;
+    protected SyncMessageReturn fMessageReturn;
     /**
      * The time when the message occurs
      */
-    protected ITmfTimestamp eventTime = new TmfTimestamp();
+    protected ITmfTimestamp fEventTime = new TmfTimestamp();
     /**
      * Flag whether the message has time information available or not
      */
-    protected boolean hasTime = false;
+    protected boolean fHasTimeInfo = false;
 
     // ------------------------------------------------------------------------
     // Constructors
@@ -86,7 +87,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      * Default constructor
      */
     public SyncMessage() {
-        prefId = ISDPreferences.PREF_SYNC_MESS;
+        fPrefId = ISDPreferences.PREF_SYNC_MESS;
     }
 
     // ------------------------------------------------------------------------
@@ -182,8 +183,8 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      */
     @Override
     protected void setEventOccurrence(int occurrence) {
-        startEventOccurrence = occurrence;
-        endEventOccurrence = occurrence;
+        fStartEventOccurrence = occurrence;
+        fEndEventOccurrence = occurrence;
     }
 
     /**
@@ -192,7 +193,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      * @param message the message return to associate
      */
     protected void setMessageReturn(SyncMessageReturn message) {
-        messageReturn = message;
+        fMessageReturn = message;
     }
 
     /**
@@ -201,7 +202,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      * @return the message return
      */
     public SyncMessageReturn getMessageReturn() {
-        return messageReturn;
+        return fMessageReturn;
     }
 
     /**
@@ -210,8 +211,8 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      * @param time the time when the message occurs
      */
     public void setTime(ITmfTimestamp time) {
-        eventTime = time.clone();
-        hasTime = true;
+        fEventTime = time.clone();
+        fHasTimeInfo = true;
         if (getStartLifeline() != null && getStartLifeline().getFrame() != null) {
             getStartLifeline().getFrame().setHasTimeInfo(true);
         } else if (getEndLifeline() != null && getEndLifeline().getFrame() != null) {
@@ -225,7 +226,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      */
     @Override
     public ITmfTimestamp getEndTime() {
-        return eventTime;
+        return fEventTime;
     }
 
     /*
@@ -234,7 +235,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      */ 
     @Override
     public ITmfTimestamp getStartTime() {
-        return eventTime;
+        return fEventTime;
     }
 
     /*
@@ -243,7 +244,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      */ 
     @Override
     public boolean hasTimeInfo() {
-        return hasTime;
+        return fHasTimeInfo;
     }
 
     /*
@@ -252,12 +253,16 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
      */
     @Override
     public void draw(IGC context) {
-        if (!isVisible())
+        if (!isVisible()) {
             return;
+        }
+
+        ISDPreferences pref = SDViewPref.getInstance();
+
         // Draw it selected?
         if (!isSelected()) {
-            context.setBackground(Frame.getUserPref().getBackGroundColor(prefId));
-            context.setForeground(Frame.getUserPref().getForeGroundColor(prefId));
+            context.setBackground(pref.getBackGroundColor(fPrefId));
+            context.setForeground(pref.getForeGroundColor(fPrefId));
         }
         super.draw(context);
     }
@@ -276,7 +281,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange {
 
         // UML2 lost/found message visibility special case
         // Others visibility cases are perform in the ***common*** case
-        if ((endLifeline == null && startLifeline != null) || (endLifeline != null && startLifeline == null)) {
+        if ((fEndLifeline == null && fStartLifeline != null) || (fEndLifeline != null && fStartLifeline == null)) {
             if (x + width > getX() + getWidth() && x < getX() + getWidth()) {
                 return true;
             }