[Title] refactoring 2(mainly path manager)
authorgreatim <jaewon81.lim@samsung.com>
Wed, 5 Mar 2014 11:05:53 +0000 (20:05 +0900)
committergreatim <jaewon81.lim@samsung.com>
Wed, 5 Mar 2014 11:05:53 +0000 (20:05 +0900)
[Desc.]
[Issue]

38 files changed:
org.tizen.dynamicanalyzer.workbench/META-INF/MANIFEST.MF
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/callback/ExecutionCallbackManager.java [moved from org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/model/ExecutionCallbackManager.java with 96% similarity]
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/callback/IExecutionCallback.java [moved from org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/model/IExecutionCallback.java with 64% similarity]
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathConstants.java
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/LayoutManager.java
org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/WorkbenchSingletonFocusManager.java
org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASingletonFocusManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SettingSaveTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/LicenseDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ProgressDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java

index b764387..b453bca 100644 (file)
@@ -8,7 +8,7 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.tizen.dynamicanalyzer.common.model,
+Export-Package: org.tizen.dynamicanalyzer.common.callback,
  org.tizen.dynamicanalyzer.common.path,
  org.tizen.dynamicanalyzer.util,
  org.tizen.dynamicanalyzer.workbench;
index 9fdf5e4..0e83e32 100644 (file)
@@ -26,7 +26,7 @@ public class PathConstants {
 
        // 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 INSTALLATION_INFO = "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$
@@ -35,6 +35,11 @@ public class PathConstants {
        public static final String WIN_INSTALL_KEY = "Local AppData"; //$NON-NLS-1$
        public static final String LINUX_INSTALL_ENV = "HOME";//$NON-NLS-1$
 
+       // window activator
+       public static final String WINDOW_ACTIVATOR_LINUX = "windowactivator.sh";//$NON-NLS-1$
+       public static final String WINDOW_ACTIVATOR_WINDOWS = "windowactivator.bat";//$NON-NLS-1$
+       public static final String WINDOW_ACTIVATOR_MACOS = "macoswindowactivator.sh";//$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$
@@ -47,4 +52,6 @@ public class PathConstants {
        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$
 
+       // for debug
+       public static final String DA_STDOUT_TO_FILE = "logtofile";
 }
index a9149e3..9c9d719 100755 (executable)
@@ -36,60 +36,72 @@ import java.io.InputStreamReader;
 import org.eclipse.core.runtime.Platform;
 import org.tizen.dynamicanalyzer.util.CommonUtil;
 
+// All paths of PathManager should not be ended with File.separater
 public class PathManager {
        private static String logPostFix = null;
 
-       /* paths */
+       private static final String SDK_INFO_RELATIVE_PATH = "../../sdk.info"; //$NON-NLS-1$
+
+       // tizen 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
+       public static final String TIZEN_SDK_INSTALL_PATH = getTizenSdkInstallPath();
+
+       // sdb path
+       public static final String SDB_PATH = TIZEN_SDK_INSTALL_PATH
+                       + File.separator + PathConstants.TOOLS_FOLDER_NAME + File.separator
+                       + "sdb"; //$NON-NLS-1$
+
+       // dynamic analyzer paths
+       public static final String DA_DATA_PATH = TIZEN_SDK_DATA_PATH
+                       + File.separator + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME;
+       public static final String DA_INSTALL_PATH = TIZEN_SDK_INSTALL_PATH
+                       + File.separator + PathConstants.TOOLS_FOLDER_NAME + File.separator
+                       + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME;
+       public static final String DA_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
+       public static final String DA_READELF_PATH = DA_INSTALL_PATH
+                       + File.separator + PathConstants.TARGET_FOLDER_NAME;
+
+       public static final String DA_LOG_PATH = DA_DATA_PATH + File.separator
+                       + PathConstants.LOGS_FOLDER_NAME;
+       public static final String DA_SAVE_PATH = DA_DATA_PATH + File.separator
+                       + PathConstants.SAVE_FOLDER_NAME;
+       public static final String DA_SETTING_PATH = DA_DATA_PATH + File.separator
+                       + PathConstants.SETTING_FOLDER_NAME;
+       public static final String DA_RPM_PATH = DA_DATA_PATH + File.separator
+                       + PathConstants.RPM_FOLDER_NAME;
+       public static final String DA_CONFIG_FOLDER_PATH = DA_INSTALL_PATH
+                       + File.separator + PathConstants.CONFIG_FOLDER_NAME;
+       public static final String DA_TOOL_FOLDER_PATH = DA_INSTALL_PATH
                        + File.separator + PathConstants.TOOL_FOLDER_NAME;
-       public static final String TEMP_FOLDER_PATH = DYNAMIC_ANALYZER_SAVE_PATH
+
+       public static final String DA_DEBUG_DATA_CHANNEL_LOG_FILE = DA_LOG_PATH
+                       + File.separator + "data.log"; //$NON-NLS-1$
+       public static final String DA_DEBUG_CONTROL_CHANNEL_LOG_FILE = DA_LOG_PATH
+                       + File.separator + "control.log"; //$NON-NLS-1$
+       public static final String DA_TEMP_FOLDER_PATH = DA_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_BINARY_AUTO_SAVE_FILE = DA_SAVE_PATH
+                       + File.separator + "BinarySettings.save";
 
-       public static final String DA_SINGLETON_FILE_PATH = getSavePath()
+       public static final String DA_SINGLETON_FILE_PATH = DA_SAVE_PATH
                        + File.separator + "active_da"; //$NON-NLS-1$
-       public static final String IDE_ACTIVE_PORT_PATH = getSavePath()
+       public static final String IDE_ACTIVE_PORT_PATH = DA_SAVE_PATH
                        + File.separator + "active_da_plugin"; //$NON-NLS-1$
-       public static final String IDE_ACTIVE_SAVE_PORT_PATH = getSavePath()
+       public static final String IDE_ACTIVE_SAVE_PORT_PATH = DA_SAVE_PATH
                        + 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 final String WORKBENCH_FOLDER_PATH = getWorkbenchPath();
+       public static final String ABOUT_FILE_PATH = getAboutPath();
+
+       public static boolean checkTizenPathValidation() {
+               if (TIZEN_SDK_DATA_PATH == null || TIZEN_SDK_INSTALL_PATH == null) {
+                       return false;
+               }       else {
+                       return true;
+               }
+       }
 
        public static void setLogPostFix(String postFix) {
                logPostFix = postFix;
@@ -99,7 +111,7 @@ public class PathManager {
                return logPostFix;
        }
 
-       public static String getRegistryValue(String node, String key) {
+       private static String getRegistryValue(String node, String key) {
                BufferedReader br = null;
                String value = "";
 
@@ -126,47 +138,21 @@ public class PathManager {
                return value;
        }
 
-       public static String getTizenSdkDataPath() {
-               String defaultPath = null;
-
-               // case 1 : sdk.info
-               defaultPath = getPathFromSdkInfoFile(true);
-
-               if (null == defaultPath) {
-                       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 {
-                               defaultPath = "";
-                       }
-               }
-
-               return defaultPath;
-       }
-
        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 + SDK_INFO_RELATIVE_PATH;
-                               File infoFile = new File(infoPath);
-                               if (infoFile.exists() && infoFile.isFile()) {
+                       String curpath = null;
+                       curpath = Platform.getInstallLocation().getURL().getPath();
+                       if (null != curpath && !curpath.isEmpty()) {
+                               String sdkinfoPath = curpath + SDK_INFO_RELATIVE_PATH;
+                               File sdkinfoFile = new File(sdkinfoPath);
+                               if (sdkinfoFile.exists() && sdkinfoFile.isFile()) {
                                        br = new BufferedReader(new InputStreamReader(
-                                                       new FileInputStream(infoFile)));
-                                       line = br.readLine(); // sdkpath
+                                                       new FileInputStream(sdkinfoFile)));
+
+                                       String line = br.readLine(); // sdk install path
                                        if (isDataPath) {
                                                line = br.readLine(); // sdk data path
                                        }
@@ -186,34 +172,63 @@ public class PathManager {
                                }
                        }
                }
+
                return retPath;
        }
 
-       public static String getDefaultRoot() {
-               String rootPath = null;
+       public static String getTizenSdkDataPath() {
+               String defaultPath = null;
+
+               // case 1 : read from sdk.info
+               defaultPath = getPathFromSdkInfoFile(true);
+
+               // case 2 : get default install directory
+               if (null == defaultPath) {
+                       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 {
+                               defaultPath = "";
+                       }
+               }
+
+               File file = new File(defaultPath);
+               if (file == null || !file.exists()) {
+                       defaultPath = null;
+               }
+
+               return defaultPath;
+       }
+
+       public static String getTizenSdkInstallPath() {
+               String retPath = null;
                BufferedReader br = null;
-               String line = null;
 
                // case 1 : sdk.info
-               rootPath = getPathFromSdkInfoFile(false);
-               if (null == rootPath) {
+               retPath = getPathFromSdkInfoFile(false);
+
+               // case 2 : tizensdkpath in tizen-sdk-data directory
+               if (null == retPath) {
                        try {
-                               // case 2 : tizensdkpath
-                               rootPath = TIZEN_SDK_DATA_PATH + File.separator
-                                               + PathConstants.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);
+                               String infoPath = TIZEN_SDK_DATA_PATH + File.separator
+                                               + PathConstants.INSTALLATION_INFO;
+                               File file = new File(infoPath);
+                               if (file.exists() && file.isFile()) {
+                                       br = new BufferedReader(new InputStreamReader(
+                                                       new FileInputStream(file)));
+                                       String line = br.readLine();
+                                       if (null != line) {
+                                               retPath = line.substring(line.indexOf("=") + 1);
+                                       }
                                }
-
                        } catch (IOException e) {
                                e.printStackTrace();
                        } finally {
@@ -227,13 +242,13 @@ public class PathManager {
                        }
                }
 
-               return rootPath;
+               return retPath;
        }
 
        public static String getTizenHeaderSouecePath(boolean isArm, String platform) {
                String tizenHeaderSouecePath = "";
                if (platform != null) {
-                       String tempPath = TIZEN_ROOT_PATH;
+                       String tempPath = TIZEN_SDK_INSTALL_PATH;
                        if (null != tempPath) {
                                tempPath += File.separator + PathConstants.PLATFORM_FOLDER_NAME
                                                + File.separator + platform + File.separator
@@ -263,81 +278,22 @@ public class PathManager {
                return tizenHeaderSouecePath;
        }
 
-       public static String getInstallPath() {
-               String installPath = TIZEN_ROOT_PATH;
-               if (null != installPath) {
-                       installPath += File.separator + PathConstants.TOOLS_FOLDER_NAME
-                                       + File.separator
-                                       + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME;
-               }
-               return installPath;
-       }
-
-       public static String getSavePath() {
-               String savePath = TIZEN_SDK_DATA_PATH;
-               if (null != savePath) {
-                       savePath += File.separator
-                                       + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME
-                                       + File.separator + PathConstants.SAVE_FOLDER_NAME;
-               }
-               return savePath;
-       }
-
-       public static String getBinarySettingPath() {
-               String settingPath = TIZEN_SDK_DATA_PATH;
-               if (null != settingPath) {
-                       settingPath += File.separator
-                                       + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME
-                                       + File.separator + PathConstants.SETTING_FOLDER_NAME;
-               }
-               return settingPath;
-       }
-
-       public static String getRPMPath() {
-               String rpmPath = TIZEN_SDK_DATA_PATH;
-               if (null != rpmPath) {
-                       rpmPath += File.separator
-                                       + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME
-                                       + File.separator + PathConstants.RPM_FOLDER_NAME;
-               }
-               return rpmPath;
-       }
-
-       public static String getLogPath() {
-               String logPath = TIZEN_SDK_DATA_PATH;
-               if (null != logPath) {
-                       logPath += File.separator
-                                       + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME
-                                       + File.separator + PathConstants.LOGS_FOLDER_NAME;
-               }
-               return logPath;
-       }
-
-       public static String getSdbPath() {
-               String path = TIZEN_ROOT_PATH;
-               if (null != path) {
-                       path += File.separator + PathConstants.TOOLS_FOLDER_NAME
-                                       + File.separator + "sdb"; //$NON-NLS-1$
-               }
-               return path;
-       }
-
        public static String getTargetPath(String platform) {
                if (null != platform && !platform.isEmpty()) {
-                       return TIZEN_ROOT_PATH + File.separator
+                       return TIZEN_SDK_INSTALL_PATH + File.separator
                                        + PathConstants.PLATFORM_FOLDER_NAME + File.separator
                                        + platform + File.separator
                                        + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME
                                        + File.separator;
                } else {
-                       return DYNAMIC_ANALYZER_INSTALL_PATH + File.separator
+                       return DA_INSTALL_PATH + File.separator
                                        + PathConstants.TARGET_FOLDER_NAME + File.separator;
                }
        }
 
        public static String getProjectInfoFile(String projectSavePath) {
                StringBuffer projectInfoSaveFile = new StringBuffer("");
-               if (!getSavePath().equals("")) {
+               if (!DA_SAVE_PATH.equals("")) {
                        projectInfoSaveFile.append(projectSavePath);
                        projectInfoSaveFile.append(File.separator).append(
                                        PathConstants.PROJECT_INFO_FILE_NAME);
@@ -346,29 +302,8 @@ public class PathManager {
 
        }
 
-       public static String getConfigFolderPath() {
-               String configFolderPath = DYNAMIC_ANALYZER_INSTALL_PATH;
-               if (null != configFolderPath) {
-                       configFolderPath += File.separator
-                                       + PathConstants.CONFIG_FOLDER_NAME;
-               }
-               return configFolderPath;
-       }
-
-       public static String getConfigFilePath() {
-               String configFilePath = CONFIG_FOLDER_PATH;
-
-               if (null != configFilePath) {
-                       configFilePath += File.separator + PathConstants.CONFIG_FILE_NAME;
-               }
-               return configFilePath;
-       }
-
        public static String getAboutPath() {
-               String aboutFolderPath = TIZEN_ROOT_PATH;
-               if (null == aboutFolderPath) {
-                       return null;
-               }
+               String aboutFolderPath = TIZEN_SDK_INSTALL_PATH;
                aboutFolderPath += (File.separator
                                + PathConstants.ABOUT_IDE_FOLDER_NAME + File.separator + PathConstants.ABOUT_PLUGINS_FOLDER_NAME);
 
@@ -379,7 +314,6 @@ public class PathManager {
 
                                @Override
                                public boolean accept(File dir, String name) {
-                                       // TODO Auto-generated method stub
                                        return name
                                                        .contains(PathConstants.ABOUT_BASE_PLATFORM_FOLDER_NAME);
                                }
@@ -399,7 +333,7 @@ public class PathManager {
        }
 
        public static String getWorkbenchPath() {
-               String aboutFolderPath = TIZEN_ROOT_PATH;
+               String aboutFolderPath = TIZEN_SDK_INSTALL_PATH;
                if (null == aboutFolderPath) {
                        return null;
                }
@@ -414,7 +348,6 @@ public class PathManager {
 
                                @Override
                                public boolean accept(File dir, String name) {
-                                       // TODO Auto-generated method stub
                                        return name
                                                        .contains(PathConstants.ABOUT_WORKBENCH_FOLDER_NAME);
                                }
@@ -434,10 +367,29 @@ public class PathManager {
 
        public static String getRootStrapsPath(String platform) {
                if (platform != null) {
-                       return TIZEN_ROOT_PATH + File.separator + "platforms"
+                       return TIZEN_SDK_INSTALL_PATH + File.separator + "platforms"
                                        + File.separator + platform + File.separator + "rootstraps";
                } else {
                        return "";
                }
        }
+
+       public static String getWindowActivatorPath() {
+               String returnstr;
+
+               if (CommonUtil.isWin()) {
+                       returnstr = DA_TOOL_FOLDER_PATH + File.separator
+                                       + PathConstants.WINDOW_ACTIVATOR_WINDOWS;
+               } else if (CommonUtil.isMac()) {
+                       returnstr = DA_TOOL_FOLDER_PATH + File.separator
+                                       + PathConstants.WINDOW_ACTIVATOR_MACOS;
+               } else if (CommonUtil.isLinux()) {
+                       returnstr = DA_TOOL_FOLDER_PATH + File.separator
+                                       + PathConstants.WINDOW_ACTIVATOR_LINUX;
+               } else {
+                       returnstr = null;
+               }
+
+               return returnstr;
+       }
 }
index 3f2b597..e550c87 100755 (executable)
@@ -44,63 +44,70 @@ 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.PathConstants;
 import org.tizen.dynamicanalyzer.common.path.PathManager;
 import org.tizen.dynamicanalyzer.util.FileUtil;
 
 public class Application implements IApplication {
-       private boolean STDOUT_TO_FILE = false;
        private static final String LOG_PREFIX = "da_log_";
-       private static final int LOG_COUNT = 3;
+       private static final int MAX_LOG_COUNT = 3;
 
        @Override
        public Object start(IApplicationContext context) throws Exception {
                Display display = PlatformUI.createDisplay();
 
-               // set workspace directory for dynamic analyzer
-               Location instanceLoc = Platform.getInstanceLocation();
-               String path = PathManager.DYNAMIC_ANALYZER_INSTALL_PATH
-                               + File.separator;
-               instanceLoc.set(new URL("file", null, path), false);
-
-               // create log file of dynamic analyzer
-               SimpleDateFormat format = new SimpleDateFormat("yyyy_MM_dd_HH-mm-ss", //$NON-NLS-1$
-                               Locale.KOREA);
-               Date date = new Date();
-               String logPostFix = format.format(date);
-               PathManager.setLogPostFix(logPostFix);
-               if (STDOUT_TO_FILE) {
-                       String logPath = PathManager.getLogPath();
-                       File logs = new File(logPath);
-                       boolean success = true;
-                       if (!logs.exists()) {
-                               if (!logs.mkdirs()) {
+               // check for tizen sdk installation
+               boolean pathValidness = PathManager.checkTizenPathValidation();
+
+               if (pathValidness) {
+
+                       // set workspace directory for dynamic analyzer
+                       Location instanceLoc = Platform.getInstanceLocation();
+                       String path = PathManager.DA_INSTALL_PATH + File.separator;
+                       instanceLoc.set(new URL("file", null, path), false);
+
+                       // set log postfix
+                       SimpleDateFormat format = new SimpleDateFormat(
+                                       "yyyy_MM_dd_HH-mm-ss", //$NON-NLS-1$
+                                       Locale.KOREA);
+                       Date date = new Date();
+                       String logPostFix = format.format(date);
+                       PathManager.setLogPostFix(logPostFix);
+
+                       // check for log to file
+                       String logtofile = PathManager.DA_DATA_PATH + File.separator
+                                       + PathConstants.DA_STDOUT_TO_FILE;
+                       File ltofile = new File(logtofile);
+                       if (ltofile != null && ltofile.exists()) {
+                               String logPath = PathManager.DA_LOG_PATH;
+                               File logs = new File(logPath);
+                               if (!logs.exists() && !logs.mkdirs()) {
                                        System.out
                                                        .println("Log directory create failed.. log file create failed...");
-                                       success = false;
+                               } else {
+                                       String logFileName = LOG_PREFIX + logPostFix;//$NON-NLS-1$
+                                       logPath += File.separator + logFileName;
+
+                                       File logfile = new File(logPath);
+                                       FileOutputStream fos = new FileOutputStream(logfile);
+                                       PrintStream ps = new PrintStream(fos);
+                                       System.setOut(ps);
+                                       System.setErr(ps);
+
+                                       checkLogs(logs.getPath());
                                }
                        }
-                       if (success) {
-                               String logFileName = LOG_PREFIX + logPostFix;//$NON-NLS-1$
-                               logPath += File.separator + logFileName;
 
-                               File file = new File(logPath);
-                               FileOutputStream fos = new FileOutputStream(file);
-                               PrintStream ps = new PrintStream(fos);
-                               System.setOut(ps);
-                               System.setErr(ps);
-
-                               checkLogs(logs.getPath());
+                       // check for multiple instance of dynamic analyzer
+                       if (WorkbenchSingletonFocusManager.checkDASingleton()) {
+                               System.out.println("Already DA Running");
+                               WorkbenchSingletonFocusManager.setFocusDA();
+                               System.exit(-1);
+                       } else {
+                               System.out.println("The First DA Running");
                        }
-               }
 
-               // check for multiple instance of dynamic analyzer
-               if (WorkbenchSingletonFocusManager.checkDASingleton()) {
-                       System.out.println("Already DA Running");
-                       WorkbenchSingletonFocusManager.setFocusDA();
-                       System.exit(-1);
-               } else {
-                       System.out.println("First DA Running");
-               }
+               } // end of if (pathValidness)
 
                int returnCode = PlatformUI.createAndRunWorkbench(display,
                                new ApplicationWorkbenchAdvisor());
@@ -129,11 +136,13 @@ public class Application implements IApplication {
                });
        }
 
+       // check previous log file and make less or equal than 3 log files
        private void checkLogs(String path) {
                List<String> logFiles = FileUtil.getFilesInDir(path);
                if (null == logFiles) {
                        return;
                }
+
                List<String> daLogFiles = new ArrayList<String>();
                for (String name : logFiles) {
                        if (name.contains(LOG_PREFIX)) {
@@ -141,9 +150,9 @@ public class Application implements IApplication {
                        }
                }
 
-               if (daLogFiles.size() > 3) {
+               if (daLogFiles.size() > MAX_LOG_COUNT) {
                        Collections.sort(daLogFiles);
-                       int to = daLogFiles.size() - LOG_COUNT;
+                       int to = daLogFiles.size() - MAX_LOG_COUNT;
                        for (int i = 0; i < to; i++) {
                                File deleteFile = new File(path + File.separator
                                                + daLogFiles.get(i));
index bbe6156..b50869c 100755 (executable)
@@ -39,7 +39,7 @@ import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
-import org.tizen.dynamicanalyzer.common.model.ExecutionCallbackManager;
+import org.tizen.dynamicanalyzer.common.callback.ExecutionCallbackManager;
 
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 
index 4145f3e..af58f6e 100644 (file)
@@ -58,4 +58,8 @@ public class LayoutManager {
                        ((Composite) page).layout(true);
                }
        }
+       
+       public static void setEnabled(boolean enablement) {
+               baseComposite.setEnabled(enablement);
+       }
 }
index 99a4623..ae80772 100644 (file)
@@ -35,7 +35,6 @@ import java.io.RandomAccessFile;
 import java.nio.channels.FileLock;
 
 import org.tizen.dynamicanalyzer.common.path.PathManager;
-import org.tizen.dynamicanalyzer.util.CommonUtil;
 
 public class WorkbenchSingletonFocusManager {
        private static Runtime runtime;
@@ -48,18 +47,14 @@ public class WorkbenchSingletonFocusManager {
 
                String[] returnStr = null;
                String strPid = getPidFromConfigFile();
+               String activator = PathManager.getWindowActivatorPath();
+
                if (null == strPid) {
                        return returnStr;
                }
-               if (CommonUtil.isWin()) {
-                       returnStr = new String[] {
-                                       PathManager.WINDOW_ACTIVATOR_WIDOWS_PATH, strPid };
-               } else if (CommonUtil.isMac()) {
-                       returnStr = new String[] {
-                                       PathManager.WINDOW_ACTIVATOR_MACOS_PATH, strPid };
-               } else if (CommonUtil.isLinux()) {
-                       returnStr = new String[] {
-                                       PathManager.WINDOW_ACTIVATOR_LINUX_PATH, strPid };
+
+               if (activator != null) {
+                       returnStr = new String[] { activator, strPid };
                } else {
                        System.out.println("Failed - not Support OS");
                }
@@ -99,8 +94,8 @@ public class WorkbenchSingletonFocusManager {
 
        private static String getPidFromConfigFile() {
                String pid = null;
-               File configFile = new File(PathManager.DYNAMIC_ANALYZER_INSTALL_PATH
-                               + File.separator + CONFIG + File.separator + CONFIG);
+               File configFile = new File(PathManager.DA_INSTALL_PATH + File.separator
+                               + CONFIG + File.separator + CONFIG);
                if (!configFile.isFile()) {
                        System.out.println("Failed get pid - exist config file");
                        return "";//$NON-NLS-1$
@@ -125,7 +120,6 @@ public class WorkbenchSingletonFocusManager {
                                                in.close();
                                        }
                                } catch (IOException e) {
-                                       // TODO Auto-generated catch block
                                        e.printStackTrace();
                                }
                        }
@@ -156,7 +150,7 @@ public class WorkbenchSingletonFocusManager {
                FileLock fileLock = null;
                boolean isFileLock = false;
 
-               String saveFolderPath = PathManager.getSavePath();
+               String saveFolderPath = PathManager.DA_SAVE_PATH;
 
                File daSaveFile = new File(saveFolderPath);
                if (!daSaveFile.isDirectory()) {
index e18af04..512d0ab 100644 (file)
@@ -20,14 +20,6 @@ Bundle-ClassPath: .,
  lib/hsqldb.jar,
  lib/json-simple-1.1.1.jar,
  lib/protobuf.jar
-Export-Package: org.tizen.dynamicanalyzer.common,
- org.tizen.dynamicanalyzer.communicator,
- org.tizen.dynamicanalyzer.error,
- org.tizen.dynamicanalyzer.handlers,
- org.tizen.dynamicanalyzer.ui.toolbar,
- org.tizen.dynamicanalyzer.ui.toolbar.configuration,
- org.tizen.dynamicanalyzer.ui.widgets,
- org.tizen.dynamicanalyzer.utils
 Import-Package: junit.framework;version="4.8.2",
  org.junit,
  org.tizen.common.sdb.command,
index 28e0785..b04a939 100644 (file)
@@ -30,6 +30,8 @@ import java.io.File;
 import java.util.List;\r
 \r
 \r
+import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.ui.IPartService;\r
 import org.eclipse.ui.IWorkbench;\r
 import org.eclipse.ui.IWorkbenchListener;\r
@@ -40,7 +42,11 @@ import org.osgi.framework.BundleContext;
 import org.tizen.dynamicanalyzer.common.path.PathManager;\r
 import org.tizen.dynamicanalyzer.listeners.AnalyzerPartListener;\r
 import org.tizen.dynamicanalyzer.listeners.AnalyzerPerspectiveListener;\r
+import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;\r
+import org.tizen.dynamicanalyzer.resources.ImageResources;\r
 import org.tizen.dynamicanalyzer.sql.SqlManager;\r
+import org.tizen.dynamicanalyzer.ui.widgets.DADialog;\r
+import org.tizen.dynamicanalyzer.util.WorkbenchUtil;\r
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;\r
 \r
 public class AnalyzerPlugin extends AbstractUIPlugin {\r
@@ -55,6 +61,18 @@ public class AnalyzerPlugin extends AbstractUIPlugin {
        public void start(BundleContext context) throws Exception {\r
                super.start(context);\r
                plugin = this;\r
+               \r
+               // check for path validness\r
+               if (!PathManager.checkTizenPathValidation()) {\r
+                       final Shell shell = WorkbenchUtil.getWorkbenchWindow()\r
+                                       .getShell();\r
+                       DADialog dialog = new DADialog(shell, SWT.NONE); // FIXME\r
+                       dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);\r
+                       dialog.setMessage(AnalyzerLabels.PATH_WARNING);\r
+                       if (dialog.open() == true) {\r
+                               System.exit(-1);\r
+                       }\r
+               }\r
 \r
                // Adds workbench listener.\r
                IWorkbench workbench = PlatformUI.getWorkbench();\r
@@ -84,7 +102,7 @@ public class AnalyzerPlugin extends AbstractUIPlugin {
                                 **/\r
                                if (delete) {\r
                                        SqlManager.getInstance().closeConnection();\r
-                                       File tempDir = new File(PathManager.TEMP_FOLDER_PATH);\r
+                                       File tempDir = new File(PathManager.DA_TEMP_FOLDER_PATH);\r
                                        if (tempDir.isDirectory() && tempDir.exists()) {\r
                                                if (AnalyzerUtil.deleteFile(tempDir)) {\r
                                                        System.out.println("Delete temp folder!"); //$NON-NLS-1$\r
@@ -105,7 +123,7 @@ public class AnalyzerPlugin extends AbstractUIPlugin {
                IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();\r
                window.addPerspectiveListener(new AnalyzerPerspectiveListener());\r
 \r
-               File saveFolder = new File(PathManager.TEMP_FOLDER_PATH);\r
+               File saveFolder = new File(PathManager.DA_TEMP_FOLDER_PATH);\r
                if (saveFolder.exists()) {\r
                        if (AnalyzerUtil.deleteFile(saveFolder)) {\r
                                System.out.println("delete temp folder");\r
index 1444888..351a130 100644 (file)
@@ -38,7 +38,6 @@ 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.util.CommonUtil;
 import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 
 public class DASingletonFocusManager {
@@ -73,16 +72,10 @@ public class DASingletonFocusManager {
                String[] returnStr = null;
                String strPid = ConfigureManager.getInstance().getValue(
                                ConfigureLabels.SINGLETON_FOCUS_DA_PID);
+               String activator = PathManager.getWindowActivatorPath();
 
-               if (CommonUtil.isWin()) {
-                       returnStr = new String[] {
-                                       PathManager.WINDOW_ACTIVATOR_WIDOWS_PATH, strPid };
-               } else if (CommonUtil.isMac()) {
-                       returnStr = new String[] {
-                                       PathManager.WINDOW_ACTIVATOR_MACOS_PATH, strPid };
-               } else if (CommonUtil.isLinux()) {
-                       returnStr = new String[] {
-                                       PathManager.WINDOW_ACTIVATOR_LINUX_PATH, strPid };
+               if (activator != null) {
+                       returnStr = new String[] { activator, strPid };
                } else {
                        Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
                        DADialog warning = new DADialog(shell, SWT.NONE);
index f15273f..dd0fb68 100644 (file)
@@ -1,7 +1,7 @@
 package org.tizen.dynamicanalyzer.common;
 
 import org.eclipse.swt.widgets.Shell;
-import org.tizen.dynamicanalyzer.common.model.IExecutionCallback;
+import org.tizen.dynamicanalyzer.common.callback.IExecutionCallback;
 import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager;
 import org.tizen.dynamicanalyzer.ui.toolbar.configuration.WelcomeDialog;
 import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
index e586557..782ecc1 100644 (file)
@@ -1,6 +1,6 @@
 package org.tizen.dynamicanalyzer.common;
 
-import org.tizen.dynamicanalyzer.common.model.IExecutionCallback;
+import org.tizen.dynamicanalyzer.common.callback.IExecutionCallback;
 import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 import org.tizen.dynamicanalyzer.handlers.ExitHandler;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
index 580c317..1176545 100755 (executable)
@@ -92,7 +92,7 @@ public class CommunicatorUtils {
 
        public static HostResult uploadReadElf() {
                long readelfSize = -1;
-               String readelf = PathManager.READELF_PATH;
+               String readelf = PathManager.DA_READELF_PATH + File.separator;
                HostResult result = null;
 
                if (isCurrentDeviceArmArch()) {
@@ -473,7 +473,7 @@ public class CommunicatorUtils {
        }
 
        public static List<String> getApiMap(IDevice device) {
-               String apiFilePath = PathManager.TEMP_FOLDER_PATH + File.separator
+               String apiFilePath = PathManager.DA_TEMP_FOLDER_PATH + File.separator
                                + device.getSerialNumber() + CommonConstants.UNDERBAR
                                + AnalyzerConstants.API_NAME_FILE_NAME;
                try {
index 347ce38..dd2917a 100644 (file)
@@ -636,7 +636,7 @@ public class DACommunicator {
 
        public static void pullDaemonLog() {
                final String from = PathConstants.DA_DAEMON_LOG_PATH;
-               final String to = PathManager.getLogPath() + File.separator
+               final String to = PathManager.DA_LOG_PATH + File.separator
                                + DAEMONLOG_PREFIX + PathManager.getLogPostFix();//$NON-NLS-1$ 
                SyncResult res = CommunicatorUtils.pull(from, to);
                if (null != res && res.isOk()) {
@@ -645,7 +645,7 @@ public class DACommunicator {
                        System.out.println("Failed to get " + from); //$NON-NLS-1$ 
                }
 
-               AnalyzerUtil.checkLogs(PathManager.getLogPath(), DAEMONLOG_PREFIX,
+               AnalyzerUtil.checkLogs(PathManager.DA_LOG_PATH, DAEMONLOG_PREFIX,
                                DAEMONLOG_COUNT);
        }
 
index 8a58a34..2217b53 100644 (file)
@@ -47,7 +47,7 @@ public class OpenTraceCompleteHandler extends AbstractHandler {
                                DAPageComposite page = AnalyzerManager.getCurrentPage();
                                page.updatePage();
                                if (AnalyzerManager.getProject().getSavePath()
-                                               .contains(PathManager.TEMP_FOLDER_PATH)) {
+                                               .contains(PathManager.DA_TEMP_FOLDER_PATH)) {
                                        ToolbarArea.getInstance().setMainControlEnablement(true);
                                } else {
                                        ToolbarArea.getInstance().setSaveButtonEnable(false);
index 45b2dae..5881e1e 100644 (file)
@@ -35,7 +35,7 @@ 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.callback.ExecutionCallbackManager;
 import org.tizen.dynamicanalyzer.common.path.PathManager;
 import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 import org.tizen.dynamicanalyzer.communicator.IDECommunicator;
@@ -61,18 +61,6 @@ public class AnalyzerPerspectiveListener extends PerspectiveAdapter {
                        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()
index e21bc99..c077ea8 100755 (executable)
@@ -295,7 +295,7 @@ public class Project {
                if (length > 0) {
                        tmpAppName = tmpAppName.substring(0, MAX_FILENAME_LENGTH - 1);
                }
-               setSavePath(PathManager.TEMP_FOLDER_PATH + File.separator
+               setSavePath(PathManager.DA_TEMP_FOLDER_PATH + File.separator
                                + tmpAppName + format.format(date));
                File imgFolder = new File(getSavePath() + File.separator
                                + AnalyzerConstants.IMAGE_FOLDER_NAME);
index 7850c99..615dcf9 100755 (executable)
@@ -192,7 +192,7 @@ public class Communicator30 extends BaseCommunicator {
                
                if(PRINT_CONTROL_LOG_TOFILE) {
                        File logPath = new File(
-                                       PathManager.DA_DEBUG_CONTROL_CHANNEL_LOG_PATH);
+                                       PathManager.DA_DEBUG_CONTROL_CHANNEL_LOG_FILE);
                        if (logPath.exists()) {
                                logPath.delete();
                        }
@@ -377,7 +377,7 @@ public class Communicator30 extends BaseCommunicator {
                        binInfo.setTempBinaryPath(localBinaryPath);
                        if (splitLocalBinaryPath.length == 0
                                        || splitLocalBinaryPath.length < 3) {
-                               localBinaryPath = PathManager.TEMP_FOLDER_PATH
+                               localBinaryPath = PathManager.DA_TEMP_FOLDER_PATH
                                                + File.separator + getFileName(targetPath);
                                result = pullTheFile(targetPath, localBinaryPath);
                                if (result.isSuccess()) {
@@ -402,7 +402,7 @@ public class Communicator30 extends BaseCommunicator {
                        // change binary file path of host
                        File binFile = new File(localBinaryPath);
                        if (!binFile.exists()) {
-                               localBinaryPath = PathManager.TEMP_FOLDER_PATH
+                               localBinaryPath = PathManager.DA_TEMP_FOLDER_PATH
                                                + File.separator + getFileName(targetPath);
                                result = pullTheFile(targetPath, localBinaryPath);
                                if (result.isSuccess()) {
@@ -441,7 +441,7 @@ public class Communicator30 extends BaseCommunicator {
 
                        String targetHashCode = binInfo.getMd5sumValue();
                        if (0 != targetHashCode.compareTo(localHashCode)) {
-                               localBinaryPath = PathManager.TEMP_FOLDER_PATH
+                               localBinaryPath = PathManager.DA_TEMP_FOLDER_PATH
                                                + File.separator + getFileName(targetPath);
                                result = pullTheFile(targetPath, localBinaryPath);
                                if (result.isSuccess()) {
@@ -1067,7 +1067,7 @@ public class Communicator30 extends BaseCommunicator {
                        String[] splitLocalBinaryPath = localBinaryPath
                                        .split(CommonConstants.SLASH);
                        if (splitLocalBinaryPath.length <= 0) {
-                               localBinaryPath = PathManager.TEMP_FOLDER_PATH
+                               localBinaryPath = PathManager.DA_TEMP_FOLDER_PATH
                                                + File.separator + getFileName(binPaths.get(i));
                                result = pullTheFile(binPaths.get(i), localBinaryPath);
                                if (result.isSuccess()) {
@@ -1090,7 +1090,7 @@ public class Communicator30 extends BaseCommunicator {
                        // change binary file path of host
                        File binFile = new File(localBinaryPath);
                        if (!binFile.exists()) {
-                               localBinaryPath = PathManager.TEMP_FOLDER_PATH
+                               localBinaryPath = PathManager.DA_TEMP_FOLDER_PATH
                                                + File.separator + getFileName(binPaths.get(i));
                                result = pullTheFile(binPaths.get(i), localBinaryPath);
                                if (result.isSuccess()) {
@@ -1127,7 +1127,7 @@ public class Communicator30 extends BaseCommunicator {
 
                        String targetHashCode = binInfo.getMd5sumValue();
                        if (!targetHashCode.equals(localHashCode)) {
-                               localBinaryPath = PathManager.TEMP_FOLDER_PATH
+                               localBinaryPath = PathManager.DA_TEMP_FOLDER_PATH
                                                + File.separator + getFileName(binPaths.get(i));
                                result = pullTheFile(binPaths.get(i), localBinaryPath);
                                if (result.isSuccess()) {
index f7bee9e..e2f5d50 100755 (executable)
@@ -405,7 +405,7 @@ public class MessageParser {
                
                if(PRINT_DATA_LOG_TOFILE) {
                        File logPath = new File(
-                                       PathManager.DA_DEBUG_DATA_CHANNEL_LOG_PATH);
+                                       PathManager.DA_DEBUG_DATA_CHANNEL_LOG_FILE);
                        if (logPath.exists()) {
                                logPath.delete();
                        }
@@ -585,7 +585,7 @@ public class MessageParser {
                                                                153);
                                                dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
                                                dialog.setMessage(AnalyzerLabels.HEAP_MEMORY_WARNING_PRE
-                                                               + PathManager.DYNAMIC_ANALYZER_INSTALL_PATH
+                                                               + PathManager.DA_INSTALL_PATH
                                                                + AnalyzerLabels.HEAP_MEMORY_WARNING_POST);
                                                dialog.open();
                                        }
index 9dc5553..40964d1 100644 (file)
@@ -120,7 +120,7 @@ public class BinarySettingManager {
                                }
 
                                // copy rpm file
-                               String rpmPath = PathManager.getRPMPath() + File.separator
+                               String rpmPath = PathManager.DA_RPM_PATH + File.separator
                                                + libFullName;
                                File rpms = new File(rpmPath);
                                if (!rpms.exists()) {
@@ -154,7 +154,7 @@ public class BinarySettingManager {
 
                                // extract rpm file exists
                                if (null != debugRpmPath) {
-                                       String toolPath = PathManager.TOOL_FOLDER_PATH
+                                       String toolPath = PathManager.DA_TOOL_FOLDER_PATH
                                                        + File.separator + "debuginfo.sh";
                                        String[] command = null;
                                        if (null != debugRpmSourcePath) {
@@ -208,7 +208,7 @@ public class BinarySettingManager {
                                                        libFullName.length());
                                        String libVersion = libPostFix.substring(4,
                                                        libPostFix.length());
-                                       String debugCmd = PathManager.TOOL_FOLDER_PATH
+                                       String debugCmd = PathManager.DA_TOOL_FOLDER_PATH
                                                        + File.separator + "debuginfo.sh -f " + rpmPath
                                                        + " " + "*" + libPostFix + ".debug";
                                        String debugFilePath = null;
@@ -245,7 +245,7 @@ public class BinarySettingManager {
                                        if (null != debugRpmSourcePath
                                                        && !debugRpmSourcePath.isEmpty()) {
                                                String sourceFilePath = null;
-                                               String sourceCmd = PathManager.TOOL_FOLDER_PATH
+                                               String sourceCmd = PathManager.DA_TOOL_FOLDER_PATH
                                                                + File.separator + "debuginfo.sh -f " + rpmPath
                                                                + " " + "*" + libVersion;
                                                try {
@@ -281,7 +281,7 @@ public class BinarySettingManager {
                                                binData.setDebugSourcePath(CommonConstants.EMPTY);
                                        }
                                } else if (debugFileName.contains("debug-")) {
-                                       String debugCmd = PathManager.TOOL_FOLDER_PATH
+                                       String debugCmd = PathManager.DA_TOOL_FOLDER_PATH
                                                        + File.separator + "debuginfo.sh -f " + rpmPath
                                                        + CommonConstants.SPACE + libFullName;
                                        String debugFilePath = null;
@@ -413,7 +413,7 @@ public class BinarySettingManager {
        }
 
        public void initBinarySettings() {
-               File saveFile = new File(PathManager.BINARY_AUTO_SAVE_PATH);
+               File saveFile = new File(PathManager.DA_BINARY_AUTO_SAVE_FILE);
                BufferedReader br = null;
                String content = null;
                try {
@@ -454,7 +454,7 @@ public class BinarySettingManager {
                                + "-debuginfo*.rpm";
                // String rootstrapPath = PathManager.getRootStrapsPath();
                List<String> lines = new ArrayList<String>();
-               String toolPath = PathManager.TOOL_FOLDER_PATH + File.separator
+               String toolPath = PathManager.DA_TOOL_FOLDER_PATH + File.separator
                                + "debuginfo.sh";
                String[] command = new String[] { toolPath, "-f", rootPath,
                                debugInfoToken };
index 6ff329c..ea4ac69 100644 (file)
@@ -194,7 +194,7 @@ public class LoadSettingDialog extends DAMessageBox {
                                return;
                        }
                        GridItem selection = selections[0];
-                       String openPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH
+                       String openPath = PathManager.DA_SETTING_PATH
                                        + File.separator + selection.getText();
 
                        openAction(openPath);
@@ -233,7 +233,7 @@ public class LoadSettingDialog extends DAMessageBox {
                        }
 
                        GridItem item = items[0];
-                       String openPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH
+                       String openPath = PathManager.DA_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 = PathManager.DYNAMIC_ANALYZER_SETTING_PATH
+                               String openPath = PathManager.DA_SETTING_PATH
                                                + File.separator + item.getText();
 
                                if (AnalyzerUtil.deleteFile(new File(openPath))) {
index 84c4e2c..fe951bf 100644 (file)
@@ -139,7 +139,7 @@ public class SaveSettingDialog extends DAMessageBox {
        }
 
        private boolean executeSaveTrace() {
-               String targetPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH
+               String targetPath = PathManager.DA_SETTING_PATH
                                + File.separator + saveFileName + ".setting";
                File saveFile = new File(targetPath);
                FileWriter fileWriter = null;
index a58903d..4f2a8d0 100644 (file)
@@ -46,7 +46,7 @@ public class SettingSaveTable extends DATableComposite {
        @Override
        protected List<TableInput> makeTableInput() {
                List<String> saveFileList = AnalyzerUtil
-                               .getFiles(PathManager.DYNAMIC_ANALYZER_SETTING_PATH);
+                               .getFiles(PathManager.DA_SETTING_PATH);
                List<TableInput> input = new ArrayList<TableInput>();
                if (null != saveFileList) {
                        int size = saveFileList.size();
index 8de7126..1e7c829 100755 (executable)
@@ -55,10 +55,11 @@ public class BaseView extends ViewPart {
 
        @Override
        public void createPartControl(Composite parent) {
-               
+               // create toolbar
                Composite toolbarComposite = LayoutManager.getToolbarComposite();
                ToolbarArea.createInstance(toolbarComposite);
-               
+
+               // create tab view in base composite
                tabView = new DATabComposite(parent, SWT.DOUBLE_BUFFERED);
                tabView.setTabWidth(110);
                {
index 591dc20..6251aac 100644 (file)
@@ -308,11 +308,11 @@ public class ConfigureManager {
        }
 
        private void initConfigDataFromFile() {
-               if (null == PathManager.CONFIG_FOLDER_PATH) {
+               if (null == PathManager.DA_CONFIG_FOLDER_PATH) {
                        return;
                }
 
-               File configFolder = new File(PathManager.CONFIG_FOLDER_PATH);
+               File configFolder = new File(PathManager.DA_CONFIG_FOLDER_PATH);
                if (!configFolder.isDirectory()) {
                        if (!configFolder.mkdirs()) {
                                System.out.println("config directory create failed...");
@@ -320,8 +320,7 @@ public class ConfigureManager {
                        }
                }
 
-               File configFile = new File(configFolder,
-                               PathConstants.CONFIG_FILE_NAME);
+               File configFile = new File(configFolder, PathConstants.CONFIG_FILE_NAME);
                if (!configFile.isFile()) {
                        try {
                                configFile.createNewFile();
@@ -350,10 +349,8 @@ public class ConfigureManager {
        }
 
        private void setConfigDataToFile() {
-               String configFilePath = PathManager.getConfigFilePath();
-               if (null == configFilePath) {
-                       return;
-               }
+               String configFilePath = PathManager.DA_CONFIG_FOLDER_PATH
+                               + File.separator + PathConstants.CONFIG_FILE_NAME;
 
                File configFile = new File(configFilePath);
                FileWriter fileWriter = null;
@@ -509,7 +506,7 @@ public class ConfigureManager {
        public int getSamplingPeriod() {
                return getValueInt(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC);
        }
-       
+
        public static String getPlatform() {
                String platform = ConfigureManager.getInstance().getValue(
                                ConfigureLabels.PLATFORM);
index 6d24c5b..ad77ed0 100644 (file)
@@ -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(PathManager.CONFIG_FOLDER_PATH);
+               File configFolder = new File(PathManager.DA_CONFIG_FOLDER_PATH);
                if (!configFolder.isDirectory()) {
                        return AnalyzerLabels.LICENSE_DIALOG_NOT_FOUND;
                }
index 4a0072b..f095e5d 100755 (executable)
@@ -247,7 +247,7 @@ public class SaveAsDialog extends DAMessageBox {
        private boolean executeSaveTrace() {
                Project project = AnalyzerManager.getProject();
                String sourcePath = project.getSavePath();
-               String targetPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH
+               String targetPath = PathManager.DA_SAVE_PATH
                                + File.separator + saveFileName;
 
                SqlManager.getInstance().closeConnection();
index 8b4d760..48fa4fd 100755 (executable)
@@ -1159,11 +1159,6 @@ public class ToolbarArea {
                return buttons.get(id);
        }
 
-       public void setEnabled(boolean enabled) {
-               // TODO : greatim : how to get baseComposite
-//             baseComposite.setEnabled(enabled);
-       }
-
        public void setToolbarStartStopState(final boolean isStop) {
                Display.getDefault().syncExec(new Runnable() {
                        @Override
index 137c246..bc066a1 100644 (file)
@@ -243,7 +243,7 @@ public class BinarySettingsPage extends DAPageComposite {
                inputRowHash = BinarySettingManager.getInstance().getInputRowHash();
                inputRowList = BinarySettingManager.getInstance().getInputRowList();
 
-               String settingPath = PathManager.DYNAMIC_ANALYZER_SETTING_PATH;
+               String settingPath = PathManager.DA_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 = PathManager.BINARY_AUTO_SAVE_PATH;
+               String targetPath = PathManager.DA_BINARY_AUTO_SAVE_FILE;
 
                File saveFile = new File(targetPath);
                FileWriter fileWriter = null;
index 8c4b5b8..f1f3921 100644 (file)
@@ -310,10 +310,10 @@ public class OpenTraceDialog extends DAMessageBox {
                                GridItem selection = selections[0];
                                String openPath = null;
                                if ((Integer) selection.getData() == TEMP_FOLDER) {
-                                       openPath = PathManager.TEMP_FOLDER_PATH + File.separator
+                                       openPath = PathManager.DA_TEMP_FOLDER_PATH + File.separator
                                                        + selection.getText();
                                } else if ((Integer) selection.getData() == SAVE_FOLDER) {
-                                       openPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH
+                                       openPath = PathManager.DA_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 = PathManager.TEMP_FOLDER_PATH + File.separator
+                               openPath = PathManager.DA_TEMP_FOLDER_PATH + File.separator
                                                + item.getText();
                        } else if ((Integer) item.getData() == SAVE_FOLDER) {
-                               openPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH
+                               openPath = PathManager.DA_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 = PathManager.TEMP_FOLDER_PATH + File.separator
+                                       openPath = PathManager.DA_TEMP_FOLDER_PATH + File.separator
                                                        + item.getText();
                                } else if ((Integer) item.getData() == SAVE_FOLDER) {
-                                       openPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH
+                                       openPath = PathManager.DA_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 = PathManager.TEMP_FOLDER_PATH + File.separator
+                       path = PathManager.DA_TEMP_FOLDER_PATH + File.separator
                                        + item.getText(0);
                } else if ((Integer) item.getData() == SAVE_FOLDER) {
-                       path = PathManager.DYNAMIC_ANALYZER_SAVE_PATH + File.separator
+                       path = PathManager.DA_SAVE_PATH + File.separator
                                        + item.getText(0);
                } else {
                        return;
index b65527f..eff46c6 100644 (file)
@@ -61,7 +61,7 @@ public class SaveFilesTable extends DATableComposite {
        @Override
        protected List<TableInput> makeTableInput() {
                List<String> saveFileList = AnalyzerUtil
-                               .getDirs(PathManager.DYNAMIC_ANALYZER_SAVE_PATH);
+                               .getDirs(PathManager.DA_SAVE_PATH);
                List<TableInput> input = new ArrayList<TableInput>();
                if (null != saveFileList) {
                        int size = saveFileList.size();
@@ -70,7 +70,7 @@ public class SaveFilesTable extends DATableComposite {
                                List<String> text = new ArrayList<String>();
                                if (!saveFileList.get(i).equals(
                                                PathConstants.TEMP_FOLDER_NAME)) {
-                                       String path = PathManager.DYNAMIC_ANALYZER_SAVE_PATH
+                                       String path = PathManager.DA_SAVE_PATH
                                                        + File.separator + saveFileList.get(i);
                                        String inputText1 = saveFileList.get(i);
                                        String inputText2 = getCreateTime(path);
@@ -137,7 +137,7 @@ public class SaveFilesTable extends DATableComposite {
                        } else {
                                gridItem.setData(OpenTraceDialog.VERSION_KEY,
                                                OpenTraceDialog.VERSION_VALID);
-                               String path = PathManager.DYNAMIC_ANALYZER_SAVE_PATH
+                               String path = PathManager.DA_SAVE_PATH
                                                + File.separator + text.get(TRACE_NAME_INDEX);
 
                                Project project = AnalyzerManager.getProject();
index f6b2391..080031f 100644 (file)
@@ -55,7 +55,7 @@ public class TempFilesTable extends DATableComposite {
        @Override
        protected List<TableInput> makeTableInput() {
                List<String> tempFileList = AnalyzerUtil
-                               .getDirs(PathManager.TEMP_FOLDER_PATH);
+                               .getDirs(PathManager.DA_TEMP_FOLDER_PATH);
                List<TableInput> input = new ArrayList<TableInput>();
                if (null != tempFileList) {
                        int size = tempFileList.size();
@@ -64,7 +64,7 @@ public class TempFilesTable extends DATableComposite {
                                List<String> text = new ArrayList<String>();
                                if (!tempFileList.get(i).equals(
                                                PathConstants.TEMP_FOLDER_NAME)) {
-                                       String path = PathManager.TEMP_FOLDER_PATH
+                                       String path = PathManager.DA_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 = PathManager.TEMP_FOLDER_PATH + File.separator
+                       String path = PathManager.DA_TEMP_FOLDER_PATH + File.separator
                                        + text.get(TRACE_NAME_INDEX);
                        Project project = AnalyzerManager.getProject();
                        if (null != project) {
index 83b9da5..c2a9dc5 100755 (executable)
@@ -245,7 +245,7 @@ public class RepalyEditSaveDialog extends DAMessageBox {
        private boolean executeSaveTrace() {
                Project project = AnalyzerManager.getProject();
                String sourcePath = project.getSavePath();
-               targetPath = PathManager.DYNAMIC_ANALYZER_SAVE_PATH
+               targetPath = PathManager.DA_SAVE_PATH
                                + File.separator + saveFileName;
 
                if(AnalyzerManager.getProject().getSavePath().equals(targetPath)){
index 88e2cd7..2d73e10 100644 (file)
@@ -416,7 +416,7 @@ public class UIFunctionProfilingDataChecker {
                String uiApiOptionList = null;
                ;
                String configFileName = AnalyzerConstants.USER_INTERFACE_API_LIST_FILE_NAME;
-               File configFolder = new File(PathManager.CONFIG_FOLDER_PATH);
+               File configFolder = new File(PathManager.DA_CONFIG_FOLDER_PATH);
                if (!configFolder.isDirectory()) {
                        System.out.println("Not Exist UI API List Option Path ");
                        return CommonConstants.EMPTY;
index 48cab08..ef9b03f 100644 (file)
@@ -32,11 +32,11 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
-import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea;
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
 import org.tizen.dynamicanalyzer.widgets.helper.FontResources;
 import org.tizen.dynamicanalyzer.widgets.helper.WidgetUtils;
 import org.tizen.dynamicanalyzer.widgets.progress.Progress;
+import org.tizen.dynamicanalyzer.workbench.LayoutManager;
 
 public class ProgressDialog {
        private Shell shell = null;
@@ -116,7 +116,7 @@ public class ProgressDialog {
 
        public void open() {
                shell.open();
-               ToolbarArea.getInstance().setEnabled(false);
+               LayoutManager.setEnabled(false);
        }
 
        public void close() {
@@ -133,7 +133,7 @@ public class ProgressDialog {
                        }
                        shell = null;
                }
-               ToolbarArea.getInstance().setEnabled(true);
+               LayoutManager.setEnabled(true);
        }
 
        public void setProgressMessage(String message) {
index 384ab9e..bd05891 100644 (file)
@@ -497,7 +497,7 @@ public class InternalLogManager {
                // Date time = Calendar.getInstance().getTime();
 
                File autotestPath = new File(
-                               PathManager.DYNAMIC_ANALYZER_AUTOTEST_PATH);
+                               PathManager.DA_AUTOTEST_PATH);
                if (!autotestPath.exists()) {
                        if (!autotestPath.mkdirs()) {
                                System.out.println("auto test path file create failed...");
@@ -506,7 +506,7 @@ public class InternalLogManager {
                }
 
                StringBuilder savePath = new StringBuilder();
-               savePath.append(PathManager.DYNAMIC_ANALYZER_AUTOTEST_PATH);
+               savePath.append(PathManager.DA_AUTOTEST_PATH);
                savePath.append(File.separator);
                savePath.append("DA_Autotest_Result.xsd");