tmf: Simple warning fixes in tmf.ui and tests

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / widgets / timegraph / TimeGraphCombo.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java
index 3cf854b64a6b62d4d33d5534c23f9ec585f19240..733d2800fa230e22428737f0d93c79add4a3b373 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java
@@ -128,27 +128,24 @@ public class TimeGraphCombo extends Composite {
         public Object[] getChildren(Object parentElement) {\r
             if (parentElement instanceof ITimeGraphEntry) {\r
                 return contentProvider.getChildren(parentElement);\r
-            } else {\r
-                return new Object[0];\r
             }\r
+            return new Object[0];\r
         }\r
 \r
         @Override\r
         public Object getParent(Object element) {\r
             if (element instanceof ITimeGraphEntry) {\r
                 return contentProvider.getParent(element);\r
-            } else {\r
-                return null;\r
             }\r
+            return null;\r
         }\r
 \r
         @Override\r
         public boolean hasChildren(Object element) {\r
             if (element instanceof ITimeGraphEntry) {\r
                 return contentProvider.hasChildren(element);\r
-            } else {\r
-                return false;\r
             }\r
+            return false;\r
         }\r
     }\r
 \r
@@ -177,9 +174,8 @@ public class TimeGraphCombo extends Composite {
         public boolean isLabelProperty(Object element, String property) {\r
             if (element instanceof ITimeGraphEntry) {\r
                 return labelProvider.isLabelProperty(element, property);\r
-            } else {\r
-                return false;\r
             }\r
+            return false;\r
         }\r
 \r
         @Override\r
@@ -191,18 +187,16 @@ public class TimeGraphCombo extends Composite {
         public Image getColumnImage(Object element, int columnIndex) {\r
             if (element instanceof ITimeGraphEntry) {\r
                 return labelProvider.getColumnImage(element, columnIndex);\r
-            } else {\r
-                return null;\r
             }\r
+            return null;\r
         }\r
 \r
         @Override\r
         public String getColumnText(Object element, int columnIndex) {\r
             if (element instanceof ITimeGraphEntry) {\r
                 return labelProvider.getColumnText(element, columnIndex);\r
-            } else {\r
-                return null;\r
             }\r
+            return null;\r
         }\r
 \r
     }\r