SRADA-629: StartTraceManager.run() fixed to work in CLI mode.
authorMaria Guseva <m.guseva@samsung.com>
Fri, 20 May 2016 17:02:07 +0000 (20:02 +0300)
committerMaria Guseva <m.guseva@samsung.com>
Thu, 30 Jun 2016 05:53:41 +0000 (14:53 +0900)
Wraped UI-related parts with Global.isGUIMode() checks.
Also added debug print in StartTraceManager.setStageComplete().

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java

Change-Id: Ie592d8874cc50cce64e42d0928d4c69795407f90

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java

index f6b4180..7ed8311 100755 (executable)
@@ -115,9 +115,11 @@ public class StartTraceManager implements Runnable {
 
                @Override
                public void run() {
-                       Toolbar.INSTANCE.startTimer();
-                       UpdateViewTimer.start();
-               startDlog();
+                       if (Global.isGUIMode()) {
+                               Toolbar.INSTANCE.startTimer();
+                               UpdateViewTimer.start();
+                       }
+                       startDlog();
                }
        };
 
@@ -332,7 +334,9 @@ public class StartTraceManager implements Runnable {
                                        }
                                        setCancelProgress(STAGE.SEND_STARTMSG);
                                case START_RESOURCE_MONITOR:
-                                       Toolbar.INSTANCE.stopTimer();
+                                       if (Global.isGUIMode()) {
+                                               Toolbar.INSTANCE.stopTimer();
+                                       }
                                        UpdateViewTimer.stop();
                                        ResourceMonitor.stop();
                                        setCancelProgress(STAGE.START_RESOURCE_MONITOR);
@@ -386,9 +390,11 @@ public class StartTraceManager implements Runnable {
                                UIActionHolder.getUIAction().showWarning(result);
                        }
 
-                       // set shortcut and toolbar UI as DA state
-                       ShortCutManager.getInstance().setEnabled(true);
-                       Toolbar.INSTANCE.changeUIState(DAState.getCurrentState());
+                       if (Global.isGUIMode()) {
+                               // set shortcut and toolbar UI as DA state
+                               ShortCutManager.getInstance().setEnabled(true);
+                               Toolbar.INSTANCE.changeUIState(DAState.getCurrentState());
+                       }
                }
        }
 
@@ -405,6 +411,7 @@ public class StartTraceManager implements Runnable {
        }
 
        private void setStageComplete(STAGE st) throws InterruptedException {
+               Logger.debug("done stage: " + st);
                lastStage = st;
 
                int percent = ProgressTable.getPercent(PHASE.TRACE_START, lastStage);