From cb5d5c6b50f5ce2c3cd2bb3efa9b1fa084954f8a Mon Sep 17 00:00:00 2001
From: dongkyu6 lee <dongkyu6.lee@samsung.com>
Date: Thu, 12 May 2016 17:06:08 +0900
Subject: [PATCH] [SRADA-490] Resolve issue that menu bar doesn't appear at
 Windows Env.

 - Fixed error when closing DA

Change-Id: I99b566a281a0e7a5414621aa7e6ee4beed7ee03d
---
 .../dynamicanalyzer.product                        |  2 +-
 .../dynamicanalyzer/workbench/Application.java     | 38 +++++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product b/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product
index 4fabd39..e8ed2a0 100755
--- a/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product
+++ b/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product
@@ -14,7 +14,7 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-data @noDefault
+      <programArgs>-data -clearPersistedState @noDefault
       </programArgs>
       <vmArgs>-XX:MaxPermSize=64m
 -Xms256m
diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java
index a09db05..39867d3 100644
--- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java
+++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java
@@ -62,12 +62,15 @@ public class Application implements IApplication {
 	private static final String LOG_PREFIX = "da_log_";
 	private static final int MAX_LOG_COUNT = 3;
 	private static final String LOG_LEVEL = "Log Level";
+	
+	private Display m_display;
 
 	@Override
 	public Object start(IApplicationContext context) throws Exception {
-		Display display = PlatformUI.createDisplay();
+		Object result = null;
+		m_display = PlatformUI.createDisplay();
 		// set workspace directory for dynamic analyzer
-		// this work must be done first before any other work.
+		// this work must be done first before any other work.		
 		Location instanceLoc = Platform.getInstanceLocation();
 		String path = Platform.getInstallLocation().getURL().getPath() + File.separator;
 		try {
@@ -79,7 +82,7 @@ public class Application implements IApplication {
 		// check for tizen sdk installation
 		boolean pathValidness = PathManager.checkTizenPathValidation();
 		if (pathValidness == false) {
-			DADialog dialog = new DADialog(new Shell(display), SWT.NONE);
+			DADialog dialog = new DADialog(new Shell(m_display), SWT.NONE);
 			dialog.setTitleText(WorkbenchLabels.TIZEN_SDK_PATH_ERROR_TITLE);
 			dialog.setMessage(WorkbenchLabels.TIZEN_SDK_PATH_ERROR);
 			dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
@@ -136,19 +139,30 @@ public class Application implements IApplication {
 		} else {
 			Logger.info("Already DA Running");
 			SingletonFocusManager.setFocusToDA();
-			display.dispose();
+			m_display.dispose();
 			return IApplication.EXIT_OK;
 		}
 		
-		/// Entry to AnalyzerPlugin
-		int returnCode = PlatformUI.createAndRunWorkbench(display,
-				new ApplicationWorkbenchAdvisor());
-
-		if (returnCode == PlatformUI.RETURN_RESTART) {
-			return IApplication.EXIT_RESTART;
-		} else {
-			return IApplication.EXIT_OK;
+		try {
+			/// Entry to AnalyzerPlugin
+			int returnCode = PlatformUI.createAndRunWorkbench(m_display,
+					new ApplicationWorkbenchAdvisor());
+	
+			if (returnCode == PlatformUI.RETURN_RESTART) {
+				result = IApplication.EXIT_RESTART;
+			} else {
+				result = IApplication.EXIT_OK;
+			}	
+		}
+		catch(Exception ex) {
+			ex.printStackTrace();
+		}
+		finally {
+			if (m_display != null) {
+				m_display.dispose();
+			}
 		}
+		return result;
 	}
 
 	@Override
-- 
2.7.4