Merge remote-tracking branch 'eclipse/master'

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / views / resources / ResourcesView.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
index 8fad36aca9761977edef9995ba89e718df127ed9..bbff53f0ef9a53fc4dc7b895842114eae77e1161 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
@@ -80,7 +80,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
        private Action zoomFilter;
        private Composite top;
 
-       private TmfTimeRange initTimeRange = TmfTimeRange.Null;
+       private TmfTimeRange initTimeRange = TmfTimeRange.NULL_RANGE;
 
        // private static SimpleDateFormat stimeformat = new SimpleDateFormat(
        // "yy/MM/dd HH:mm:ss");
@@ -144,7 +144,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
                TmfExperiment<?> experiment = TmfExperiment.getCurrentExperiment();
                if (experiment != null) {
                        TmfTimeRange experimentTRange = experiment.getTimeRange();
-                       if (experimentTRange != TmfTimeRange.Null) {
+                       if (experimentTRange != TmfTimeRange.NULL_RANGE) {
                                long time0 = experimentTRange.getStartTime().getValue();
                                long time1 = experimentTRange.getEndTime().getValue();
                                ParamsUpdater paramUpdater = getParamsUpdater();
@@ -502,8 +502,8 @@ public class ResourcesView extends AbsTimeUpdateView implements
                if (signal != null) {
                        TmfTimeRange experimentTRange = signal.getExperiment().getTimeRange();
 
-                       initTimeRange = TmfTimeRange.Null;
-                       if (experimentTRange != TmfTimeRange.Null) {
+                       initTimeRange = TmfTimeRange.NULL_RANGE;
+                       if (experimentTRange != TmfTimeRange.NULL_RANGE) {
                                // prepare time intervals in widget
                                ModelUpdateInit(experimentTRange, experimentTRange, signal.getSource());
 
@@ -515,10 +515,10 @@ public class ResourcesView extends AbsTimeUpdateView implements
 
        @TmfSignalHandler
        public void experimentRangeUpdated(TmfExperimentRangeUpdatedSignal signal) {
-               if (initTimeRange == TmfTimeRange.Null && signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) {
+               if (initTimeRange == TmfTimeRange.NULL_RANGE && signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) {
                        TmfTimeRange experimentTRange = signal.getRange();
 
-                       if (experimentTRange != TmfTimeRange.Null) {
+                       if (experimentTRange != TmfTimeRange.NULL_RANGE) {
                                // prepare time intervals in widget
                                ModelUpdateInit(experimentTRange, experimentTRange, signal.getSource());
 
@@ -532,7 +532,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
     public void experimentUpdated(TmfExperimentUpdatedSignal signal) {
         if (signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) {
             final TmfTimeRange range = signal.getExperiment().getTimeRange();
-            if (range != TmfTimeRange.Null) {
+            if (range != TmfTimeRange.NULL_RANGE) {
                 Display.getDefault().asyncExec(new Runnable() {
                     @Override
                     public void run() {
@@ -593,4 +593,4 @@ public class ResourcesView extends AbsTimeUpdateView implements
     protected int getProviderId() { 
         return LttngCoreProviderFactory.RESOURCE_LTTNG_SYTH_EVENT_PROVIDER; 
     }
-}
\ No newline at end of file
+}