From 04221c879262c41245bf4c878ee8301c11a6c75a Mon Sep 17 00:00:00 2001
From: "ggh1933.go" <ggh1933.go@samsung.com>
Date: Thu, 7 Jul 2016 11:39:50 +0900
Subject: [PATCH] [FIX]Fix windows locked long time when Launching from IDE and
 Duplicated ToolBar updating skip.

Change-Id: If948b9bb5c033ec0325889d7d11942a2ff870533
---
 .../tizen/dynamicanalyzer/ui/page/BaseView.java    | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
index 7271228..81e0a12 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
@@ -36,9 +36,11 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.ui.part.ViewPart;
 import org.tizen.dynamicanalyzer.annotation.UIMethod;
 import org.tizen.dynamicanalyzer.callback.ExecutionCallbackManager;
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.common.DAState;
 import org.tizen.dynamicanalyzer.common.PreWindowShellCloseCallback;
@@ -117,31 +119,23 @@ public class BaseView extends ViewPart {
 		// check Tizen SDK path and Platform DA checking
 		AnalyzerManager.setPlatformSDK(SettingDataManager.INSTANCE.isPlatformDA());
 
-		// initialize device connection
+		// initialize device connection.
 		DeviceManager.init();
 		DeviceManager.addDeviceListener();
 
-		Thread deviceinitthread = new Thread(new Runnable() {
-			public void run() {
-				DeviceManager.loadDevices();
-				
-				Display.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						// initialize toolbar control state
-						Toolbar.INSTANCE.updateDeviceCombo(null);
-						Toolbar.INSTANCE.updateAppCombo(true);
-					}
-				});
-			}
-		});
-		deviceinitthread.start();
 
 		// initialize binary setting
 		BinarySettingManager.getInstance().initBinarySettings();
 
 		// initialize some thread
-		IDECommunicator.startIDECommunicatorThread();
-		SideWorker.INSTANCE.start();
+		Thread IDEComthread = new Thread(new Runnable() {
+			public void run() {
+				//Start IDE communicator thread
+				IDECommunicator.startIDECommunicatorThread();
+				SideWorker.INSTANCE.start();
+			}
+		});
+		IDEComthread.start();
 		
 		// delete temp folder
 		File saveFolder = new File(PathManager.DA_TEMP_FOLDER_PATH);
@@ -160,14 +154,20 @@ public class BaseView extends ViewPart {
 			}
 		}
 		
+		// if ToolBar don't updated by DeviceListener, updating.
+		if(Toolbar.INSTANCE.getDeviceCombo().getText() != AnalyzerConstants.DEVICECOMBO_TITLE){
+			DeviceManager.loadDevices();
+			if (!Toolbar.INSTANCE.updateDeviceCombo(null)) {
+				Toolbar.INSTANCE.updateAppCombo(true);
+			}
+		}
+		
 		// Running Setting Dialog
 		Display.getDefault().asyncExec(new Runnable() {
 			@Override
-			public void run() {
+			public void run() {	
+
 				final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-				// replace Flat theme feature dialog
-				//SettingDialog dialog = new SettingDialog(shell);
-				//dialog.open();
 				FlatFeatureDialog featureDialog = new FlatFeatureDialog(shell); // FIXME
 				featureDialog.open();
 			}
-- 
2.7.4