From: greatim Date: Tue, 4 Mar 2014 12:38:13 +0000 (+0900) Subject: [Title] refactoring 1 (mainly workbench) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=458701605dbc4da031fbd3b1c4ce23e8f61967c5;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] refactoring 1 (mainly workbench) [Desc.] [Issue] --- diff --git a/org.tizen.dynamicanalyzer.workbench/META-INF/MANIFEST.MF b/org.tizen.dynamicanalyzer.workbench/META-INF/MANIFEST.MF index 44a172e..b764387 100644 --- a/org.tizen.dynamicanalyzer.workbench/META-INF/MANIFEST.MF +++ b/org.tizen.dynamicanalyzer.workbench/META-INF/MANIFEST.MF @@ -6,10 +6,12 @@ Bundle-SymbolicName: org.tizen.dynamicanalyzer.workbench;singleton:=true Bundle-Version: 2.1.0.qualifier Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui, - org.tizen.dynamicanalyzer;bundle-version="1.0.0" + org.eclipse.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.tizen.dynamicanalyzer.workbench; +Export-Package: org.tizen.dynamicanalyzer.common.model, + org.tizen.dynamicanalyzer.common.path, + org.tizen.dynamicanalyzer.util, + org.tizen.dynamicanalyzer.workbench; uses:="org.eclipse.jface.action, org.eclipse.ui.application, org.eclipse.ui, diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/model/ExecutionCallbackManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/model/ExecutionCallbackManager.java new file mode 100644 index 0000000..6556f99 --- /dev/null +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/model/ExecutionCallbackManager.java @@ -0,0 +1,50 @@ +package org.tizen.dynamicanalyzer.common.model; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.HashMap; + +public class ExecutionCallbackManager { + private static Map> callbackMap = new HashMap>(); + + public static final String WINDOWADVISOR_POSTWINDOWOPEN = "WindowAdvisor.postWindowOpen"; + public static final String WINDOWADVISOR_PREWINDOWCLOSE = "WindowAdvisor.preWindowShellClose"; + + // make callback list and return result + public static boolean createCallbackList(String listname) { + boolean ret = false; + + List clist = callbackMap.get(listname); + if (clist == null) { + clist = new ArrayList(); + callbackMap.put(listname, clist); + ret = true; + } + + return ret; + } + + public static boolean registerCallback(String key, IExecutionCallback callback) { + boolean ret = false; + + List clist = callbackMap.get(key); + if (clist != null) { + clist.add(callback); + ret = true; + } + + return ret; + } + + public static void executeCallback(String key) { + List clist = callbackMap.get(key); + if(clist != null) { + int size = clist.size(); + for(int i = 0; i < size; i++) { + IExecutionCallback cb = clist.get(i); + cb.execute(); + } + } + } +} diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/model/IExecutionCallback.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/model/IExecutionCallback.java new file mode 100644 index 0000000..5dbce58 --- /dev/null +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/model/IExecutionCallback.java @@ -0,0 +1,8 @@ +package org.tizen.dynamicanalyzer.common.model; + +public interface IExecutionCallback { + + // main execute function + public void execute(); + +} diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathConstants.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathConstants.java new file mode 100644 index 0000000..9fdf5e4 --- /dev/null +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathConstants.java @@ -0,0 +1,50 @@ +package org.tizen.dynamicanalyzer.common.path; + +public class PathConstants { + // names + public static final String TOOLS_FOLDER_NAME = "tools"; //$NON-NLS-1$ + public static final String TOOL_FOLDER_NAME = "tool"; //$NON-NLS-1$ + public static final String TARGET_FOLDER_NAME = "target"; //$NON-NLS-1$ + public static final String DYNAMIC_ANALYZER_FOLDER_NAME = "dynamic-analyzer"; //$NON-NLS-1$ + public static final String SAVE_FOLDER_NAME = "save"; //$NON-NLS-1$ + public static final String SETTING_FOLDER_NAME = "setting"; //$NON-NLS-1$ + public static final String RPM_FOLDER_NAME = "rpms"; //$NON-NLS-1$ + public static final String PLATFORM_FOLDER_NAME = "platforms"; //$NON-NLS-1$ + public static final String LOGS_FOLDER_NAME = "logs"; //$NON-NLS-1$ + public static final String TEMP_FOLDER_NAME = "temp"; //$NON-NLS-1$ + public static final String PROJECT_INFO_FILE_NAME = "projectInfo"; //$NON-NLS-1$ + public static final String CONFIG_FOLDER_NAME = "config"; //$NON-NLS-1$ + public static final String CONFIG_FILE_NAME = "config"; //$NON-NLS-1$ + public static final String ABOUT_IDE_FOLDER_NAME = "ide"; //$NON-NLS-1$ + public static final String ABOUT_PLUGINS_FOLDER_NAME = "plugins"; //$NON-NLS-1$ + public static final String ABOUT_BASE_PLATFORM_FOLDER_NAME = "org.tizen.base.platform"; //$NON-NLS-1$ + public static final String ABOUT_WORKBENCH_FOLDER_NAME = "org.tizen.dynamicanalyzer.workbench"; //$NON-NLS-1$ + public static final String ABOUT_FILE_NAME = "about.mappings"; //$NON-NLS-1$ + + public static final String DA_DAEMON_NAME = "da_manager"; //$NON-NLS-1$ + public static final String TOOL_RECORDER_NAME = "da_event"; //$NON-NLS-1$ + + // constant related to path + public static final String TIZEN_SDK_DATA = "tizen-sdk-data";//$NON-NLS-1$ + public static final String INSTALL = "tizensdkpath"; //$NON-NLS-1$ + public static final String TIZEN_FOLDER_ROOTSTRAPS = "rootstraps"; //$NON-NLS-1$ + public static final String TIZEN_FOLDER_USR = "usr"; //$NON-NLS-1$ + public static final String TIZEN_FOLDER_INCLUDE = "include"; //$NON-NLS-1$ + public static final String TIZEN_FOLDER_OSP = "osp"; //$NON-NLS-1$ + public static final String WIN_INSTALL_NODE = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";//$NON-NLS-1$ + public static final String WIN_INSTALL_KEY = "Local AppData"; //$NON-NLS-1$ + public static final String LINUX_INSTALL_ENV = "HOME";//$NON-NLS-1$ + + // paths + public static final String DA_REMOTE_PROBE_PATH = "/home/developer/sdk_tools/da/"; //$NON-NLS-1$ + public static final String DA_REMOTE_PATH = "/home/developer/sdk_tools/da/"; //$NON-NLS-1$ + public static final String DA_REMOTE_DAEMON_BINARY_PATH = DA_REMOTE_PATH + + PathConstants.DA_DAEMON_NAME; + public static final String TOOL_REMOTE_RECORDER_BINARY_PATH = DA_REMOTE_PATH + + PathConstants.TOOL_RECORDER_NAME; + public static final String APPLICATION_LIST_PATH = "/opt/share/applications/"; //$NON-NLS-1$ + + public static final String DA_DAEMON_LOG_PATH = "/tmp/daemonlog.da"; //$NON-NLS-1$ + public static final String DA_API_MAP_PATH = "/usr/lib/da_api_map"; //$NON-NLS-1$ + +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PathManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java similarity index 50% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PathManager.java rename to org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java index dbff74c..a9149e3 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PathManager.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java @@ -24,7 +24,7 @@ * */ -package org.tizen.dynamicanalyzer.common; +package org.tizen.dynamicanalyzer.common.path; import java.io.BufferedReader; import java.io.File; @@ -34,20 +34,63 @@ import java.io.IOException; import java.io.InputStreamReader; import org.eclipse.core.runtime.Platform; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Shell; -import org.tizen.dynamicanalyzer.communicator.CommunicatorUtils; -import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; -import org.tizen.dynamicanalyzer.nl.ConfigureLabels; -import org.tizen.dynamicanalyzer.project.Project; -import org.tizen.dynamicanalyzer.resources.ImageResources; -import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; -import org.tizen.dynamicanalyzer.ui.widgets.DADialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class PathManager { private static String logPostFix = null; + /* paths */ + public static final String TIZEN_SDK_DATA_PATH = getTizenSdkDataPath(); + public static final String TIZEN_ROOT_PATH = getDefaultRoot(); + public static final String DYNAMIC_ANALYZER_INSTALL_PATH = getInstallPath(); + public static final String DYNAMIC_ANALYZER_SAVE_PATH = getSavePath(); + public static final String DYNAMIC_ANALYZER_SETTING_PATH = getBinarySettingPath(); + public static final String DYNAMIC_ANALYZER_RPM_PATH = getRPMPath(); + public static final String DYNAMIC_ANALYZER_AUTOTEST_PATH = TIZEN_SDK_DATA_PATH + + File.separator + + "test" + + File.separator + + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME; + public static final String DA_DEBUG_DATA_CHANNEL_LOG_PATH = TIZEN_SDK_DATA_PATH + + File.separator + "data.log"; + public static final String DA_DEBUG_CONTROL_CHANNEL_LOG_PATH = TIZEN_SDK_DATA_PATH + + File.separator + "control.log"; + public static final String TOOL_FOLDER_PATH = DYNAMIC_ANALYZER_INSTALL_PATH + + File.separator + PathConstants.TOOL_FOLDER_NAME; + public static final String TEMP_FOLDER_PATH = DYNAMIC_ANALYZER_SAVE_PATH + + File.separator + PathConstants.TEMP_FOLDER_NAME; + public static final String CONFIG_FOLDER_PATH = getConfigFolderPath(); + public static final String WORKBENCH_FOLDER_PATH = getWorkbenchPath(); + public static final String ABOUT_FILE_PATH = getAboutPath(); + public static final String SDB_PATH = getSdbPath(); + public static final String READELF_PATH = DYNAMIC_ANALYZER_INSTALL_PATH + + File.separator + PathConstants.TARGET_FOLDER_NAME + + File.separator; + + public static final String DA_SINGLETON_FILE_PATH = getSavePath() + + File.separator + "active_da"; //$NON-NLS-1$ + public static final String IDE_ACTIVE_PORT_PATH = getSavePath() + + File.separator + "active_da_plugin"; //$NON-NLS-1$ + public static final String IDE_ACTIVE_SAVE_PORT_PATH = getSavePath() + + File.separator + "current_active_ide_port"; //$NON-NLS-1$ + + public static final String WINDOW_ACTIVATOR_LINUX_PATH = TIZEN_ROOT_PATH + + "/tools/dynamic-analyzer/tool/windowactivator.sh";//$NON-NLS-1$ + public static final String WINDOW_ACTIVATOR_WIDOWS_PATH = TIZEN_ROOT_PATH + + "/tools/dynamic-analyzer/tool/windowactivator.bat";//$NON-NLS-1$ + public static final String WINDOW_ACTIVATOR_MACOS_PATH = TIZEN_ROOT_PATH + + "/tools/dynamic-analyzer/tool/macoswindowactivator.sh";//$NON-NLS-1$ + + /* Name & Path */ + public static final String SBI_COMMAND = TIZEN_ROOT_PATH + File.separator + + PathConstants.TOOLS_FOLDER_NAME + File.separator + + "smart-build-interface" + File.separator + "bin" + File.separator + + "sbi"; + + public static final String SDK_INFO_RELATIVE_PATH = "../../sdk.info"; //$NON-NLS-1$ + public static final String BINARY_AUTO_SAVE_PATH = getSavePath() + + File.separator + "BinarySettings.save"; + public static void setLogPostFix(String postFix) { logPostFix = postFix; } @@ -58,7 +101,7 @@ public class PathManager { public static String getRegistryValue(String node, String key) { BufferedReader br = null; - String value = CommonConstants.EMPTY; + String value = ""; String query = "reg query " + "\"" + node + "\" /v " + "\"" + key + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ try { @@ -78,7 +121,7 @@ public class PathManager { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(br); + CommonUtil.tryClose(br); } return value; } @@ -90,28 +133,19 @@ public class PathManager { defaultPath = getPathFromSdkInfoFile(true); if (null == defaultPath) { - if (AnalyzerUtil.isLinux()) { - defaultPath = System - .getenv(AnalyzerConstants.LINUX_INSTALL_ENV) - + File.separator + AnalyzerConstants.TIZEN_SDK_DATA; - } else if (AnalyzerUtil.isWin()) { - defaultPath = getRegistryValue( - AnalyzerConstants.WIN_INSTALL_NODE, - AnalyzerConstants.WIN_INSTALL_KEY) - + File.separator + AnalyzerConstants.TIZEN_SDK_DATA; - } else if (AnalyzerUtil.isMac()) { - defaultPath = System - .getenv(AnalyzerConstants.LINUX_INSTALL_ENV) - + File.separator + AnalyzerConstants.TIZEN_SDK_DATA; + if (CommonUtil.isLinux()) { + defaultPath = System.getenv(PathConstants.LINUX_INSTALL_ENV) + + File.separator + PathConstants.TIZEN_SDK_DATA; + } else if (CommonUtil.isWin()) { + defaultPath = getRegistryValue(PathConstants.WIN_INSTALL_NODE, + PathConstants.WIN_INSTALL_KEY) + + File.separator + + PathConstants.TIZEN_SDK_DATA; + } else if (CommonUtil.isMac()) { + defaultPath = System.getenv(PathConstants.LINUX_INSTALL_ENV) + + File.separator + PathConstants.TIZEN_SDK_DATA; } else { - final Shell shell = AnalyzerUtil.getWorkbenchWindow() - .getShell(); - DADialog dialog = new DADialog(shell, SWT.NONE); // FIXME - dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); - dialog.setMessage(AnalyzerLabels.OS_WARNING); - if (dialog.open() == true) { - System.exit(-1); - } + defaultPath = ""; } } @@ -127,7 +161,7 @@ public class PathManager { String path = null; path = Platform.getInstallLocation().getURL().getPath(); if (null != path && !path.isEmpty()) { - String infoPath = path + AnalyzerPaths.SDK_INFO_RELATIVE_PATH; + String infoPath = path + SDK_INFO_RELATIVE_PATH; File infoFile = new File(infoPath); if (infoFile.exists() && infoFile.isFile()) { br = new BufferedReader(new InputStreamReader( @@ -137,8 +171,7 @@ public class PathManager { line = br.readLine(); // sdk data path } if (line != null) { - retPath = line.substring(line - .indexOf(CommonConstants.EQUAL) + 1); + retPath = line.substring(line.indexOf("=") + 1); } } } @@ -166,8 +199,8 @@ public class PathManager { if (null == rootPath) { try { // case 2 : tizensdkpath - rootPath = AnalyzerPaths.TIZEN_SDK_DATA_PATH + File.separator - + AnalyzerConstants.INSTALL; + rootPath = TIZEN_SDK_DATA_PATH + File.separator + + PathConstants.INSTALL; File file = new File(rootPath); if (!file.isFile()) { return null; @@ -178,8 +211,7 @@ public class PathManager { if (null == line) { return null; } else { - return line - .substring(line.indexOf(CommonConstants.EQUAL) + 1); + return line.substring(line.indexOf("=") + 1); } } catch (IOException e) { @@ -198,31 +230,28 @@ public class PathManager { return rootPath; } - public static String getTizenHeaderSouecePath() { - String tizenHeaderSouecePath = CommonConstants.EMPTY; - if (null != getPlatform()) { - String tempPath = AnalyzerPaths.TIZEN_ROOT_PATH; + public static String getTizenHeaderSouecePath(boolean isArm, String platform) { + String tizenHeaderSouecePath = ""; + if (platform != null) { + String tempPath = TIZEN_ROOT_PATH; if (null != tempPath) { - tempPath += File.separator - + AnalyzerConstants.PLATFORM_FOLDER_NAME - + File.separator + getPlatform() + File.separator - + AnalyzerConstants.TIZEN_FOLDER_ROOTSTRAPS + tempPath += File.separator + PathConstants.PLATFORM_FOLDER_NAME + + File.separator + platform + File.separator + + PathConstants.TIZEN_FOLDER_ROOTSTRAPS + File.separator + "%s-%s-%s" + File.separator//$NON-NLS-1$ - + AnalyzerConstants.TIZEN_FOLDER_USR + File.separator - + AnalyzerConstants.TIZEN_FOLDER_INCLUDE - + File.separator + AnalyzerConstants.TIZEN_FOLDER_OSP; + + PathConstants.TIZEN_FOLDER_USR + File.separator + + PathConstants.TIZEN_FOLDER_INCLUDE + File.separator + + PathConstants.TIZEN_FOLDER_OSP; } - String currentDevie = CommonConstants.EMPTY; - if (CommunicatorUtils.isCurrentDeviceArmArch()) { + String currentDevie = ""; + if (isArm) { currentDevie = "device";//$NON-NLS-1$ } else { currentDevie = "emulator";//$NON-NLS-1$ } - String platformName = getPlatform().replaceAll( - "[^A-Za-z]", CommonConstants.EMPTY);//$NON-NLS-1$ - String platformVersion = getPlatform().replaceAll( - "[A-Za-z]", CommonConstants.EMPTY);//$NON-NLS-1$ + String platformName = platform.replaceAll("[^A-Za-z]", "");//$NON-NLS-1$ + String platformVersion = platform.replaceAll("[A-Za-z]", "");//$NON-NLS-1$ if (Double.parseDouble(platformVersion) < 2.1) { tizenHeaderSouecePath = String.format(tempPath, platformName, currentDevie, platformVersion + ".cpp");//$NON-NLS-1$ @@ -235,133 +264,113 @@ public class PathManager { } public static String getInstallPath() { - String installPath = AnalyzerPaths.TIZEN_ROOT_PATH; + String installPath = TIZEN_ROOT_PATH; if (null != installPath) { - installPath += File.separator + AnalyzerConstants.TOOLS_FOLDER_NAME + installPath += File.separator + PathConstants.TOOLS_FOLDER_NAME + File.separator - + AnalyzerConstants.DYNAMIC_ANALYZER_FOLDER_NAME; + + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME; } return installPath; } public static String getSavePath() { - String savePath = AnalyzerPaths.TIZEN_SDK_DATA_PATH; + String savePath = TIZEN_SDK_DATA_PATH; if (null != savePath) { savePath += File.separator - + AnalyzerConstants.DYNAMIC_ANALYZER_FOLDER_NAME - + File.separator + AnalyzerConstants.SAVE_FOLDER_NAME; + + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME + + File.separator + PathConstants.SAVE_FOLDER_NAME; } return savePath; } public static String getBinarySettingPath() { - String settingPath = AnalyzerPaths.TIZEN_SDK_DATA_PATH; + String settingPath = TIZEN_SDK_DATA_PATH; if (null != settingPath) { settingPath += File.separator - + AnalyzerConstants.DYNAMIC_ANALYZER_FOLDER_NAME - + File.separator + AnalyzerConstants.SETTING_FOLDER_NAME; + + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME + + File.separator + PathConstants.SETTING_FOLDER_NAME; } return settingPath; } public static String getRPMPath() { - String rpmPath = AnalyzerPaths.TIZEN_SDK_DATA_PATH; + String rpmPath = TIZEN_SDK_DATA_PATH; if (null != rpmPath) { rpmPath += File.separator - + AnalyzerConstants.DYNAMIC_ANALYZER_FOLDER_NAME - + File.separator + AnalyzerConstants.RPM_FOLDER_NAME; + + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME + + File.separator + PathConstants.RPM_FOLDER_NAME; } return rpmPath; } public static String getLogPath() { - String logPath = AnalyzerPaths.TIZEN_SDK_DATA_PATH; + String logPath = TIZEN_SDK_DATA_PATH; if (null != logPath) { logPath += File.separator - + AnalyzerConstants.DYNAMIC_ANALYZER_FOLDER_NAME - + File.separator + AnalyzerConstants.LOGS_FOLDER_NAME; + + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME + + File.separator + PathConstants.LOGS_FOLDER_NAME; } return logPath; } public static String getSdbPath() { - String path = AnalyzerPaths.TIZEN_ROOT_PATH; + String path = TIZEN_ROOT_PATH; if (null != path) { - path += File.separator + AnalyzerConstants.TOOLS_FOLDER_NAME + path += File.separator + PathConstants.TOOLS_FOLDER_NAME + File.separator + "sdb"; //$NON-NLS-1$ } return path; } - public static String getTargetPath() { - String platform = getPlatform(); + public static String getTargetPath(String platform) { if (null != platform && !platform.isEmpty()) { - return AnalyzerPaths.TIZEN_ROOT_PATH + File.separator - + AnalyzerConstants.PLATFORM_FOLDER_NAME + File.separator + return TIZEN_ROOT_PATH + File.separator + + PathConstants.PLATFORM_FOLDER_NAME + File.separator + platform + File.separator - + AnalyzerConstants.DYNAMIC_ANALYZER_FOLDER_NAME + + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME + File.separator; } else { - return AnalyzerPaths.DYNAMIC_ANALYZER_INSTALL_PATH + File.separator - + AnalyzerConstants.TARGET_FOLDER_NAME + File.separator; - } - - } - - public static String getPlatform() { - String platform = ConfigureManager.getInstance().getValue( - ConfigureLabels.PLATFORM); - if (null == platform || platform.isEmpty() - || platform.equals(ConfigureLabels.PLATFORM_ETC)) { - return null; - } else { - return platform; + return DYNAMIC_ANALYZER_INSTALL_PATH + File.separator + + PathConstants.TARGET_FOLDER_NAME + File.separator; } } - public static String getProjectInfoFile() { - Project project = AnalyzerManager.getProject(); - StringBuffer projectInfoSaveFile = new StringBuffer( - CommonConstants.EMPTY); - if (null == project || !project.isValid()) { - System.out.println("project not saved"); - } else { - if (!getSavePath().equals(CommonConstants.EMPTY)) { - projectInfoSaveFile.append(project.getSavePath()); - projectInfoSaveFile.append(File.separator).append( - AnalyzerConstants.PROJECT_INFO_FILE_NAME); - } + public static String getProjectInfoFile(String projectSavePath) { + StringBuffer projectInfoSaveFile = new StringBuffer(""); + if (!getSavePath().equals("")) { + projectInfoSaveFile.append(projectSavePath); + projectInfoSaveFile.append(File.separator).append( + PathConstants.PROJECT_INFO_FILE_NAME); } return projectInfoSaveFile.toString(); } public static String getConfigFolderPath() { - String configFolderPath = AnalyzerPaths.DYNAMIC_ANALYZER_INSTALL_PATH; + String configFolderPath = DYNAMIC_ANALYZER_INSTALL_PATH; if (null != configFolderPath) { configFolderPath += File.separator - + AnalyzerConstants.CONFIG_FOLDER_NAME; + + PathConstants.CONFIG_FOLDER_NAME; } return configFolderPath; } public static String getConfigFilePath() { - String configFilePath = AnalyzerPaths.CONFIG_FOLDER_PATH; + String configFilePath = CONFIG_FOLDER_PATH; if (null != configFilePath) { - configFilePath += File.separator - + AnalyzerConstants.CONFIG_FILE_NAME; + configFilePath += File.separator + PathConstants.CONFIG_FILE_NAME; } return configFilePath; } public static String getAboutPath() { - String aboutFolderPath = AnalyzerPaths.TIZEN_ROOT_PATH; + String aboutFolderPath = TIZEN_ROOT_PATH; if (null == aboutFolderPath) { return null; } aboutFolderPath += (File.separator - + AnalyzerConstants.ABOUT_IDE_FOLDER_NAME + File.separator + AnalyzerConstants.ABOUT_PLUGINS_FOLDER_NAME); + + PathConstants.ABOUT_IDE_FOLDER_NAME + File.separator + PathConstants.ABOUT_PLUGINS_FOLDER_NAME); File dir = new File(aboutFolderPath); String[] files; @@ -372,7 +381,7 @@ public class PathManager { public boolean accept(File dir, String name) { // TODO Auto-generated method stub return name - .contains(AnalyzerConstants.ABOUT_BASE_PLATFORM_FOLDER_NAME); + .contains(PathConstants.ABOUT_BASE_PLATFORM_FOLDER_NAME); } }); } else { @@ -384,20 +393,19 @@ public class PathManager { } String aboutFilePath = aboutFolderPath + File.separator + files[files.length - 1] + File.separator - + AnalyzerConstants.ABOUT_FILE_NAME; + + PathConstants.ABOUT_FILE_NAME; return aboutFilePath; } public static String getWorkbenchPath() { - String aboutFolderPath = AnalyzerPaths.TIZEN_ROOT_PATH; + String aboutFolderPath = TIZEN_ROOT_PATH; if (null == aboutFolderPath) { return null; } - aboutFolderPath += (File.separator - + AnalyzerConstants.TOOLS_FOLDER_NAME + File.separator - + AnalyzerConstants.DYNAMIC_ANALYZER_FOLDER_NAME - + File.separator + AnalyzerConstants.ABOUT_PLUGINS_FOLDER_NAME); + aboutFolderPath += (File.separator + PathConstants.TOOLS_FOLDER_NAME + + File.separator + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME + + File.separator + PathConstants.ABOUT_PLUGINS_FOLDER_NAME); File dir = new File(aboutFolderPath); String[] files; @@ -408,7 +416,7 @@ public class PathManager { public boolean accept(File dir, String name) { // TODO Auto-generated method stub return name - .contains(AnalyzerConstants.ABOUT_WORKBENCH_FOLDER_NAME); + .contains(PathConstants.ABOUT_WORKBENCH_FOLDER_NAME); } }); } else { @@ -424,21 +432,12 @@ public class PathManager { return aboutFilePath; } - public static void pathCheck() { - if (null == AnalyzerPaths.TIZEN_ROOT_PATH) { - final Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); - DADialog dialog = new DADialog(shell, SWT.NONE); // FIXME - dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); - dialog.setMessage(AnalyzerLabels.PATH_WARNING); - if (dialog.open() == true) { - System.exit(-1); - } + public static String getRootStrapsPath(String platform) { + if (platform != null) { + return TIZEN_ROOT_PATH + File.separator + "platforms" + + File.separator + platform + File.separator + "rootstraps"; + } else { + return ""; } } - - public static String getRootStrapsPath() { - return AnalyzerPaths.TIZEN_ROOT_PATH + File.separator + "platforms" - + File.separator + getPlatform() + File.separator - + "rootstraps"; - } } diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/CommonUtil.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/CommonUtil.java new file mode 100644 index 0000000..cc72cec --- /dev/null +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/CommonUtil.java @@ -0,0 +1,53 @@ +package org.tizen.dynamicanalyzer.util; + +import java.io.Closeable; +import java.io.IOException; +import java.net.ServerSocket; +import java.net.Socket; + +public class CommonUtil { + private static final String OS_KEY = "os.name"; //$NON-NLS-1$ + private static final String LINUX = "linux"; //$NON-NLS-1$ + private static final String MAC = "mac"; //$NON-NLS-1$ + private static final String WIN = "win"; //$NON-NLS-1$ + + public static void tryClose(final Object... closeables) { + if (null == closeables) { + return; + } + + for (Object obj : closeables) { + if (null == obj) { + continue; + } + try { + if (obj instanceof Closeable) { + ((Closeable) obj).close(); + } else if (obj instanceof Socket) { + ((Socket) obj).close(); + } else if (obj instanceof ServerSocket) { + ((ServerSocket) obj).close(); + } + } catch (final IOException e) { + e.printStackTrace(); + } + } + } + + public static boolean isLinux() { + return getOS().indexOf(LINUX) >= 0; + } + + public static boolean isMac() { + return getOS().indexOf(MAC) >= 0; + } + + public static boolean isWin() { + return getOS().indexOf(WIN) >= 0; + } + + private static String getOS() { + return System.getProperty(OS_KEY).toLowerCase(); + } + +} diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/FileUtil.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/FileUtil.java new file mode 100644 index 0000000..b831a67 --- /dev/null +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/FileUtil.java @@ -0,0 +1,45 @@ +package org.tizen.dynamicanalyzer.util; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class FileUtil { + + // delete file of given path + public static boolean deleteFile(File file) { + if (file.isDirectory()) { + String[] children = file.list(); + for (int i = 0; i < children.length; i++) { + boolean success = deleteFile(new File(file, children[i])); + if (!success) { + return false; + } + } + } + + // Directory is empty so delete + return file.delete(); + } + + // get file name list in given directory path + public static List getFilesInDir(String dirPath) { + File dir = new File(dirPath); + if (!dir.isDirectory()) { + return null; + } + + String[] fileList = dir.list(); + List list = new ArrayList(); + int fileListLength = fileList.length; + for (int i = 0; i < fileListLength; i++) { + File file = new File(dirPath + File.separator + fileList[i]); + if (!file.isDirectory()) { + list.add(fileList[i]); + } + } + + return list; + } + +} diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/WorkbenchUtil.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/WorkbenchUtil.java new file mode 100644 index 0000000..230f863 --- /dev/null +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/util/WorkbenchUtil.java @@ -0,0 +1,50 @@ +package org.tizen.dynamicanalyzer.util; + +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.ViewPart; + +public class WorkbenchUtil { + private static IWorkbenchWindow window = null; + + public static IWorkbenchWindow getWorkbenchWindow() { + if (null == window) { + Display.getDefault().syncExec(new Runnable() { + @Override + public void run() { + window = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow(); + } + }); + } + + return window; + } + + public static String getPerspectiveId() { + IWorkbenchWindow window = getWorkbenchWindow(); + + if (null != window) { + return window.getActivePage().getPerspective().getId(); + } else { + return ""; + } + } + + public static ViewPart getViewPart(String id) { + ViewPart viewpart = null; + IWorkbenchWindow window = getWorkbenchWindow(); + + if(window != null) { + IWorkbenchPage page = window.getActivePage(); + if (page != null) { + viewpart = (ViewPart) page.findView(id); + } + } + + return viewpart; + } + +} 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 c4cc9bb..3f2b597 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java @@ -44,6 +44,8 @@ import org.eclipse.osgi.service.datalocation.Location; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; +import org.tizen.dynamicanalyzer.common.path.PathManager; +import org.tizen.dynamicanalyzer.util.FileUtil; public class Application implements IApplication { private boolean STDOUT_TO_FILE = false; @@ -56,7 +58,7 @@ public class Application implements IApplication { // set workspace directory for dynamic analyzer Location instanceLoc = Platform.getInstanceLocation(); - String path = WorkbenchUtils.DYNAMIC_ANALYZER_INSTALL_PATH + String path = PathManager.DYNAMIC_ANALYZER_INSTALL_PATH + File.separator; instanceLoc.set(new URL("file", null, path), false); @@ -65,9 +67,9 @@ public class Application implements IApplication { Locale.KOREA); Date date = new Date(); String logPostFix = format.format(date); - WorkbenchUtils.setLogPostFix(logPostFix); + PathManager.setLogPostFix(logPostFix); if (STDOUT_TO_FILE) { - String logPath = WorkbenchUtils.getLogsPath(); + String logPath = PathManager.getLogPath(); File logs = new File(logPath); boolean success = true; if (!logs.exists()) { @@ -128,7 +130,7 @@ public class Application implements IApplication { } private void checkLogs(String path) { - List logFiles = WorkbenchUtils.getFiles(path); + List logFiles = FileUtil.getFilesInDir(path); if (null == logFiles) { return; } @@ -146,7 +148,7 @@ public class Application implements IApplication { File deleteFile = new File(path + File.separator + daLogFiles.get(i)); if (null != deleteFile) { - WorkbenchUtils.deleteFile(deleteFile); + FileUtil.deleteFile(deleteFile); } } } diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java index e0f9168..bbe6156 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java @@ -38,16 +38,8 @@ import org.eclipse.ui.application.ActionBarAdvisor; import org.eclipse.ui.application.IActionBarConfigurer; import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.eclipse.ui.application.WorkbenchWindowAdvisor; -import org.tizen.dynamicanalyzer.common.DASingletonFocusManager; -import org.tizen.dynamicanalyzer.common.PathManager; -import org.tizen.dynamicanalyzer.communicator.DACommunicator; -import org.tizen.dynamicanalyzer.communicator.IDECommunicator; -import org.tizen.dynamicanalyzer.handlers.ExitHandler; -import org.tizen.dynamicanalyzer.ui.toolbar.AboutDialog; -import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; -import org.tizen.dynamicanalyzer.ui.toolbar.configuration.WelcomeDialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; + +import org.tizen.dynamicanalyzer.common.model.ExecutionCallbackManager; public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { @@ -61,6 +53,11 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { public ApplicationWorkbenchWindowAdvisor( IWorkbenchWindowConfigurer configurer) { super(configurer); + + ExecutionCallbackManager + .createCallbackList(ExecutionCallbackManager.WINDOWADVISOR_POSTWINDOWOPEN); + ExecutionCallbackManager + .createCallbackList(ExecutionCallbackManager.WINDOWADVISOR_PREWINDOWCLOSE); } @Override @@ -72,9 +69,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { @Override public void createWindowContents(Shell shell) { // customize workbench window - ToolbarArea.createInstance(getWindowConfigurer(), shell); - PathManager.setLogPostFix(WorkbenchUtils.getLogPostFix()); - AboutDialog.updateBuildInfoForMac(); + LayoutManager.createComposite(getWindowConfigurer(), shell); } @Override @@ -100,26 +95,16 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { } public void postWindowOpen() { - PathManager.pathCheck(); - DASingletonFocusManager.setSaveFocusDAPid(); - IDECommunicator.startIDECommunicatorThread(); - ConfigurationDialogDataManager.getInstance().updateFeaturesValueFromConfigureManager(); - if (!ConfigurationDialogDataManager.getInstance().isShowInital()) { - final Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); - WelcomeDialog dialog = new WelcomeDialog(shell); // FIXME - dialog.open(); - } - // for pairing : da log - da daemon log - PathManager.setLogPostFix(WorkbenchUtils.getLogPostFix()); + // call the registered callback functions + ExecutionCallbackManager + .executeCallback(ExecutionCallbackManager.WINDOWADVISOR_POSTWINDOWOPEN); } public boolean preWindowShellClose() { - if (DACommunicator.isRunning()) { - DACommunicator.stopTrace(); - } - - AnalyzerUtil.executeCommand(ExitHandler.ID); - + // call the registered callback functions + ExecutionCallbackManager + .executeCallback(ExecutionCallbackManager.WINDOWADVISOR_PREWINDOWCLOSE); + return true; } } diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/LayoutManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/LayoutManager.java new file mode 100644 index 0000000..4145f3e --- /dev/null +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/LayoutManager.java @@ -0,0 +1,61 @@ +package org.tizen.dynamicanalyzer.workbench; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.application.IWorkbenchWindowConfigurer; + +public class LayoutManager { + private static Composite baseComposite = null; + private static Composite toolbarComposite = null; + + public static Composite getToolbarComposite() { + return toolbarComposite; + } + + public static void createComposite(IWorkbenchWindowConfigurer configurer, + Shell shell) { + + // Sets shell layout. + final FillLayout shellLayout = new FillLayout(); + shellLayout.marginHeight = 0; + shellLayout.marginWidth = 1; + shell.setLayout(shellLayout); + + // create base composite + baseComposite = new Composite(shell, SWT.NONE); + baseComposite.setLayout(new FormLayout()); + + // create toolbar composite + toolbarComposite = new Composite(baseComposite, SWT.NONE); + toolbarComposite.setLayout(new FormLayout()); + + // create page composite with base composite + Control page = configurer.createPageComposite(baseComposite); + + // layout each composite + FormData data = new FormData(); + data.top = new FormAttachment(0, 0); + data.left = new FormAttachment(0, 0); + data.right = new FormAttachment(100, 0); + data.height = 38; + toolbarComposite.setLayoutData(data); + + data = new FormData(); + data.top = new FormAttachment(toolbarComposite, 0, SWT.BOTTOM); + data.left = new FormAttachment(0, 0); + data.right = new FormAttachment(100, 0); + data.bottom = new FormAttachment(100, 0); + page.setLayoutData(data); + + configurer.getWindow().getShell().layout(true); + if (null != page) { + ((Composite) page).layout(true); + } + } +} diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/WorkbenchSingletonFocusManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/WorkbenchSingletonFocusManager.java index f9422ee..99a4623 100644 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/WorkbenchSingletonFocusManager.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/WorkbenchSingletonFocusManager.java @@ -34,7 +34,8 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.nio.channels.FileLock; -import org.tizen.dynamicanalyzer.common.CommonConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class WorkbenchSingletonFocusManager { private static Runtime runtime; @@ -50,15 +51,15 @@ public class WorkbenchSingletonFocusManager { if (null == strPid) { return returnStr; } - if (WorkbenchUtils.isWin()) { + if (CommonUtil.isWin()) { returnStr = new String[] { - WorkbenchUtils.WINDOW_ACTIVATOR_WIDOWS_PATH, strPid }; - } else if (WorkbenchUtils.isMac()) { + PathManager.WINDOW_ACTIVATOR_WIDOWS_PATH, strPid }; + } else if (CommonUtil.isMac()) { returnStr = new String[] { - WorkbenchUtils.WINDOW_ACTIVATOR_MACOS_PATH, strPid }; - } else if (WorkbenchUtils.isLinux()) { + PathManager.WINDOW_ACTIVATOR_MACOS_PATH, strPid }; + } else if (CommonUtil.isLinux()) { returnStr = new String[] { - WorkbenchUtils.WINDOW_ACTIVATOR_LINUX_PATH, strPid }; + PathManager.WINDOW_ACTIVATOR_LINUX_PATH, strPid }; } else { System.out.println("Failed - not Support OS"); } @@ -98,7 +99,7 @@ public class WorkbenchSingletonFocusManager { private static String getPidFromConfigFile() { String pid = null; - File configFile = new File(WorkbenchUtils.DYNAMIC_ANALYZER_INSTALL_PATH + File configFile = new File(PathManager.DYNAMIC_ANALYZER_INSTALL_PATH + File.separator + CONFIG + File.separator + CONFIG); if (!configFile.isFile()) { System.out.println("Failed get pid - exist config file"); @@ -134,7 +135,7 @@ public class WorkbenchSingletonFocusManager { private static String getPIDString(String readData) { String pid = null; - String[] splitData = readData.split(CommonConstants.EQUAL); + String[] splitData = readData.split("="); int size = splitData.length; if (2 != size) { return pid; @@ -155,7 +156,7 @@ public class WorkbenchSingletonFocusManager { FileLock fileLock = null; boolean isFileLock = false; - String saveFolderPath = WorkbenchUtils.getSavePath(); + String saveFolderPath = PathManager.getSavePath(); File daSaveFile = new File(saveFolderPath); if (!daSaveFile.isDirectory()) { diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/WorkbenchUtils.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/WorkbenchUtils.java deleted file mode 100755 index 5f425e5..0000000 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/WorkbenchUtils.java +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * Jooyoul Lee - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.dynamicanalyzer.workbench; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.Platform; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; -import org.tizen.dynamicanalyzer.common.CommonConstants; - -public class WorkbenchUtils { - - public static final String WIN_INSTALL_NODE = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";//$NON-NLS-1$ - public static final String WIN_INSTALL_KEY = "Local AppData"; //$NON-NLS-1$ - - public static final String LINUX_INSTALL_ENV = "HOME";//$NON-NLS-1$ - public static final String TIZEN_SDK_DATA = "tizen-sdk-data";//$NON-NLS-1$ - public static final String TIZEN_SDK_DATA_PATH = getTizenSdkDataPath(); - public static final String INSTALL = "tizensdkpath"; //$NON-NLS-1$ - public static final String TIZEN_ROOT_PATH = getDefaultRoot(); - public static final String TOOLS_FOLDER_NAME = "tools"; //$NON-NLS-1$ - public static final String DYNAMIC_ANALYZER_FOLDER_NAME = "dynamic-analyzer"; //$NON-NLS-1$ - public static final String SAVE_FOLDER_NAME = "save"; //$NON-NLS-1$ - public static final String LOG_FOLDER_NAME = "logs"; //$NON-NLS-1$ - public static final String DYNAMIC_ANALYZER_INSTALL_PATH = getInstallPath(); - public static final String CONFIG_FOLDER_NAME = "config"; //$NON-NLS-1$ - public static final String CONFIG_FOLDER_PATH = getConfigFolderPath(); - public static final String CONFIG_FILE_NAME = "config"; //$NON-NLS-1$ - - public static final String OS_KEY = "os.name"; //$NON-NLS-1$ - public static final String LINUX = "linux"; //$NON-NLS-1$ - public static final String MAC = "mac"; //$NON-NLS-1$ - public static final String WIN = "win"; //$NON-NLS-1$ - - public static final String WINDOW_ACTIVATOR_LINUX_PATH = TIZEN_ROOT_PATH - + "/tools/dynamic-analyzer/tool/windowactivator.sh";//$NON-NLS-1$ - public static final String WINDOW_ACTIVATOR_WIDOWS_PATH = TIZEN_ROOT_PATH - + "/tools/dynamic-analyzer/tool/windowactivator.bat";//$NON-NLS-1$ - public static final String WINDOW_ACTIVATOR_MACOS_PATH = TIZEN_ROOT_PATH - + "/tools/dynamic-analyzer/tool/macoswindowactivator.sh";//$NON-NLS-1$ - - private static String logPostFix = null; - - public static String getLogPostFix() { - return logPostFix; - } - - public static void setLogPostFix(String postFix) { - logPostFix = postFix; - } - - public static String getRegistryValue(String node, String key) { - BufferedReader br = null; - String value = ""; //$NON-NLS-1$ - - String query = "reg query " + "\"" + node + "\" /v " + "\"" + key + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - try { - Process process = Runtime.getRuntime().exec(query); - String encoding = System.getProperty("sun.jnu.encoding"); //$NON-NLS-1$ - - br = new BufferedReader(new InputStreamReader( - process.getInputStream(), encoding)); - - String line = null; - while ((line = br.readLine()) != null) { - int index = line.indexOf("REG_SZ"); //$NON-NLS-1$ - if (index >= 0) { - value = line.substring(index + "REG_SZ".length()).trim(); //$NON-NLS-1$ - } - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (br != null) { - try { - br.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - return value; - } - - public static String getTizenSdkDataPath() { - String defaultPath = null; - - // case 1 : sdk.info - defaultPath = getPathFromSdkInfoFile(true); - - if (null == defaultPath) { - if (isWin()) { - defaultPath = getRegistryValue(WIN_INSTALL_NODE, - WIN_INSTALL_KEY) + File.separator + TIZEN_SDK_DATA; - } else if (isMac()) { - defaultPath = System.getenv(LINUX_INSTALL_ENV) + File.separator - + TIZEN_SDK_DATA; - } else if (isLinux()) { - defaultPath = System.getenv(LINUX_INSTALL_ENV) + File.separator - + TIZEN_SDK_DATA; - } else { - System.out.println("Please check OS and install the Tizen SDK"); //$NON-NLS-1$ - System.exit(-1); - } - } - return defaultPath; - } - - public static String getDefaultRoot() { - String rootPath = null; - BufferedReader br = null; - String line = null; - - // case 1 : sdk.info - rootPath = getPathFromSdkInfoFile(false); - if (null == rootPath) { - try { - rootPath = TIZEN_SDK_DATA_PATH + File.separator + INSTALL; - File file = new File(rootPath); - if (!file.isFile()) { - return null; - } - br = new BufferedReader(new InputStreamReader( - new FileInputStream(file))); - line = br.readLine(); - if (null == line) { - return null; - } else { - return line.substring(line.indexOf("=") + 1); //$NON-NLS-1$ - } - } catch (IOException e) { - System.out.println("Fail to read."); //$NON-NLS-1$ - e.printStackTrace(); - } finally { - if (null != br) { - try { - br.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - return rootPath; - } - - public static String getInstallPath() { - String installPath = TIZEN_ROOT_PATH; - if (null != installPath) { - installPath += File.separator + TOOLS_FOLDER_NAME + File.separator - + DYNAMIC_ANALYZER_FOLDER_NAME; - } - return installPath; - } - - public static String getSavePath() { - String savePath = TIZEN_SDK_DATA_PATH; - if (null != savePath) { - savePath += File.separator + DYNAMIC_ANALYZER_FOLDER_NAME - + File.separator + SAVE_FOLDER_NAME; - } - return savePath; - } - - public static String getLogsPath() { - String savePath = TIZEN_SDK_DATA_PATH + File.separator - + DYNAMIC_ANALYZER_FOLDER_NAME + File.separator; - if (null != savePath) { - savePath += LOG_FOLDER_NAME; - } - return savePath; - } - - public static String getSdbPath() { - String path = TIZEN_ROOT_PATH; - if (null != path) { - path += File.separator + "tools" + File.separator + "sdb"; //$NON-NLS-1$ //$NON-NLS-2$ - } - return path; - } - - public static String getConfigFolderPath() { - String configFolderPath = DYNAMIC_ANALYZER_INSTALL_PATH; - if (null != configFolderPath) { - configFolderPath += File.separator + CONFIG_FOLDER_NAME; - } - return configFolderPath; - } - - public static String getConfigFilePath() { - String configFilePath = CONFIG_FOLDER_PATH; - - if (null != configFilePath) { - configFilePath += File.separator + CONFIG_FILE_NAME; - } - return configFilePath; - } - - public static void pathCheck() { - if (null == TIZEN_ROOT_PATH) { - System.out.println("Tizen Root Path is null"); //$NON-NLS-1$ - System.exit(-1); - } - } - - private static String getOS() { - return System.getProperty(OS_KEY).toLowerCase(); - } - - public static boolean isLinux() { - return getOS().indexOf(LINUX) >= 0; - } - - public static boolean isMac() { - return getOS().indexOf(MAC) >= 0; - } - - public static boolean isWin() { - return getOS().indexOf(WIN) >= 0; - } - - public static List getFiles(String dirPath) { - File dir = new File(dirPath); - if (!dir.isDirectory()) { - return null; - } - String[] fileList = dir.list(); - List list = new ArrayList(); - int fileListLength = fileList.length; - for (int i = 0; i < fileListLength; i++) { - File file = new File(dirPath + File.separator + fileList[i]); - if (!file.isDirectory()) { - list.add(fileList[i]); - } - } - - return list; - } - - public static boolean deleteFile(File file) { - if (file.isDirectory()) { - String[] children = file.list(); - for (int i = 0; i < children.length; i++) { - boolean success = deleteFile(new File(file, children[i])); - if (!success) { - return false; - } - } - } - // Directory is empty so delete - return file.delete(); - } - - private static String getPathFromSdkInfoFile(boolean isDataPath) { - String retPath = null; - BufferedReader br = null; - String line = null; - // case 1 : sdk.info - try { - String path = null; - path = Platform.getInstallLocation().getURL().getPath(); - if (null != path && !path.isEmpty()) { - String infoPath = path + AnalyzerPaths.SDK_INFO_RELATIVE_PATH; - File infoFile = new File(infoPath); - if (infoFile.exists() && infoFile.isFile()) { - br = new BufferedReader(new InputStreamReader( - new FileInputStream(infoFile))); - line = br.readLine(); // sdkpath - if (isDataPath) { - line = br.readLine(); // sdk data path - } - if (line != null) { - retPath = line.substring(line - .indexOf(CommonConstants.EQUAL) + 1); - } - } - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (null != br) { - try { - br.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return retPath; - } -} diff --git a/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF b/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF index 8a36043..e18af04 100644 --- a/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF +++ b/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.tizen.dynamicanalyzer.widgets;bundle-version="1.0.0" + org.tizen.dynamicanalyzer.widgets;bundle-version="1.0.0", + org.tizen.dynamicanalyzer.workbench;bundle-version="2.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Activator: org.tizen.dynamicanalyzer.common.AnalyzerPlugin Bundle-ActivationPolicy: lazy diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java index e722e15..1c50625 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java @@ -37,48 +37,18 @@ public class AnalyzerConstants { public static final String DA_VERSION_OLD = "2.2"; /* folder names */ - public static final String TOOLS_FOLDER_NAME = "tools"; //$NON-NLS-1$ - public static final String TOOL_FOLDER_NAME = "tool"; //$NON-NLS-1$ - public static final String TARGET_FOLDER_NAME = "target"; //$NON-NLS-1$ - public static final String DYNAMIC_ANALYZER_FOLDER_NAME = "dynamic-analyzer"; //$NON-NLS-1$ - public static final String SAVE_FOLDER_NAME = "save"; //$NON-NLS-1$ - public static final String SETTING_FOLDER_NAME = "setting"; //$NON-NLS-1$ - public static final String RPM_FOLDER_NAME = "rpms"; //$NON-NLS-1$ - public static final String PLATFORM_FOLDER_NAME = "platforms"; //$NON-NLS-1$ - public static final String LOGS_FOLDER_NAME = "logs"; //$NON-NLS-1$ - public static final String TEMP_FOLDER_NAME = "temp"; //$NON-NLS-1$ public static final String TEMP_FOLDER_RUN_PREFIX = ".RUN"; //$NON-NLS-1$ public static final String IMAGE_FOLDER_NAME = "img"; //$NON-NLS-1$ public static final String SMALL_IMAGE_FOLDER_NAME = "small"; //$NON-NLS-1$ public static final String ICON_WORKBENCH_FOLDER_NAME = "icons"; //$NON-NLS-1$ public static final String XML_FOLDER_NAME = "xml"; //$NON-NLS-1$ - public static final String PROJECT_INFO_FILE_NAME = "projectInfo"; //$NON-NLS-1$ - public static final String CONFIG_FOLDER_NAME = "config"; //$NON-NLS-1$ - public static final String CONFIG_FILE_NAME = "config"; //$NON-NLS-1$ - public static final String TIZEN_SDK_DATA = "tizen-sdk-data";//$NON-NLS-1$ - public static final String INSTALL = "tizensdkpath"; //$NON-NLS-1$ - public static final String ABOUT_IDE_FOLDER_NAME = "ide"; //$NON-NLS-1$ - public static final String ABOUT_PLUGINS_FOLDER_NAME = "plugins"; //$NON-NLS-1$ - public static final String ABOUT_BASE_PLATFORM_FOLDER_NAME = "org.tizen.base.platform"; //$NON-NLS-1$ - public static final String ABOUT_WORKBENCH_FOLDER_NAME = "org.tizen.dynamicanalyzer.workbench"; //$NON-NLS-1$ - public static final String ABOUT_FILE_NAME = "about.mappings"; //$NON-NLS-1$ public static final String LICENSE_FILE_NAME = "license"; //$NON-NLS-1$ public static final String USER_INTERFACE_API_LIST_FILE_NAME = "user_interface_api_list"; //$NON-NLS-1$ - public static final String TIZEN_FOLDER_ROOTSTRAPS = "rootstraps"; //$NON-NLS-1$ - public static final String TIZEN_FOLDER_USR = "usr"; //$NON-NLS-1$ - public static final String TIZEN_FOLDER_INCLUDE = "include"; //$NON-NLS-1$ - public static final String TIZEN_FOLDER_OSP = "osp"; //$NON-NLS-1$ public static final String API_NAME_FILE_NAME = "apis"; //$NON-NLS-1$ - public static final String DA_DAEMON_NAME = "da_manager"; //$NON-NLS-1$ - public static final String TOOL_RECORDER_NAME = "da_event"; //$NON-NLS-1$ public static final String READELF_BIN = "readelf"; //$NON-NLS-1$ - public static final String WIN_INSTALL_NODE = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";//$NON-NLS-1$ - public static final String WIN_INSTALL_KEY = "Local AppData"; //$NON-NLS-1$ - public static final String LINUX_INSTALL_ENV = "HOME";//$NON-NLS-1$ - public static final String VERSION_NAME = "version"; //$NON-NLS-1$ public static final String DATABASE_NAME = "da.trace"; //$NON-NLS-1$ public static final String DEFAULT_IMAGE_NAME = "noImage.jpg"; //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java index 40c3cc4..dffda31 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java @@ -57,6 +57,7 @@ import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.ImageListSortComparator; @@ -347,7 +348,7 @@ public class AnalyzerManager { } public static DAPageComposite getCurrentPage() { - BaseView bv = (BaseView) AnalyzerUtil.getViewPart(BaseView.ID); + BaseView bv = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); return bv.getTopComposite(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPaths.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPaths.java deleted file mode 100644 index 9243f10..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPaths.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * Jooyoul Lee - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ -package org.tizen.dynamicanalyzer.common; - -import java.io.File; - -public class AnalyzerPaths { - /* paths */ - public static final String TIZEN_SDK_DATA_PATH = PathManager - .getTizenSdkDataPath(); - public static final String TIZEN_ROOT_PATH = PathManager.getDefaultRoot(); - public static final String DYNAMIC_ANALYZER_INSTALL_PATH = PathManager - .getInstallPath(); - public static final String DYNAMIC_ANALYZER_SAVE_PATH = PathManager - .getSavePath(); - public static final String DYNAMIC_ANALYZER_SETTING_PATH = PathManager - .getBinarySettingPath(); - public static final String DYNAMIC_ANALYZER_RPM_PATH = PathManager - .getRPMPath(); - public static final String DYNAMIC_ANALYZER_AUTOTEST_PATH = TIZEN_SDK_DATA_PATH - + File.separator - + "test" - + File.separator - + AnalyzerConstants.DYNAMIC_ANALYZER_FOLDER_NAME; - public static final String DA_DEBUG_DATA_CHANNEL_LOG_PATH = TIZEN_SDK_DATA_PATH - + File.separator + "data.log"; - public static final String DA_DEBUG_CONTROL_CHANNEL_LOG_PATH = TIZEN_SDK_DATA_PATH - + File.separator + "control.log"; - public static final String TOOL_FOLDER_PATH = DYNAMIC_ANALYZER_INSTALL_PATH - + File.separator + AnalyzerConstants.TOOL_FOLDER_NAME; - public static final String TEMP_FOLDER_PATH = DYNAMIC_ANALYZER_SAVE_PATH - + File.separator + AnalyzerConstants.TEMP_FOLDER_NAME; - public static final String CONFIG_FOLDER_PATH = PathManager - .getConfigFolderPath(); - public static final String WORKBENCH_FOLDER_PATH = PathManager - .getWorkbenchPath(); - public static final String ABOUT_FILE_PATH = PathManager.getAboutPath(); - public static final String SDB_PATH = PathManager.getSdbPath(); - public static final String READELF_PATH = DYNAMIC_ANALYZER_INSTALL_PATH - + File.separator + AnalyzerConstants.TARGET_FOLDER_NAME - + File.separator; - public static final String TARGET_PATH = PathManager.getTargetPath(); - - public static final String DA_SINGLETON_FILE_PATH = PathManager - .getSavePath() + File.separator + "active_da"; //$NON-NLS-1$ - public static final String IDE_ACTIVE_PORT_PATH = PathManager.getSavePath() - + File.separator + "active_da_plugin"; //$NON-NLS-1$ - public static final String IDE_ACTIVE_SAVE_PORT_PATH = PathManager - .getSavePath() + File.separator + "current_active_ide_port"; //$NON-NLS-1$ - - public static final String WINDOW_ACTIVATOR_LINUX_PATH = TIZEN_ROOT_PATH - + "/tools/dynamic-analyzer/tool/windowactivator.sh";//$NON-NLS-1$ - public static final String WINDOW_ACTIVATOR_WIDOWS_PATH = TIZEN_ROOT_PATH - + "/tools/dynamic-analyzer/tool/windowactivator.bat";//$NON-NLS-1$ - public static final String WINDOW_ACTIVATOR_MACOS_PATH = TIZEN_ROOT_PATH - + "/tools/dynamic-analyzer/tool/macoswindowactivator.sh";//$NON-NLS-1$ - - public static final String TIZEN_HEADER_SOUECE_PATH = PathManager - .getTizenHeaderSouecePath(); - - /* Name & Path */ - public static final String DA_REMOTE_PROBE_PATH = "/home/developer/sdk_tools/da/"; //$NON-NLS-1$ - public static final String DA_REMOTE_PATH = "/home/developer/sdk_tools/da/"; //$NON-NLS-1$ - public static final String DA_REMOTE_DAEMON_BINARY_PATH = DA_REMOTE_PATH - + AnalyzerConstants.DA_DAEMON_NAME; - public static final String TOOL_REMOTE_RECORDER_BINARY_PATH = DA_REMOTE_PATH - + AnalyzerConstants.TOOL_RECORDER_NAME; - public static final String APPLICATION_LIST_PATH = "/opt/share/applications/"; //$NON-NLS-1$ - - public static final String DA_DAEMON_LOG_PATH = "/tmp/daemonlog.da"; //$NON-NLS-1$ - public static final String DA_API_MAP_PATH = "/usr/lib/da_api_map"; //$NON-NLS-1$ - // public static final String DA_API_MAP_PATH = "/usr/lib/da_api_map"; //$NON-NLS-1$ - public static final String SBI_COMMAND = TIZEN_ROOT_PATH + File.separator - + AnalyzerConstants.TOOLS_FOLDER_NAME + File.separator - + "smart-build-interface" + File.separator + "bin" + File.separator - + "sbi"; - - public static final String SDK_INFO_RELATIVE_PATH = "../../sdk.info"; //$NON-NLS-1$ - public static final String BINARY_AUTO_SAVE_PATH = PathManager - .getSavePath() + File.separator + "BinarySettings.save"; -} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java index 68c2e57..28e0785 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java @@ -37,6 +37,7 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.listeners.AnalyzerPartListener; import org.tizen.dynamicanalyzer.listeners.AnalyzerPerspectiveListener; import org.tizen.dynamicanalyzer.sql.SqlManager; @@ -83,7 +84,7 @@ public class AnalyzerPlugin extends AbstractUIPlugin { **/ if (delete) { SqlManager.getInstance().closeConnection(); - File tempDir = new File(AnalyzerPaths.TEMP_FOLDER_PATH); + File tempDir = new File(PathManager.TEMP_FOLDER_PATH); if (tempDir.isDirectory() && tempDir.exists()) { if (AnalyzerUtil.deleteFile(tempDir)) { System.out.println("Delete temp folder!"); //$NON-NLS-1$ @@ -104,7 +105,7 @@ public class AnalyzerPlugin extends AbstractUIPlugin { IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); window.addPerspectiveListener(new AnalyzerPerspectiveListener()); - File saveFolder = new File(AnalyzerPaths.TEMP_FOLDER_PATH); + File saveFolder = new File(PathManager.TEMP_FOLDER_PATH); if (saveFolder.exists()) { if (AnalyzerUtil.deleteFile(saveFolder)) { System.out.println("delete temp folder"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerShellCommands.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerShellCommands.java index fea7909..f47e60a 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerShellCommands.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerShellCommands.java @@ -26,6 +26,8 @@ package org.tizen.dynamicanalyzer.common; +import org.tizen.dynamicanalyzer.common.path.PathConstants; + public class AnalyzerShellCommands { @@ -34,7 +36,7 @@ public class AnalyzerShellCommands { public static final String CMD_APPLICATION_LIST = "/usr/bin/pkginfo --listpkg"; public static final String CMD_UPLOAD_FILE_LIST = "du -b " + //$NON-NLS-1$ - AnalyzerPaths.DA_REMOTE_PATH + AnalyzerConstants.READELF_BIN; + PathConstants.DA_REMOTE_PATH + AnalyzerConstants.READELF_BIN; public static final String DACOMMAND_KILL_MANAGER = "da killmanager"; public static final String DACOMMAND_KILL_APP = "da killapp"; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/CommonConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/CommonConstants.java index 8736403..120c949 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/CommonConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/CommonConstants.java @@ -80,12 +80,6 @@ public class CommonConstants { public static final String ARM_ARCH = "arm"; //$NON-NLS-1$ public static final String X86_ARCH = "x86"; //$NON-NLS-1$ - /* OS */ - public static final String OS_KEY = "os.name"; //$NON-NLS-1$ - public static final String LINUX = "linux"; //$NON-NLS-1$ - public static final String MAC = "mac"; //$NON-NLS-1$ - public static final String WIN = "win"; //$NON-NLS-1$ - public final static int SHORT_SIZE = Short.SIZE / Byte.SIZE; public final static int INT_SIZE = Integer.SIZE / Byte.SIZE; public final static int LONG_SIZE = Long.SIZE / Byte.SIZE; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASingletonFocusManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASingletonFocusManager.java index cf39c07..1444888 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASingletonFocusManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASingletonFocusManager.java @@ -32,12 +32,14 @@ import java.lang.management.RuntimeMXBean; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class DASingletonFocusManager { private static String pid = null; @@ -72,17 +74,17 @@ public class DASingletonFocusManager { String strPid = ConfigureManager.getInstance().getValue( ConfigureLabels.SINGLETON_FOCUS_DA_PID); - if (AnalyzerUtil.isWin()) { + if (CommonUtil.isWin()) { returnStr = new String[] { - AnalyzerPaths.WINDOW_ACTIVATOR_WIDOWS_PATH, strPid }; - } else if (AnalyzerUtil.isMac()) { + PathManager.WINDOW_ACTIVATOR_WIDOWS_PATH, strPid }; + } else if (CommonUtil.isMac()) { returnStr = new String[] { - AnalyzerPaths.WINDOW_ACTIVATOR_MACOS_PATH, strPid }; - } else if (AnalyzerUtil.isLinux()) { + PathManager.WINDOW_ACTIVATOR_MACOS_PATH, strPid }; + } else if (CommonUtil.isLinux()) { returnStr = new String[] { - AnalyzerPaths.WINDOW_ACTIVATOR_LINUX_PATH, strPid }; + PathManager.WINDOW_ACTIVATOR_LINUX_PATH, strPid }; } else { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); DADialog warning = new DADialog(shell, SWT.NONE); warning.setMessage(AnalyzerLabels.OS_WARNING); warning.setIcon(ImageResources.DIALOG_WARNING_ICON); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java new file mode 100644 index 0000000..f15273f --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java @@ -0,0 +1,20 @@ +package org.tizen.dynamicanalyzer.common; + +import org.eclipse.swt.widgets.Shell; +import org.tizen.dynamicanalyzer.common.model.IExecutionCallback; +import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.configuration.WelcomeDialog; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; + +public class PostWindowOpenCallback implements IExecutionCallback { + + @Override + public void execute() { + if (!ConfigurationDialogDataManager.getInstance().isShowInital()) { + final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); + WelcomeDialog dialog = new WelcomeDialog(shell); // FIXME + dialog.open(); + } + } + +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java new file mode 100644 index 0000000..e586557 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java @@ -0,0 +1,19 @@ +package org.tizen.dynamicanalyzer.common; + +import org.tizen.dynamicanalyzer.common.model.IExecutionCallback; +import org.tizen.dynamicanalyzer.communicator.DACommunicator; +import org.tizen.dynamicanalyzer.handlers.ExitHandler; +import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; + +public class PreWindowShellCloseCallback implements IExecutionCallback { + + @Override + public void execute() { + if (DACommunicator.isRunning()) { + DACommunicator.stopTrace(); + } + + AnalyzerUtil.executeCommand(ExitHandler.ID); + } + +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java index 78531f1..759fb1e 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java @@ -54,7 +54,7 @@ import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class Communicator22 extends BaseCommunicator { @@ -409,7 +409,7 @@ public class Communicator22 extends BaseCommunicator { } public void closeSocket() { - AnalyzerUtil.tryClose(dataReader, dataWriter, dataSock, controlReader, + CommonUtil.tryClose(dataReader, dataWriter, dataSock, controlReader, controlWriter, controlSock); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java index 981aa97..580c317 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java @@ -40,10 +40,11 @@ import java.util.List; import org.tizen.common.sdb.command.SdbCommand; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.AnalyzerShellCommands; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.HostResult; +import org.tizen.dynamicanalyzer.common.path.PathConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.model.DeviceInfo; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.IShellOutputReceiver; @@ -91,7 +92,7 @@ public class CommunicatorUtils { public static HostResult uploadReadElf() { long readelfSize = -1; - String readelf = AnalyzerPaths.READELF_PATH; + String readelf = PathManager.READELF_PATH; HostResult result = null; if (isCurrentDeviceArmArch()) { @@ -110,7 +111,7 @@ public class CommunicatorUtils { } result = uploadFile(DACommunicator.getSelectedDevice().getIDevice(), - source, AnalyzerPaths.DA_REMOTE_PATH + source, PathConstants.DA_REMOTE_PATH + AnalyzerConstants.READELF_BIN); if (!result.isSuccess()) { return result; @@ -472,7 +473,7 @@ public class CommunicatorUtils { } public static List getApiMap(IDevice device) { - String apiFilePath = AnalyzerPaths.TEMP_FOLDER_PATH + File.separator + String apiFilePath = PathManager.TEMP_FOLDER_PATH + File.separator + device.getSerialNumber() + CommonConstants.UNDERBAR + AnalyzerConstants.API_NAME_FILE_NAME; try { @@ -486,7 +487,7 @@ public class CommunicatorUtils { } SyncResult res = CommunicatorUtils.pull(device, - AnalyzerPaths.DA_API_MAP_PATH, apiFilePath); + PathConstants.DA_API_MAP_PATH, apiFilePath); if (null != res && res.isOk()) { System.out.println("api map copying success!!");//$NON-NLS-1$ } else { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java index 9b92d83..347ce38 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java @@ -40,11 +40,11 @@ import java.util.List; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.AnalyzerShellCommands; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.HostResult; -import org.tizen.dynamicanalyzer.common.PathManager; +import org.tizen.dynamicanalyzer.common.path.PathConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.model.DeviceInfo; import org.tizen.dynamicanalyzer.project.AppInfo; import org.tizen.dynamicanalyzer.project.PackageInfo; @@ -162,9 +162,9 @@ public class DACommunicator { } public static void setNewBridge() { - if (null != AnalyzerPaths.SDB_PATH) { + if (null != PathManager.SDB_PATH) { sdbBridge = SmartDevelopmentBridge.createBridge( - AnalyzerPaths.SDB_PATH, false); + PathManager.SDB_PATH, false); sdbBridge.waitforStart(); } } @@ -635,7 +635,7 @@ public class DACommunicator { } public static void pullDaemonLog() { - final String from = AnalyzerPaths.DA_DAEMON_LOG_PATH; + final String from = PathConstants.DA_DAEMON_LOG_PATH; final String to = PathManager.getLogPath() + File.separator + DAEMONLOG_PREFIX + PathManager.getLogPostFix();//$NON-NLS-1$ SyncResult res = CommunicatorUtils.pull(from, to); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java index 560815d..ef8694a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java @@ -45,16 +45,17 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.DASingletonFocusManager; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.model.DeviceInfo; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.project.AppInfo; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class IDECommunicator implements Runnable { private static final int MAXBUFSIZE = 1024; @@ -284,7 +285,7 @@ public class IDECommunicator implements Runnable { if (null == appInfo) { Display.getDefault().syncExec(new Runnable() { public void run() { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); DADialog warning = new DADialog(shell, SWT.NONE); String name = appName; if (name.length() > APPNAME_LENGTH) { @@ -316,7 +317,7 @@ public class IDECommunicator implements Runnable { } private void popupMessage(final String message) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); DADialog warning = new DADialog(shell, SWT.NONE); warning.setMessage(message); warning.setIcon(ImageResources.DIALOG_WARNING_ICON); @@ -372,7 +373,7 @@ public class IDECommunicator implements Runnable { FileOutputStream fos = null; DataOutputStream dos = null; try { - File file = new File(AnalyzerPaths.IDE_ACTIVE_SAVE_PORT_PATH); + File file = new File(PathManager.IDE_ACTIVE_SAVE_PORT_PATH); fos = new FileOutputStream(file); dos = new DataOutputStream(fos); dos.writeInt(serverPort); @@ -385,7 +386,7 @@ public class IDECommunicator implements Runnable { bSuccess = false; e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(fos, dos); + CommonUtil.tryClose(fos, dos); } return bSuccess; } @@ -395,7 +396,7 @@ public class IDECommunicator implements Runnable { FileLock fileLock = null; boolean setFileLock = false; try { - file = new File(AnalyzerPaths.IDE_ACTIVE_PORT_PATH); + file = new File(PathManager.IDE_ACTIVE_PORT_PATH); fileLock = new RandomAccessFile(file, "rw").getChannel().tryLock(); } catch (FileNotFoundException e1) { e1.printStackTrace(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ClearHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ClearHandler.java index c59a95e..2f8470c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ClearHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ClearHandler.java @@ -37,7 +37,7 @@ import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; import org.tizen.dynamicanalyzer.ui.toolbar.StopLogProcessor; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class ClearHandler extends AbstractHandler { @@ -56,7 +56,7 @@ public class ClearHandler extends AbstractHandler { Display.getDefault().syncExec(new Runnable() { @Override public void run() { - ((BaseView) AnalyzerUtil.getViewPart(BaseView.ID)).clear(); + ((BaseView) WorkbenchUtil.getViewPart(BaseView.ID)).clear(); ToolbarArea.getInstance().clearTimer(); } }); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java index c31e756..8a58a34 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java @@ -31,7 +31,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; @@ -47,7 +47,7 @@ public class OpenTraceCompleteHandler extends AbstractHandler { DAPageComposite page = AnalyzerManager.getCurrentPage(); page.updatePage(); if (AnalyzerManager.getProject().getSavePath() - .contains(AnalyzerPaths.TEMP_FOLDER_PATH)) { + .contains(PathManager.TEMP_FOLDER_PATH)) { ToolbarArea.getInstance().setMainControlEnablement(true); } else { ToolbarArea.getInstance().setSaveButtonEnable(false); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java index 1698dca..705208c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java @@ -70,6 +70,7 @@ import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceProgressManager; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo; @@ -472,7 +473,7 @@ public class OpenTraceHandler extends AbstractHandler { } private void createWarningDialog(String message) { - final Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); final DADialog dialog = new DADialog(shell, SWT.NONE); dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); dialog.setMessage(message); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java index 2f32ae5..45b2dae 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java @@ -26,12 +26,25 @@ package org.tizen.dynamicanalyzer.listeners; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PerspectiveAdapter; +import org.tizen.dynamicanalyzer.ui.widgets.DADialog; +import org.tizen.dynamicanalyzer.common.DASingletonFocusManager; +import org.tizen.dynamicanalyzer.common.PostWindowOpenCallback; +import org.tizen.dynamicanalyzer.common.PreWindowShellCloseCallback; +import org.tizen.dynamicanalyzer.common.model.ExecutionCallbackManager; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.DACommunicator; +import org.tizen.dynamicanalyzer.communicator.IDECommunicator; +import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; +import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class AnalyzerPerspectiveListener extends PerspectiveAdapter { private static boolean init = false; @@ -47,6 +60,31 @@ public class AnalyzerPerspectiveListener extends PerspectiveAdapter { DACommunicator.loadDevices(); DACommunicator.updateToolbarDevice(); BinarySettingManager.getInstance().initBinarySettings(); + + // path check + if (null == PathManager.TIZEN_ROOT_PATH) { + final Shell shell = WorkbenchUtil.getWorkbenchWindow() + .getShell(); + DADialog dialog = new DADialog(shell, SWT.NONE); // FIXME + dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); + dialog.setMessage(AnalyzerLabels.PATH_WARNING); + if (dialog.open() == true) { + System.exit(-1); + } + } + + DASingletonFocusManager.setSaveFocusDAPid(); + IDECommunicator.startIDECommunicatorThread(); + ConfigurationDialogDataManager.getInstance() + .updateFeaturesValueFromConfigureManager(); + + ExecutionCallbackManager.registerCallback( + ExecutionCallbackManager.WINDOWADVISOR_POSTWINDOWOPEN, + new PostWindowOpenCallback()); + ExecutionCallbackManager.registerCallback( + ExecutionCallbackManager.WINDOWADVISOR_PREWINDOWCLOSE, + new PreWindowShellCloseCallback()); + init = true; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java index 85e6805..790191b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java @@ -67,7 +67,8 @@ import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class TableTooltipListener implements Listener { @@ -172,7 +173,7 @@ public class TableTooltipListener implements Listener { } private void createErrorPopup(String message) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); DADialog warning = new DADialog(shell, SWT.NONE); warning.setMessage(message); warning.setIcon(ImageResources.DIALOG_WARNING_ICON); @@ -181,7 +182,7 @@ public class TableTooltipListener implements Listener { private void createErrorTooltip(Event event, int errno) { // Creates tooltip. - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); tooltip = new Shell(shell, SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); tooltip.setBackground(ColorResources.TOOLTIP); GridLayout gridLayout = new GridLayout(); @@ -244,7 +245,7 @@ public class TableTooltipListener implements Listener { } // Creates tooltip. - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); tooltip = new Shell(shell, SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); tooltip.setBackground(ColorResources.TOOLTIP); GridLayout gridLayout = new GridLayout(); @@ -332,7 +333,7 @@ public class TableTooltipListener implements Listener { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(reader); + CommonUtil.tryClose(reader); } // Sets tooltip text. diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DeviceInfo.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DeviceInfo.java index c838588..efb3130 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DeviceInfo.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DeviceInfo.java @@ -41,7 +41,7 @@ import org.tizen.dynamicanalyzer.project.PackageInfo; import org.tizen.dynamicanalyzer.swap.channel.control.TargetInfo; import org.tizen.dynamicanalyzer.swap.communicator.Communicator30; import org.tizen.dynamicanalyzer.ui.info.snapshot.EmulatorSnapshot; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.sdblib.IDevice; public class DeviceInfo { @@ -149,12 +149,12 @@ public class DeviceInfo { } public void closeAllSocket() { - AnalyzerUtil.tryClose(controlSock, dataSock); + CommonUtil.tryClose(controlSock, dataSock); CommunicatorUtils.unfoward(CommunicatorUtils.LOCAL_PORT, remotePort); } public void releaseDataSock() { - AnalyzerUtil.tryClose(dataSock); + CommonUtil.tryClose(dataSock); } public List getApiList() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java index 907765a..e21bc99 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java @@ -40,13 +40,11 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Locale; - import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; -import org.tizen.dynamicanalyzer.common.PathManager; +import org.tizen.dynamicanalyzer.common.path.PathConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.handlers.ReplayTraceHandler; import org.tizen.dynamicanalyzer.model.DeviceInfo; @@ -58,7 +56,7 @@ import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfoPackage; import org.tizen.dynamicanalyzer.swap.model.ByteUtils; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class Project { // public static final String TABLE_NAME = "project"; @@ -297,7 +295,7 @@ public class Project { if (length > 0) { tmpAppName = tmpAppName.substring(0, MAX_FILENAME_LENGTH - 1); } - setSavePath(AnalyzerPaths.TEMP_FOLDER_PATH + File.separator + setSavePath(PathManager.TEMP_FOLDER_PATH + File.separator + tmpAppName + format.format(date)); File imgFolder = new File(getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME); @@ -428,7 +426,15 @@ public class Project { } public void saveProjectInfoFile() { - File configFile = new File(PathManager.getProjectInfoFile()); + String projectInfoFilePath = ""; + Project project = AnalyzerManager.getProject(); + if (null == project || !project.isValid()) { + System.out.println("project not saved"); + } else { + projectInfoFilePath = PathManager.getProjectInfoFile(project.getSavePath()); + } + + File configFile = new File(projectInfoFilePath); FileWriter fileWriter = null; BufferedWriter buffWriter = null; PrintWriter printWriter = null; @@ -447,7 +453,7 @@ public class Project { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(fileWriter, buffWriter, printWriter); + CommonUtil.tryClose(fileWriter, buffWriter, printWriter); } } @@ -455,7 +461,7 @@ public class Project { boolean isSuccessLoad = true; StringBuffer projectInfoSavedFile = new StringBuffer(filePath); projectInfoSavedFile.append(File.separator).append( - AnalyzerConstants.PROJECT_INFO_FILE_NAME); + PathConstants.PROJECT_INFO_FILE_NAME); File configFile = new File(projectInfoSavedFile.toString()); if (!configFile.isFile()) { isSuccessLoad = false; @@ -472,7 +478,7 @@ public class Project { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); } } return isSuccessLoad; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/FontResources.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/FontResources.java index 426b3a5..fd21425 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/FontResources.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/FontResources.java @@ -30,7 +30,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.ui.PlatformUI; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class FontResources { @@ -194,7 +194,7 @@ public class FontResources { } public static FontData[] resizeDefaultFont(int size, int mac) { - if (AnalyzerUtil.isMac()) { + if (CommonUtil.isMac()) { return resizeDefaultFont(size + mac); } return resizeDefaultFont(size); @@ -227,9 +227,9 @@ public class FontResources { public static Font getDADefaultFont() { String fontName = null; - if (AnalyzerUtil.isLinux()) { + if (CommonUtil.isLinux()) { fontName = "Dejavu Sans";//$NON-NLS-1$ - } else if (AnalyzerUtil.isWin()) { + } else if (CommonUtil.isWin()) { fontName = "Verdana";//$NON-NLS-1$ } else { return PlatformUI.getWorkbench().getDisplay().getSystemFont(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java index fadd1a4..e0d2043 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java @@ -50,6 +50,8 @@ import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialog; import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceDialog; import org.tizen.dynamicanalyzer.ui.toolbar.replayEditor.ReplayEditDialog; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomToggleButton; @@ -72,7 +74,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { Event e = (Event)event.getTrigger(); ShortCutManager instance = ShortCutManager.getInstance(); boolean enabled = instance.isEnabled(); - if (AnalyzerUtil.isMac()) { + if (CommonUtil.isMac()) { CTRL_STATE_MASK = SWT.COMMAND; } @@ -82,12 +84,12 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { if (e.keyCode == SWT.F1) { System.out.println("about"); - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); AboutDialog dialog = new AboutDialog(shell); dialog.open(); } else if (e.keyCode == SWT.F2) { System.out.println("configuration"); - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); ConfigurationDialog dialog = new ConfigurationDialog(shell); dialog.open(); } else if (e.keyCode == SWT.F3) { @@ -144,7 +146,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 111) { System.out.println("open trace"); if (!AnalyzerManager.isRunning()) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); OpenTraceDialog dialog = new OpenTraceDialog(shell); dialog.open(); } @@ -154,7 +156,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { System.out.println("save trace"); if (ToolbarArea.getInstance().getButton(ToolbarArea.SAVE_BUTTON) .isButtonEnabled()) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); SaveAsDialog dialog = new SaveAsDialog(shell); Object result = dialog.open(); if (result != null) { @@ -192,7 +194,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 101) { System.out.println("replay Edit"); if (!AnalyzerManager.isRunning()) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); ReplayEditDialog dialog = new ReplayEditDialog(shell); dialog.open(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutManager.java index ba4b7a8..3bc9459 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutManager.java @@ -27,7 +27,8 @@ package org.tizen.dynamicanalyzer.shortcut; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class ShortCutManager { @@ -55,7 +56,7 @@ public class ShortCutManager { public static String COOLBAR_AREA_VIEW_SOURCE = null; static { - if (AnalyzerUtil.isMac()) { + if (CommonUtil.isMac()) { START_TRACE = AnalyzerLabels.START_TRACE_MAC; STOP_TRACE = AnalyzerLabels.STOP_TRACE_MAC; SAVE_TRACE = AnalyzerLabels.SAVE_TRACE_MAC; @@ -111,7 +112,7 @@ public class ShortCutManager { Display.getDefault().syncExec(new Runnable() { @Override public void run() { - AnalyzerUtil.getWorkbenchWindow().getShell().setFocus(); + WorkbenchUtil.getWorkbenchWindow().getShell().setFocus(); } }); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java index 709d999..580bb85 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java @@ -69,7 +69,7 @@ import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingChildData; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class SqlManager { // private static final int PERMIT = 1; @@ -168,7 +168,7 @@ public class SqlManager { try { Statement st = replayConnection.createStatement(); st.execute("SHUTDOWN"); - AnalyzerUtil.tryClose(st); + CommonUtil.tryClose(st); replayConnection.close(); } catch (SQLException se) { if (!se.getSQLState().equals("XJ015")) { @@ -186,7 +186,7 @@ public class SqlManager { try { Statement st = connection.createStatement(); st.execute("SHUTDOWN"); - AnalyzerUtil.tryClose(st); + CommonUtil.tryClose(st); connection.close(); } catch (SQLException se) { if (!se.getSQLState().equals("XJ015")) { @@ -244,7 +244,7 @@ public class SqlManager { } catch (SQLException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(stat); + CommonUtil.tryClose(stat); semaphoreRelease(); } } @@ -327,7 +327,7 @@ public class SqlManager { } catch (SQLException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(stat); + CommonUtil.tryClose(stat); semaphoreRelease(); } } @@ -965,7 +965,7 @@ public class SqlManager { e.printStackTrace(); } finally { semaphoreRelease(); - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); } return dbInfo; } @@ -1026,7 +1026,7 @@ public class SqlManager { e.printStackTrace(); } finally { semaphoreRelease(); - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); } return dbInfo; } @@ -1106,7 +1106,7 @@ public class SqlManager { System.out.println("SQLException - selecte : " + query); e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); semaphoreRelease(); if (null != dbFilePath) { closeConnection(); @@ -1162,7 +1162,7 @@ public class SqlManager { System.out.println("SQLException - selecte : " + query); e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); semaphoreRelease(); } return logs; @@ -1244,7 +1244,7 @@ public class SqlManager { System.out.println("SQLException - selecte : " + query); e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); semaphoreRelease(); } return dbInfo; @@ -1581,7 +1581,7 @@ public class SqlManager { e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); if (null != conn) { semaphoreRelease(); } @@ -1632,7 +1632,7 @@ public class SqlManager { e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); if (null != conn) { semaphoreRelease(); } @@ -1683,7 +1683,7 @@ public class SqlManager { e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); if (null != conn) { semaphoreRelease(); } @@ -1740,7 +1740,7 @@ public class SqlManager { System.out.println("SQLException - select : " + query); e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(stat, rs); + CommonUtil.tryClose(stat, rs); if (null != conn) { semaphoreRelease(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java index 155f10a..7850c99 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java @@ -55,12 +55,12 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.AnalyzerShellCommands; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.ElfSymbolExtracter; import org.tizen.dynamicanalyzer.common.ErrorCode; import org.tizen.dynamicanalyzer.common.HostResult; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.BaseCommunicator; import org.tizen.dynamicanalyzer.communicator.CommunicatorUtils; import org.tizen.dynamicanalyzer.communicator.DACommunicator; @@ -95,6 +95,7 @@ import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.sdblib.exception.SdbCommandRejectedException; import org.tizen.sdblib.exception.TimeoutException; @@ -191,7 +192,7 @@ public class Communicator30 extends BaseCommunicator { if(PRINT_CONTROL_LOG_TOFILE) { File logPath = new File( - AnalyzerPaths.DA_DEBUG_CONTROL_CHANNEL_LOG_PATH); + PathManager.DA_DEBUG_CONTROL_CHANNEL_LOG_PATH); if (logPath.exists()) { logPath.delete(); } @@ -376,7 +377,7 @@ public class Communicator30 extends BaseCommunicator { binInfo.setTempBinaryPath(localBinaryPath); if (splitLocalBinaryPath.length == 0 || splitLocalBinaryPath.length < 3) { - localBinaryPath = AnalyzerPaths.TEMP_FOLDER_PATH + localBinaryPath = PathManager.TEMP_FOLDER_PATH + File.separator + getFileName(targetPath); result = pullTheFile(targetPath, localBinaryPath); if (result.isSuccess()) { @@ -401,7 +402,7 @@ public class Communicator30 extends BaseCommunicator { // change binary file path of host File binFile = new File(localBinaryPath); if (!binFile.exists()) { - localBinaryPath = AnalyzerPaths.TEMP_FOLDER_PATH + localBinaryPath = PathManager.TEMP_FOLDER_PATH + File.separator + getFileName(targetPath); result = pullTheFile(targetPath, localBinaryPath); if (result.isSuccess()) { @@ -440,7 +441,7 @@ public class Communicator30 extends BaseCommunicator { String targetHashCode = binInfo.getMd5sumValue(); if (0 != targetHashCode.compareTo(localHashCode)) { - localBinaryPath = AnalyzerPaths.TEMP_FOLDER_PATH + localBinaryPath = PathManager.TEMP_FOLDER_PATH + File.separator + getFileName(targetPath); result = pullTheFile(targetPath, localBinaryPath); if (result.isSuccess()) { @@ -514,7 +515,7 @@ public class Communicator30 extends BaseCommunicator { Display.getDefault().asyncExec(new Runnable() { @Override public void run() { - final Shell shell = AnalyzerUtil.getWorkbenchWindow() + final Shell shell = WorkbenchUtil.getWorkbenchWindow() .getShell(); DADialog dialog = new DADialog(shell, SWT.NONE, 550, 153); dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); @@ -1066,7 +1067,7 @@ public class Communicator30 extends BaseCommunicator { String[] splitLocalBinaryPath = localBinaryPath .split(CommonConstants.SLASH); if (splitLocalBinaryPath.length <= 0) { - localBinaryPath = AnalyzerPaths.TEMP_FOLDER_PATH + localBinaryPath = PathManager.TEMP_FOLDER_PATH + File.separator + getFileName(binPaths.get(i)); result = pullTheFile(binPaths.get(i), localBinaryPath); if (result.isSuccess()) { @@ -1089,7 +1090,7 @@ public class Communicator30 extends BaseCommunicator { // change binary file path of host File binFile = new File(localBinaryPath); if (!binFile.exists()) { - localBinaryPath = AnalyzerPaths.TEMP_FOLDER_PATH + localBinaryPath = PathManager.TEMP_FOLDER_PATH + File.separator + getFileName(binPaths.get(i)); result = pullTheFile(binPaths.get(i), localBinaryPath); if (result.isSuccess()) { @@ -1126,7 +1127,7 @@ public class Communicator30 extends BaseCommunicator { String targetHashCode = binInfo.getMd5sumValue(); if (!targetHashCode.equals(localHashCode)) { - localBinaryPath = AnalyzerPaths.TEMP_FOLDER_PATH + localBinaryPath = PathManager.TEMP_FOLDER_PATH + File.separator + getFileName(binPaths.get(i)); result = pullTheFile(binPaths.get(i), localBinaryPath); if (result.isSuccess()) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java index 5d0d0cd..f7bee9e 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java @@ -36,7 +36,6 @@ import java.io.InputStream; import java.io.PrintWriter; import java.net.Socket; import java.util.ArrayList; -import java.util.Formatter; import java.util.HashMap; import java.util.List; import java.util.Timer; @@ -48,7 +47,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.handlers.ReplayTraceHandler; import org.tizen.dynamicanalyzer.handlers.StopHandler; @@ -69,6 +68,7 @@ import org.tizen.dynamicanalyzer.ui.toolbar.StopLogProcessor; import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class MessageParser { @@ -405,7 +405,7 @@ public class MessageParser { if(PRINT_DATA_LOG_TOFILE) { File logPath = new File( - AnalyzerPaths.DA_DEBUG_DATA_CHANNEL_LOG_PATH); + PathManager.DA_DEBUG_DATA_CHANNEL_LOG_PATH); if (logPath.exists()) { logPath.delete(); } @@ -579,13 +579,13 @@ public class MessageParser { Display.getDefault().asyncExec(new Runnable() { @Override public void run() { - final Shell shell = AnalyzerUtil.getWorkbenchWindow() + final Shell shell = WorkbenchUtil.getWorkbenchWindow() .getShell(); DADialog dialog = new DADialog(shell, SWT.NONE, 550, 153); dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); dialog.setMessage(AnalyzerLabels.HEAP_MEMORY_WARNING_PRE - + AnalyzerPaths.DYNAMIC_ANALYZER_INSTALL_PATH + + PathManager.DYNAMIC_ANALYZER_INSTALL_PATH + AnalyzerLabels.HEAP_MEMORY_WARNING_POST); dialog.open(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java index 12ce1e7..af5d013 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java @@ -56,7 +56,7 @@ import org.tizen.dynamicanalyzer.ui.info.snapshot.SocketClient; import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.ImageUtil; import org.tizen.dynamicanalyzer.utils.ImageUtilSWT; import org.tizen.sdblib.service.SyncResult; @@ -395,7 +395,7 @@ public class SWAPLogParser implements Runnable { LogInserter.getInsertLogQueue().push(logPack); LogInserter.startInsertLogThread(); - BaseView bv = (BaseView) AnalyzerUtil.getViewPart(BaseView.ID); + BaseView bv = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); bv.getMainTab().updateLog(logPack); // System.out.println("view update!!"); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java index 594c05c..9dc5553 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java @@ -37,11 +37,12 @@ import java.util.List; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; -import org.tizen.dynamicanalyzer.common.PathManager; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.swap.channel.control.BinaryInfo; import org.tizen.dynamicanalyzer.swap.platform.ui.InputRow; +import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class BinarySettingManager { @@ -56,7 +57,7 @@ public class BinarySettingManager { private List realBinarySettings = new ArrayList(); - private String debugRoot = PathManager.getRootStrapsPath(); + private String debugRoot = PathManager.getRootStrapsPath(ConfigureManager.getPlatform()); public static synchronized BinarySettingManager getInstance() { if (null == instance) { @@ -153,7 +154,7 @@ public class BinarySettingManager { // extract rpm file exists if (null != debugRpmPath) { - String toolPath = AnalyzerPaths.TOOL_FOLDER_PATH + String toolPath = PathManager.TOOL_FOLDER_PATH + File.separator + "debuginfo.sh"; String[] command = null; if (null != debugRpmSourcePath) { @@ -207,7 +208,7 @@ public class BinarySettingManager { libFullName.length()); String libVersion = libPostFix.substring(4, libPostFix.length()); - String debugCmd = AnalyzerPaths.TOOL_FOLDER_PATH + String debugCmd = PathManager.TOOL_FOLDER_PATH + File.separator + "debuginfo.sh -f " + rpmPath + " " + "*" + libPostFix + ".debug"; String debugFilePath = null; @@ -244,7 +245,7 @@ public class BinarySettingManager { if (null != debugRpmSourcePath && !debugRpmSourcePath.isEmpty()) { String sourceFilePath = null; - String sourceCmd = AnalyzerPaths.TOOL_FOLDER_PATH + String sourceCmd = PathManager.TOOL_FOLDER_PATH + File.separator + "debuginfo.sh -f " + rpmPath + " " + "*" + libVersion; try { @@ -280,7 +281,7 @@ public class BinarySettingManager { binData.setDebugSourcePath(CommonConstants.EMPTY); } } else if (debugFileName.contains("debug-")) { - String debugCmd = AnalyzerPaths.TOOL_FOLDER_PATH + String debugCmd = PathManager.TOOL_FOLDER_PATH + File.separator + "debuginfo.sh -f " + rpmPath + CommonConstants.SPACE + libFullName; String debugFilePath = null; @@ -412,7 +413,7 @@ public class BinarySettingManager { } public void initBinarySettings() { - File saveFile = new File(AnalyzerPaths.BINARY_AUTO_SAVE_PATH); + File saveFile = new File(PathManager.BINARY_AUTO_SAVE_PATH); BufferedReader br = null; String content = null; try { @@ -431,7 +432,7 @@ public class BinarySettingManager { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(br); + CommonUtil.tryClose(br); } } @@ -453,7 +454,7 @@ public class BinarySettingManager { + "-debuginfo*.rpm"; // String rootstrapPath = PathManager.getRootStrapsPath(); List lines = new ArrayList(); - String toolPath = AnalyzerPaths.TOOL_FOLDER_PATH + File.separator + String toolPath = PathManager.TOOL_FOLDER_PATH + File.separator + "debuginfo.sh"; String[] command = new String[] { toolPath, "-f", rootPath, debugInfoToken }; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinarySettingProgressManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinarySettingProgressManager.java index 12d0814..a7dabdd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinarySettingProgressManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinarySettingProgressManager.java @@ -4,7 +4,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.ui.widgets.ProgressDialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class BinarySettingProgressManager { private static ProgressDialog dialog = null; @@ -16,7 +16,7 @@ public class BinarySettingProgressManager { } public void startProcessStart(String waitMessage) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); dialog = new ProgressDialog(shell); if (null != dialog) { dialog.open(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java index 26bef72..6ff329c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java @@ -44,8 +44,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.DesignConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -194,7 +194,7 @@ public class LoadSettingDialog extends DAMessageBox { return; } GridItem selection = selections[0]; - String openPath = AnalyzerPaths.DYNAMIC_ANALYZER_SETTING_PATH + String openPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH + File.separator + selection.getText(); openAction(openPath); @@ -233,7 +233,7 @@ public class LoadSettingDialog extends DAMessageBox { } GridItem item = items[0]; - String openPath = AnalyzerPaths.DYNAMIC_ANALYZER_SETTING_PATH + String openPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH + File.separator + item.getText(); openAction(openPath); shell.dispose(); @@ -253,7 +253,7 @@ public class LoadSettingDialog extends DAMessageBox { int index = grid.getSelectionIndex(); GridItem item = items[0]; - String openPath = AnalyzerPaths.DYNAMIC_ANALYZER_SETTING_PATH + String openPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH + File.separator + item.getText(); if (AnalyzerUtil.deleteFile(new File(openPath))) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java index 5dea0eb..84c4e2c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java @@ -47,9 +47,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.DesignConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData; @@ -57,6 +57,7 @@ import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.widgets.DAButton; import org.tizen.dynamicanalyzer.ui.widgets.DAMessageBox; import org.tizen.dynamicanalyzer.ui.widgets.DAText; +import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -138,7 +139,7 @@ public class SaveSettingDialog extends DAMessageBox { } private boolean executeSaveTrace() { - String targetPath = AnalyzerPaths.DYNAMIC_ANALYZER_SETTING_PATH + String targetPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH + File.separator + saveFileName + ".setting"; File saveFile = new File(targetPath); FileWriter fileWriter = null; @@ -159,7 +160,7 @@ public class SaveSettingDialog extends DAMessageBox { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(bufWriter, fileWriter); + CommonUtil.tryClose(bufWriter, fileWriter); } if (success) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SettingSaveTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SettingSaveTable.java index f8c9f88..a58903d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SettingSaveTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SettingSaveTable.java @@ -32,7 +32,7 @@ import java.util.List; import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; @@ -46,7 +46,7 @@ public class SettingSaveTable extends DATableComposite { @Override protected List makeTableInput() { List saveFileList = AnalyzerUtil - .getFiles(AnalyzerPaths.DYNAMIC_ANALYZER_SETTING_PATH); + .getFiles(PathManager.DYNAMIC_ANALYZER_SETTING_PATH); List input = new ArrayList(); if (null != saveFileList) { int size = saveFileList.size(); 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 1ed4006..8de7126 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java @@ -40,8 +40,10 @@ import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.thread.ThreadPage; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; +import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.workbench.LayoutManager; public class BaseView extends ViewPart { @@ -53,6 +55,10 @@ public class BaseView extends ViewPart { @Override public void createPartControl(Composite parent) { + + Composite toolbarComposite = LayoutManager.getToolbarComposite(); + ToolbarArea.createInstance(toolbarComposite); + tabView = new DATabComposite(parent, SWT.DOUBLE_BUFFERED); tabView.setTabWidth(110); { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java index 7df0083..f35a1b6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java @@ -36,8 +36,8 @@ import java.util.TreeMap; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.SymbolManager; +import org.tizen.dynamicanalyzer.common.path.PathConstants; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.nl.InformationViewLabels; @@ -468,7 +468,7 @@ public class ProfileDataMaker { } // drop samples of probe library - if (inputData.getPath().startsWith(AnalyzerPaths.DA_REMOTE_PROBE_PATH)) { + if (inputData.getPath().startsWith(PathConstants.DA_REMOTE_PROBE_PATH)) { return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java index 800fe4c..4513e73 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java @@ -41,7 +41,7 @@ import org.tizen.dynamicanalyzer.swap.model.data.UIEventData; import org.tizen.dynamicanalyzer.ui.common.UIEventChartContextMenuItem; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.uievent.UIEventListDialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; @@ -71,7 +71,7 @@ public class UIEventChart extends TimelineChart { private static final String NEW_LINE = CommonConstants.NEW_LINE; private UIEventListDialog uiEventListDialog = new UIEventListDialog( - AnalyzerUtil.getWorkbenchWindow().getShell()); + WorkbenchUtil.getWorkbenchWindow().getShell()); public static UIEventChart getInstance() { if (instance == null) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/AddChartMenuComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/AddChartMenuComposite.java index 7fe4f8b..ef0e384 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/AddChartMenuComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/AddChartMenuComposite.java @@ -36,7 +36,7 @@ import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -52,7 +52,7 @@ public class AddChartMenuComposite extends Composite { private DACustomButtonClickEventListener addItemListButtonListener = new DACustomButtonClickEventListener() { @Override public void handleClickEvent(DACustomButton button) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); TimelineEditItemsDialog dialog = new TimelineEditItemsDialog(shell); if (dialog.isRunningDialog() == false) { dialog.open(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java index b7d2a9f..c709709 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java @@ -47,9 +47,9 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.DesignConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -57,7 +57,8 @@ import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.ui.widgets.DAButton; import org.tizen.dynamicanalyzer.ui.widgets.DAMessageBox; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -72,7 +73,7 @@ public class AboutDialog extends DAMessageBox { private final Image iconImage = ImageResources.ABOUT_TIZEN_SDK; - final static String daAboutFilePath = AnalyzerPaths.WORKBENCH_FOLDER_PATH + final static String daAboutFilePath = PathManager.WORKBENCH_FOLDER_PATH + File.separator + "about.mappings"; public AboutDialog(Shell parent) { @@ -91,7 +92,7 @@ public class AboutDialog extends DAMessageBox { @Override public void handleClickEvent(DACustomButton button) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); LicenseDialog dialog = new LicenseDialog(shell, SWT.NONE); // FIXME dialog.open(); } @@ -241,7 +242,7 @@ public class AboutDialog extends DAMessageBox { } public static void updateBuildInfoForMac() { - if (AnalyzerUtil.isMac()) { + if (CommonUtil.isMac()) { updateBuildInfo(); } } @@ -276,7 +277,7 @@ public class AboutDialog extends DAMessageBox { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(fileWriter, buffWriter, printWriter); + CommonUtil.tryClose(fileWriter, buffWriter, printWriter); } } @@ -302,7 +303,7 @@ public class AboutDialog extends DAMessageBox { while (null != (content = in.readLine())) { buildTime = parseBuildTime(content); if (buildTime != null) { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); return buildTime; } } @@ -311,14 +312,14 @@ public class AboutDialog extends DAMessageBox { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); } return null; } private static String getIDEVersion() { - File SDKAboutFile = new File(AnalyzerPaths.ABOUT_FILE_PATH); + File SDKAboutFile = new File(PathManager.ABOUT_FILE_PATH); BufferedReader in = null; String content; try { @@ -335,7 +336,7 @@ public class AboutDialog extends DAMessageBox { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); } return null; } @@ -358,7 +359,7 @@ public class AboutDialog extends DAMessageBox { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); } return null; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java index a786ffd..591dc20 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java @@ -39,14 +39,14 @@ import java.util.Iterator; import java.util.Map; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; -import org.tizen.dynamicanalyzer.common.PathManager; +import org.tizen.dynamicanalyzer.common.path.PathConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.model.DeviceInfo; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class ConfigureManager { @@ -308,11 +308,11 @@ public class ConfigureManager { } private void initConfigDataFromFile() { - if (null == AnalyzerPaths.CONFIG_FOLDER_PATH) { + if (null == PathManager.CONFIG_FOLDER_PATH) { return; } - File configFolder = new File(AnalyzerPaths.CONFIG_FOLDER_PATH); + File configFolder = new File(PathManager.CONFIG_FOLDER_PATH); if (!configFolder.isDirectory()) { if (!configFolder.mkdirs()) { System.out.println("config directory create failed..."); @@ -321,7 +321,7 @@ public class ConfigureManager { } File configFile = new File(configFolder, - AnalyzerConstants.CONFIG_FILE_NAME); + PathConstants.CONFIG_FILE_NAME); if (!configFile.isFile()) { try { configFile.createNewFile(); @@ -341,7 +341,7 @@ public class ConfigureManager { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); } } @@ -375,7 +375,7 @@ public class ConfigureManager { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(fileWriter, buffWriter, printWriter); + CommonUtil.tryClose(fileWriter, buffWriter, printWriter); } } @@ -509,4 +509,16 @@ public class ConfigureManager { public int getSamplingPeriod() { return getValueInt(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC); } + + public static String getPlatform() { + String platform = ConfigureManager.getInstance().getValue( + ConfigureLabels.PLATFORM); + if (null == platform || platform.isEmpty() + || platform.equals(ConfigureLabels.PLATFORM_ETC)) { + return null; + } else { + return platform; + } + } + } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/LicenseDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/LicenseDialog.java index 7dcfee2..6d24c5b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/LicenseDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/LicenseDialog.java @@ -43,15 +43,15 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.DesignConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.widgets.DAButton; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -75,7 +75,7 @@ public class LicenseDialog { private String getLicenseString() { String configFileName = AnalyzerConstants.LICENSE_FILE_NAME; StringBuffer ret = new StringBuffer(CommonConstants.EMPTY); - File configFolder = new File(AnalyzerPaths.CONFIG_FOLDER_PATH); + File configFolder = new File(PathManager.CONFIG_FOLDER_PATH); if (!configFolder.isDirectory()) { return AnalyzerLabels.LICENSE_DIALOG_NOT_FOUND; } @@ -97,7 +97,7 @@ public class LicenseDialog { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); } } return ret.toString(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java index 4374dfb..4a0072b 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java @@ -42,9 +42,9 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.DesignConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -55,6 +55,8 @@ import org.tizen.dynamicanalyzer.ui.widgets.DAButton; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; import org.tizen.dynamicanalyzer.ui.widgets.DAMessageBox; import org.tizen.dynamicanalyzer.ui.widgets.DAText; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -216,14 +218,14 @@ public class SaveAsDialog extends DAMessageBox { Project project = AnalyzerManager.getProject(); String sourcePath = project.getSavePath(); String[] splitSourcePath = null; - if (AnalyzerUtil.isWin()) { + if (CommonUtil.isWin()) { splitSourcePath = sourcePath.split("\\\\"); //$NON-NLS-1$ - } else if (AnalyzerUtil.isMac()) { + } else if (CommonUtil.isMac()) { splitSourcePath = sourcePath.split("\\/"); //$NON-NLS-1$ - } else if (AnalyzerUtil.isLinux()) { + } else if (CommonUtil.isLinux()) { splitSourcePath = sourcePath.split("\\/"); //$NON-NLS-1$ } else { - final Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); DADialog dialog = new DADialog(shell, SWT.NONE); // FIXME dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); dialog.setMessage(AnalyzerLabels.OS_WARNING); @@ -245,7 +247,7 @@ public class SaveAsDialog extends DAMessageBox { private boolean executeSaveTrace() { Project project = AnalyzerManager.getProject(); String sourcePath = project.getSavePath(); - String targetPath = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + String targetPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + saveFileName; SqlManager.getInstance().closeConnection(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java index 5c0d5f4..0739af1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java @@ -5,7 +5,7 @@ import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.ui.widgets.ProgressDialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class StartProcessManager implements Runnable { private static ProgressDialog dialog = null; @@ -18,7 +18,7 @@ public class StartProcessManager implements Runnable { } public void startProcessStart(String waitMessage) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); dialog = new ProgressDialog(shell); if (null != dialog) { dialog.open(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java index 9ea616e..924c4a2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java @@ -33,6 +33,7 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.widgets.ProgressDialog; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class StopProcessManager { @@ -55,7 +56,7 @@ public class StopProcessManager { } state = STOP_PROCESS_START; AnalyzerManager.setRunningState(false); - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); dialog = new ProgressDialog(shell); if (null != dialog) { dialog.open(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java index 7bfcd89..8b4d760 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java @@ -32,18 +32,14 @@ import java.util.HashMap; import java.util.List; import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.CommonConstants; @@ -67,6 +63,7 @@ import org.tizen.dynamicanalyzer.ui.toolbar.replayEditor.ReplayEditDialog; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboPopupRenderer; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboRenderer; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -97,14 +94,10 @@ public class ToolbarArea { String selectedDevice = null; AppInfo selectedApp = null; - private Shell shell; private static ToolbarArea coolbarArea; - // Base Composite - private Composite baseComposite; // Toolbar - private Composite toolbarComposite; private DACustomCombo deviceCombo; private DACustomCombo appCombo; @@ -150,10 +143,9 @@ public class ToolbarArea { this.selectedApp = selectedApp; } - public static void createInstance(IWorkbenchWindowConfigurer configurer, - Shell shell) { + public static void createInstance(Composite parent) { if (null == coolbarArea) { - coolbarArea = new ToolbarArea(configurer, shell); + coolbarArea = new ToolbarArea(parent); } } @@ -177,46 +169,10 @@ public class ToolbarArea { return processCombo; } - private ToolbarArea(IWorkbenchWindowConfigurer configurer, Shell sh) { - shell = sh; - - // Sets shell layout. - final FillLayout shellLayout = new FillLayout(); - shellLayout.marginHeight = 0; - shellLayout.marginWidth = 1; - shell.setLayout(shellLayout); - - // Creates base composite - baseComposite = new Composite(shell, SWT.NONE); - baseComposite.setLayout(new FormLayout()); - - // Creates toolbar. - toolbarComposite = new Composite(baseComposite, SWT.NONE); - toolbarComposite.setLayout(new FormLayout()); - toolbarComposite.setBackground(ColorResources.COOLBAR_BG_COLOR); - - createToolbar(toolbarComposite); - - Control page = configurer.createPageComposite(baseComposite); - - FormData data = new FormData(); - data.top = new FormAttachment(0, 0); - data.left = new FormAttachment(0, 0); - data.right = new FormAttachment(100, 0); - data.height = 38; - toolbarComposite.setLayoutData(data); - - data = new FormData(); - data.top = new FormAttachment(toolbarComposite, 0, SWT.BOTTOM); - data.left = new FormAttachment(0, 0); - data.right = new FormAttachment(100, 0); - data.bottom = new FormAttachment(100, 0); - page.setLayoutData(data); - - configurer.getWindow().getShell().layout(true); - if (null != page) { - ((Composite) page).layout(true); - } + private ToolbarArea(Composite parent) { + parent.setBackground(ColorResources.COOLBAR_BG_COLOR); + createToolbar(parent); + parent.layout(true); } public void setRepalyButtonEnable(final boolean enabled) { @@ -347,7 +303,7 @@ public class ToolbarArea { @Override public void selectionEvent(DACustomCombo combo) { - BaseView baseView = (BaseView) AnalyzerUtil + BaseView baseView = (BaseView) WorkbenchUtil .getViewPart(BaseView.ID); baseView.getTopComposite().updatePage(); } @@ -401,7 +357,7 @@ public class ToolbarArea { @Override public void handleClickEvent(DACustomButton button) { - Shell shell = AnalyzerUtil.getWorkbenchWindow() + Shell shell = WorkbenchUtil.getWorkbenchWindow() .getShell(); SaveAsDialog dialog = new SaveAsDialog(shell); Object result = dialog.open(); @@ -416,7 +372,7 @@ public class ToolbarArea { @Override public void handleClickEvent(DACustomButton button) { - Shell shell = AnalyzerUtil.getWorkbenchWindow() + Shell shell = WorkbenchUtil.getWorkbenchWindow() .getShell(); OpenTraceDialog dialog = new OpenTraceDialog(shell); dialog.open(); @@ -440,7 +396,7 @@ public class ToolbarArea { @Override public void handleClickEvent(DACustomButton button) { - Shell shell = AnalyzerUtil.getWorkbenchWindow() + Shell shell = WorkbenchUtil.getWorkbenchWindow() .getShell(); ReplayEditDialog dialog = new ReplayEditDialog(shell); dialog.open(); @@ -451,7 +407,7 @@ public class ToolbarArea { @Override public void handleClickEvent(DACustomButton button) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); ConfigurationDialog dialog = new ConfigurationDialog(shell); // FIXME dialog.open(); } @@ -470,7 +426,7 @@ public class ToolbarArea { @Override public void handleClickEvent(DACustomButton button) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); AboutDialog dialog = new AboutDialog(shell); // FIXME dialog.open(); } @@ -501,7 +457,7 @@ public class ToolbarArea { ShortCutManager.getInstance().setEnabled(false); if (!checkValidApplication()) { // fail message box - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); DADialog warning = new DADialog(shell, SWT.NONE); warning.setMessage(AnalyzerLabels.INVALID_APPLICATION); warning.setIcon(ImageResources.DIALOG_WARNING_ICON); @@ -1204,7 +1160,8 @@ public class ToolbarArea { } public void setEnabled(boolean enabled) { - baseComposite.setEnabled(enabled); + // TODO : greatim : how to get baseComposite +// baseComposite.setEnabled(enabled); } public void setToolbarStartStopState(final boolean isStop) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java index 22b7b7b..0d28bc3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java @@ -39,7 +39,7 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class TraceStartStopThread implements Runnable { private static Thread startStopThread = null; @@ -80,7 +80,7 @@ public class TraceStartStopThread implements Runnable { Display.getDefault().syncExec(new Runnable() { @Override public void run() { - final Shell shell = AnalyzerUtil.getWorkbenchWindow() + final Shell shell = WorkbenchUtil.getWorkbenchWindow() .getShell(); DADialog dialog = new DADialog(shell, SWT.NONE); dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java index 9ce8592..137c246 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java @@ -47,9 +47,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; -import org.tizen.dynamicanalyzer.common.PathManager; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -63,9 +62,10 @@ import org.tizen.dynamicanalyzer.swap.platform.ui.SaveSettingDialog; import org.tizen.dynamicanalyzer.swap.platform.ui.DeviceExplorer.DeviceExplorerDilaog; import org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer.FileExplorerDialog; import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; +import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.widgets.DAButton; import org.tizen.dynamicanalyzer.ui.widgets.WarningDialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -153,7 +153,7 @@ public class BinarySettingsPage extends DAPageComposite { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(br); + CommonUtil.tryClose(br); } } }; @@ -239,11 +239,11 @@ public class BinarySettingsPage extends DAPageComposite { super(parent, style); me = this; name = "Binary Settings"; // TODO nl - rootPath = PathManager.getRootStrapsPath(); + rootPath = PathManager.getRootStrapsPath(ConfigureManager.getPlatform()); inputRowHash = BinarySettingManager.getInstance().getInputRowHash(); inputRowList = BinarySettingManager.getInstance().getInputRowList(); - String settingPath = AnalyzerPaths.DYNAMIC_ANALYZER_SETTING_PATH; + String settingPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH; File settingFolder = new File(settingPath); if (!settingFolder.exists() || !settingFolder.isDirectory()) { if (!settingFolder.mkdirs()) { @@ -382,7 +382,7 @@ public class BinarySettingsPage extends DAPageComposite { } public void doClose() { - String targetPath = AnalyzerPaths.BINARY_AUTO_SAVE_PATH; + String targetPath = PathManager.BINARY_AUTO_SAVE_PATH; File saveFile = new File(targetPath); FileWriter fileWriter = null; @@ -403,7 +403,7 @@ public class BinarySettingsPage extends DAPageComposite { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(bufWriter, fileWriter); + CommonUtil.tryClose(bufWriter, fileWriter); } if (success) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java index b1fc654..8c4b5b8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java @@ -54,9 +54,9 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.ScrollBar; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.DesignConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -310,10 +310,10 @@ public class OpenTraceDialog extends DAMessageBox { GridItem selection = selections[0]; String openPath = null; if ((Integer) selection.getData() == TEMP_FOLDER) { - openPath = AnalyzerPaths.TEMP_FOLDER_PATH + File.separator + openPath = PathManager.TEMP_FOLDER_PATH + File.separator + selection.getText(); } else if ((Integer) selection.getData() == SAVE_FOLDER) { - openPath = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + openPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + selection.getText(); } else { return; @@ -438,10 +438,10 @@ public class OpenTraceDialog extends DAMessageBox { GridItem item = items[0]; String openPath = null; if ((Integer) item.getData() == TEMP_FOLDER) { - openPath = AnalyzerPaths.TEMP_FOLDER_PATH + File.separator + openPath = PathManager.TEMP_FOLDER_PATH + File.separator + item.getText(); } else if ((Integer) item.getData() == SAVE_FOLDER) { - openPath = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + openPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + item.getText(); } else { return; @@ -474,10 +474,10 @@ public class OpenTraceDialog extends DAMessageBox { String openPath = null; if ((Integer) item.getData() == TEMP_FOLDER) { - openPath = AnalyzerPaths.TEMP_FOLDER_PATH + File.separator + openPath = PathManager.TEMP_FOLDER_PATH + File.separator + item.getText(); } else if ((Integer) item.getData() == SAVE_FOLDER) { - openPath = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + openPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + item.getText(); } else { return; @@ -558,10 +558,10 @@ public class OpenTraceDialog extends DAMessageBox { String path = null; if ((Integer) item.getData() == TEMP_FOLDER) { - path = AnalyzerPaths.TEMP_FOLDER_PATH + File.separator + path = PathManager.TEMP_FOLDER_PATH + File.separator + item.getText(0); } else if ((Integer) item.getData() == SAVE_FOLDER) { - path = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + path = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + item.getText(0); } else { return; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java index 534959e..17dff0d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java @@ -38,7 +38,7 @@ import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.ui.page.BaseView; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class OpenTraceInputReader implements Runnable { @@ -179,7 +179,7 @@ public class OpenTraceInputReader implements Runnable { return; } - BaseView bv = (BaseView) AnalyzerUtil.getViewPart(BaseView.ID); + BaseView bv = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); bv.getMainTab().updateLog(logPack); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java index 9c5553a..3abdfd2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java @@ -40,6 +40,7 @@ import org.tizen.dynamicanalyzer.ui.thread.ThreadChartManager; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.ui.widgets.ProgressDialog; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class OpenTraceProgressManager implements Runnable { @@ -93,7 +94,7 @@ public class OpenTraceProgressManager implements Runnable { @Override public void run() { state = OPEN_TRACE_PROCESS_START; - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); dialog = new ProgressDialog(shell); if (null != dialog) { dialog.open(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java index 51a43fe..b65527f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java @@ -35,7 +35,8 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; +import org.tizen.dynamicanalyzer.common.path.PathConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.project.Project; @@ -60,7 +61,7 @@ public class SaveFilesTable extends DATableComposite { @Override protected List makeTableInput() { List saveFileList = AnalyzerUtil - .getDirs(AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH); + .getDirs(PathManager.DYNAMIC_ANALYZER_SAVE_PATH); List input = new ArrayList(); if (null != saveFileList) { int size = saveFileList.size(); @@ -68,8 +69,8 @@ public class SaveFilesTable extends DATableComposite { // create text List text = new ArrayList(); if (!saveFileList.get(i).equals( - AnalyzerConstants.TEMP_FOLDER_NAME)) { - String path = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + PathConstants.TEMP_FOLDER_NAME)) { + String path = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + saveFileList.get(i); String inputText1 = saveFileList.get(i); String inputText2 = getCreateTime(path); @@ -136,7 +137,7 @@ public class SaveFilesTable extends DATableComposite { } else { gridItem.setData(OpenTraceDialog.VERSION_KEY, OpenTraceDialog.VERSION_VALID); - String path = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + String path = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + text.get(TRACE_NAME_INDEX); Project project = AnalyzerManager.getProject(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java index a67a807..f6b2391 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java @@ -33,10 +33,10 @@ import java.util.List; import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; +import org.tizen.dynamicanalyzer.common.path.PathConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.project.Project; @@ -55,7 +55,7 @@ public class TempFilesTable extends DATableComposite { @Override protected List makeTableInput() { List tempFileList = AnalyzerUtil - .getDirs(AnalyzerPaths.TEMP_FOLDER_PATH); + .getDirs(PathManager.TEMP_FOLDER_PATH); List input = new ArrayList(); if (null != tempFileList) { int size = tempFileList.size(); @@ -63,8 +63,8 @@ public class TempFilesTable extends DATableComposite { // create text List text = new ArrayList(); if (!tempFileList.get(i).equals( - AnalyzerConstants.TEMP_FOLDER_NAME)) { - String path = AnalyzerPaths.TEMP_FOLDER_PATH + PathConstants.TEMP_FOLDER_NAME)) { + String path = PathManager.TEMP_FOLDER_PATH + File.separator + tempFileList.get(i); text.add(tempFileList.get(i)); text.add(getCreateTime(path)); @@ -107,7 +107,7 @@ public class TempFilesTable extends DATableComposite { gridItem.setText(index, data); } - String path = AnalyzerPaths.TEMP_FOLDER_PATH + File.separator + String path = PathManager.TEMP_FOLDER_PATH + File.separator + text.get(TRACE_NAME_INDEX); Project project = AnalyzerManager.getProject(); if (null != project) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java index 51ef916..83b9da5 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java @@ -43,9 +43,9 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.DesignConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -53,6 +53,8 @@ import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.widgets.DAButton; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; import org.tizen.dynamicanalyzer.ui.widgets.DAMessageBox; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -214,14 +216,14 @@ public class RepalyEditSaveDialog extends DAMessageBox { Project project = AnalyzerManager.getProject(); String sourcePath = project.getSavePath(); String[] splitSourcePath = null; - if (AnalyzerUtil.isWin()) { + if (CommonUtil.isWin()) { splitSourcePath = sourcePath.split("\\\\"); //$NON-NLS-1$ - } else if (AnalyzerUtil.isMac()) { + } else if (CommonUtil.isMac()) { splitSourcePath = sourcePath.split("\\/"); //$NON-NLS-1$ - } else if (AnalyzerUtil.isLinux()) { + } else if (CommonUtil.isLinux()) { splitSourcePath = sourcePath.split("\\/"); //$NON-NLS-1$ } else { - final Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); DADialog dialog = new DADialog(shell, SWT.NONE); // FIXME dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); dialog.setMessage(AnalyzerLabels.OS_WARNING); @@ -243,7 +245,7 @@ public class RepalyEditSaveDialog extends DAMessageBox { private boolean executeSaveTrace() { Project project = AnalyzerManager.getProject(); String sourcePath = project.getSavePath(); - targetPath = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + targetPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator + saveFileName; if(AnalyzerManager.getProject().getSavePath().equals(targetPath)){ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java index d0bc6a6..656bb3a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java @@ -37,7 +37,7 @@ import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.swap.model.RecordEventObject; import org.tizen.dynamicanalyzer.swap.model.data.ReplayData; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; public class ReplayEditDialogDataManager { @@ -273,7 +273,7 @@ public class ReplayEditDialogDataManager { public void saveDialog() { SqlManager.getInstance().closeConnection(); - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); RepalyEditSaveDialog dialog = new RepalyEditSaveDialog(shell); Object result = dialog.open(); if (null != result) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotDialog.java index dd8da60..86f4a95 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotDialog.java @@ -47,9 +47,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.SnapshotConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.nl.ReplayEditLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -205,7 +205,7 @@ public class ReplayEditSnapshotDialog extends DAMessageBox { private void getDeviceResolution() { String selDeviceName = DACommunicator.getSelectedDevice().getIDevice() .getDeviceName(); - String resolutionInfoXmlPath = AnalyzerPaths.TIZEN_SDK_DATA_PATH + String resolutionInfoXmlPath = PathManager.TIZEN_SDK_DATA_PATH + File.separator + "emulator-vms" + File.separator + "vms"//$NON-NLS-1$ + File.separator + selDeviceName + File.separator + "vm_config.xml";//$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java index e4cc3d6..88e2cd7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java @@ -36,13 +36,15 @@ import java.util.List; import java.util.TreeSet; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; import org.tizen.dynamicanalyzer.common.CommonConstants; +import org.tizen.dynamicanalyzer.common.path.PathManager; +import org.tizen.dynamicanalyzer.communicator.CommunicatorUtils; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData; +import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.utils.Formatter; public class UIFunctionProfilingDataChecker { @@ -286,7 +288,13 @@ public class UIFunctionProfilingDataChecker { return; } - String sourcePath = AnalyzerPaths.TIZEN_HEADER_SOUECE_PATH; + boolean isArm = false; + if(CommunicatorUtils.isCurrentDeviceArmArch()) + isArm = true; + + String platform = ConfigureManager.getPlatform(); + + String sourcePath = PathManager.getTizenHeaderSouecePath(isArm, platform); File sourceFolder = new File(sourcePath); if (!sourceFolder.exists() && !sourceFolder.isDirectory()) { System.out.println("Not Found the tizen_header_file folder : " @@ -373,7 +381,7 @@ public class UIFunctionProfilingDataChecker { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); } } } @@ -408,7 +416,7 @@ public class UIFunctionProfilingDataChecker { String uiApiOptionList = null; ; String configFileName = AnalyzerConstants.USER_INTERFACE_API_LIST_FILE_NAME; - File configFolder = new File(AnalyzerPaths.CONFIG_FOLDER_PATH); + File configFolder = new File(PathManager.CONFIG_FOLDER_PATH); if (!configFolder.isDirectory()) { System.out.println("Not Exist UI API List Option Path "); return CommonConstants.EMPTY; @@ -434,7 +442,7 @@ public class UIFunctionProfilingDataChecker { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(in); + CommonUtil.tryClose(in); } } return uiApiOptionList; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java index 384fd86..0180828 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java @@ -61,7 +61,7 @@ import org.tizen.dynamicanalyzer.ui.common.PopupAnalysisMenuItemClickListener; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.widgets.DAGrid; import org.tizen.dynamicanalyzer.ui.widgets.FindDialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuListener; @@ -216,7 +216,7 @@ public abstract class DATableComposite extends Composite { if (ctrlPressed) { ctrlPressed = false; if (findEnabled) { - Shell shell = AnalyzerUtil.getWorkbenchWindow() + Shell shell = WorkbenchUtil.getWorkbenchWindow() .getShell(); FindDialog dialog = new FindDialog(shell, me); dialog.open(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java index db48698..9a3f3db 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java @@ -52,7 +52,8 @@ import org.tizen.dynamicanalyzer.sql.SqlManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.widgets.DAGrid; import org.tizen.dynamicanalyzer.ui.widgets.FindDialog; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public abstract class DAWindowingTableComposite extends DATableComposite { @@ -133,7 +134,7 @@ public abstract class DAWindowingTableComposite extends DATableComposite { FormData data = new FormData(); data.top = new FormAttachment(0, 0); data.left = new FormAttachment(0, 0); - if (AnalyzerUtil.isLinux()) { + if (CommonUtil.isLinux()) { data.right = new FormAttachment(100, -2); data.bottom = new FormAttachment(100, -2); } else { @@ -204,7 +205,7 @@ public abstract class DAWindowingTableComposite extends DATableComposite { if (ctrlPressed) { ctrlPressed = false; if (findEnabled) { - Shell shell = AnalyzerUtil.getWorkbenchWindow() + Shell shell = WorkbenchUtil.getWorkbenchWindow() .getShell(); FindDialog dialog = new FindDialog(shell, me); dialog.open(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/RecorderXml.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/RecorderXml.java index 6adbf19..a6c29dc 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/RecorderXml.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/RecorderXml.java @@ -44,6 +44,7 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; +import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -106,7 +107,7 @@ public class RecorderXml { } catch (IOException e) { e.printStackTrace(); } finally { - AnalyzerUtil.tryClose(fileWriter); + CommonUtil.tryClose(fileWriter); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java index a778824..36f1c5f 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -26,7 +26,6 @@ package org.tizen.dynamicanalyzer.utils; -import java.io.Closeable; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -34,8 +33,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.ServerSocket; -import java.net.Socket; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -55,16 +52,12 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.IHandlerService; -import org.eclipse.ui.part.ViewPart; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.communicator.DACommunicator; -import org.tizen.dynamicanalyzer.handlers.RealtimePerspectiveHandler; import org.tizen.dynamicanalyzer.swap.channel.control.BinaryInfo; import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfo; import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfoPackage; @@ -73,9 +66,10 @@ import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.page.ViewAction; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class AnalyzerUtil { - private static IWorkbenchWindow window = null; // FIXME start private static TimelineView timelineComposite; @@ -111,7 +105,7 @@ public class AnalyzerUtil { } catch (IOException e) { e.printStackTrace(); } finally { - tryClose(fi, fo); + CommonUtil.tryClose(fi, fo); } return success; } @@ -147,7 +141,7 @@ public class AnalyzerUtil { } catch (IOException e) { e.printStackTrace(); } finally { - tryClose(in, out); + CommonUtil.tryClose(in, out); } } } @@ -224,60 +218,6 @@ public class AnalyzerUtil { return list; } - private static String getOS() { - return System.getProperty(CommonConstants.OS_KEY).toLowerCase(); - } - - public static String getPerspectiveId() { - IWorkbenchWindow window = AnalyzerUtil.getWorkbenchWindow(); - if (null != window) { - return window.getActivePage().getPerspective().getId(); - } - - return CommonConstants.EMPTY; - } - - public static ViewPart getViewPart(String id) { - IWorkbenchPage page = getWorkbenchWindow().getActivePage(); - - if (null == page) { - return null; - } - - return (ViewPart) page.findView(id); - } - - public static IWorkbenchWindow getWorkbenchWindow() { - if (null == window) { - Display.getDefault().syncExec(new Runnable() { - @Override - public void run() { - window = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow(); - } - }); - } - return window; - } - - public static boolean isLinux() { - return getOS().indexOf(CommonConstants.LINUX) >= 0; - } - - public static boolean isMac() { - return getOS().indexOf(CommonConstants.MAC) >= 0; - } - - public static boolean isRealtimePerspective() { - boolean retVal = getPerspectiveId().equals( - RealtimePerspectiveHandler.PERSPECTIVE_ID); - return retVal; - } - - public static boolean isWin() { - return getOS().indexOf(CommonConstants.WIN) >= 0; - } - public static void saveTraceImage(String sourceFolderPath, String targetFolderPath) { List imageFileList = AnalyzerUtil.getFiles(sourceFolderPath, @@ -360,7 +300,7 @@ public class AnalyzerUtil { /** stop trace -> change page to summary **/ public static void changePage(final String pageId) { - final BaseView baseView = (BaseView) AnalyzerUtil + final BaseView baseView = (BaseView) WorkbenchUtil .getViewPart(BaseView.ID); Display.getDefault().syncExec(new Runnable() { @Override @@ -376,7 +316,7 @@ public class AnalyzerUtil { } public static DATabComposite getMainTab() { - BaseView baseView = (BaseView) AnalyzerUtil.getViewPart(BaseView.ID); + BaseView baseView = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); return baseView.getMainTab(); } @@ -385,29 +325,6 @@ public class AnalyzerUtil { return page.getView(viewId); } - public static void tryClose(final Object... closeables) { - if (null == closeables) { - return; - } - - for (Object obj : closeables) { - if (null == obj) { - continue; - } - try { - if (obj instanceof Closeable) { - ((Closeable) obj).close(); - } else if (obj instanceof Socket) { - ((Socket) obj).close(); - } else if (obj instanceof ServerSocket) { - ((ServerSocket) obj).close(); - } - } catch (final IOException e) { - e.printStackTrace(); - } - } - } - public static void checkLogs(String path, String prefix, int limitCount) { List logFiles = getFiles(path); if (null == logFiles) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java index ce0856e..384ab9e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java @@ -38,9 +38,10 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerPaths; +import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.util.CommonUtil; public class InternalLogManager { private static InternalLogManager instance; @@ -496,7 +497,7 @@ public class InternalLogManager { // Date time = Calendar.getInstance().getTime(); File autotestPath = new File( - AnalyzerPaths.DYNAMIC_ANALYZER_AUTOTEST_PATH); + PathManager.DYNAMIC_ANALYZER_AUTOTEST_PATH); if (!autotestPath.exists()) { if (!autotestPath.mkdirs()) { System.out.println("auto test path file create failed..."); @@ -505,7 +506,7 @@ public class InternalLogManager { } StringBuilder savePath = new StringBuilder(); - savePath.append(AnalyzerPaths.DYNAMIC_ANALYZER_AUTOTEST_PATH); + savePath.append(PathManager.DYNAMIC_ANALYZER_AUTOTEST_PATH); savePath.append(File.separator); savePath.append("DA_Autotest_Result.xsd"); @@ -521,7 +522,7 @@ public class InternalLogManager { } private void closeWriter() { - AnalyzerUtil.tryClose(outputFile, fileWriter, buffWriter, printWriter); + CommonUtil.tryClose(outputFile, fileWriter, buffWriter, printWriter); outputFile = null; fileWriter = null; buffWriter = null;