From fea98d273326ea3ee69cc7b4649e8a790a200002 Mon Sep 17 00:00:00 2001 From: Maria Guseva Date: Thu, 9 Jun 2016 12:10:08 +0300 Subject: [PATCH] SRADA-781: Create temp directory before start tracing in DA CLI. * CliInternals.startTracing() - create temp directory firstly. * PathManager.createDATempDir() - new static method extracted from AnalyzerPlugin.start(). Change-Id: I36773eb44032a3f2fc819e1c7bc7fb7907993ef2 --- .../tizen/dynamicanalyzer/cli/CliInternals.java | 4 ++++ .../dynamicanalyzer/common/path/PathManager.java | 22 ++++++++++++++++++++++ .../dynamicanalyzer/common/AnalyzerPlugin.java | 18 ++---------------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java index e8b685a..2bd5e76 100644 --- a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java +++ b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/CliInternals.java @@ -358,6 +358,10 @@ public final class CliInternals { */ public static ErrorCode startTracing(TracingArguments args) { Logger.info("Starting tracing..."); + + Logger.info("Create temp directory"); + PathManager.createDATempDir(); + initDevices(); loadConnectedDevices(); if (!selectDevice(args.getDevice())) { diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java index 5b37291..4a046f4 100644 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java @@ -32,6 +32,7 @@ import java.io.FilenameFilter; import org.tizen.common.core.application.InstallPathConfig; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.FileUtil; import org.tizen.dynamicanalyzer.util.Logger; // All paths of PathManager should not be ended with File.separater @@ -309,4 +310,25 @@ public class PathManager { return path; } + + /** + * Create directory {@link PathManager#DA_TEMP_FOLDER_PATH} for saving temporary results. + */ + public static void createDATempDir() { + // delete temp folder + File saveFolder = new File(PathManager.DA_TEMP_FOLDER_PATH); + if (saveFolder.exists()) { + if (FileUtil.deleteFile(saveFolder)) { + Logger.debug("delete temp folder"); + } else { + Logger.debug("BUG: temp folder is already exists but failed to delete"); + } + } + // if temp save folder does not exist or not a directory + if (!saveFolder.isDirectory()) { + if (!saveFolder.mkdirs()) { + Logger.debug("save folder create failed..."); + } + } + } } 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 7323139..2e6e42c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java @@ -85,22 +85,8 @@ public class AnalyzerPlugin extends AbstractUIPlugin { IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); window.addPerspectiveListener(new AnalyzerPerspectiveListener()); - // delete temp folder - File saveFolder = new File(PathManager.DA_TEMP_FOLDER_PATH); - if (saveFolder.exists()) { - if (AnalyzerUtil.deleteFile(saveFolder)) { - Logger.debug("delete temp folder"); - } else { - Logger.debug("BUG: temp folder is already exists but failed to delete"); - } - } - - // if temp save folder does not exist or not a directory - if (!saveFolder.isDirectory()) { - if (!saveFolder.mkdirs()) { - Logger.debug("save folder create failed..."); - } - } + // create new temp folder + PathManager.createDATempDir(); } @Override -- 2.7.4