From 0a51d0fb841d0f308a317407b18390ad96cb174f Mon Sep 17 00:00:00 2001 From: greatim Date: Tue, 2 Sep 2014 00:46:34 +0900 Subject: [PATCH] SAVE: save folder validation fix change temp folder path to DA_DATA_PATH Change-Id: Ia906efadf8c819508324e96b004dcc2b4109b62a Signed-off-by: greatim --- .../dynamicanalyzer/common/path/PathManager.java | 2 +- .../dynamicanalyzer/common/AnalyzerPlugin.java | 3 ++ .../handlers/OpenTraceCompleteHandler.java | 10 +---- .../ui/toolbar/opentrace/SaveFilesTable.java | 50 +++++++++------------- .../ui/toolbar/opentrace/TempFilesTable.java | 20 ++++----- 5 files changed, 34 insertions(+), 51 deletions(-) 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 fd95d70..8d20ba2 100755 --- 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 @@ -61,7 +61,7 @@ public class PathManager { + 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_TEMP_FOLDER_PATH = DA_SAVE_PATH + File.separator + public static final String DA_TEMP_FOLDER_PATH = DA_DATA_PATH + File.separator + PathConstants.TEMP_FOLDER_NAME; public static final String DA_RPM_PATH = DA_TEMP_FOLDER_PATH + File.separator + PathConstants.RPM_FOLDER_NAME; 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 f0774d6..3e4e8fe 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java @@ -82,6 +82,7 @@ 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)) { @@ -90,6 +91,8 @@ public class AnalyzerPlugin extends AbstractUIPlugin { 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/handlers/OpenTraceCompleteHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java index 7833fc0..c46fa16 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java @@ -45,24 +45,18 @@ public class OpenTraceCompleteHandler extends AbstractHandler { Display.getDefault().syncExec(new Runnable() { @Override public void run() { - DAPageComposite page = AnalyzerManager.getCurrentPage(); - page.updateView(); if (AnalyzerManager.getProject().getSavePath() .contains(PathManager.DA_TEMP_FOLDER_PATH)) { ToolbarArea.getInstance().setMainControlEnablement(true); } else { ToolbarArea.getInstance().setSaveButtonEnable(false); } - } - }); - - Display.getDefault().syncExec(new Runnable() { - @Override - public void run() { + DAPageComposite page = AnalyzerManager.getCurrentPage(); page.updateView(); } }); + Logger.debug("open trace complete!!"); //$NON-NLS-1$ return null; } 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 2f07758..ed09d5d 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,6 @@ 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.path.PathConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; @@ -67,28 +66,24 @@ public class SaveFilesTable extends DATableComposite { for (int i = 0; i < size; i++) { // create text List text = new ArrayList(); - if (!saveFileList.get(i).equals(PathConstants.TEMP_FOLDER_NAME)) { - String path = PathManager.DA_SAVE_PATH + File.separator - + saveFileList.get(i); - String inputText1 = saveFileList.get(i); - String inputText2 = getCreateTime(path); + String path = PathManager.DA_SAVE_PATH + File.separator + saveFileList.get(i); + String inputText1 = saveFileList.get(i); + String inputText2 = getCreateTime(path); - if (inputText1.isEmpty() || null == inputText2 - || inputText2.isEmpty()) { - continue; - } + if (inputText1.isEmpty() || null == inputText2 || inputText2.isEmpty()) { + continue; + } - text.add(inputText1); - text.add(inputText2); - if (isVaildVersion) { - text.add(VALIDATE_Y); - } else { - text.add(VALIDATE_N); - } - TableInput tableInput = new TableInput(); - tableInput.setText(text); - input.add(tableInput); + text.add(inputText1); + text.add(inputText2); + if (isVaildVersion) { + text.add(VALIDATE_Y); + } else { + text.add(VALIDATE_N); } + TableInput tableInput = new TableInput(); + tableInput.setText(text); + input.add(tableInput); } } return input; @@ -121,16 +116,12 @@ public class SaveFilesTable extends DATableComposite { } if (text.get(VALIDATE_INDEX).equals("N")) { //$NON-NLS-1$ gridItem.setForeground(ColorResources.ORANGE); - gridItem.setData(OpenTraceDialog.VERSION_KEY, - OpenTraceDialog.VERSION_INVALID); + gridItem.setData(OpenTraceDialog.VERSION_KEY, OpenTraceDialog.VERSION_INVALID); gridItem.setData(OpenTraceDialog.CURRENT_KEY, OpenTraceDialog.OTHERS); - gridItem.setToolTipText(TRACE_NAME_INDEX, - AnalyzerLabels.OPEN_TRACE_DLG_OLD_VERSION); - gridItem.setToolTipText(DATE_INDEX, - AnalyzerLabels.OPEN_TRACE_DLG_OLD_VERSION); + gridItem.setToolTipText(TRACE_NAME_INDEX, AnalyzerLabels.OPEN_TRACE_DLG_OLD_VERSION); + gridItem.setToolTipText(DATE_INDEX, AnalyzerLabels.OPEN_TRACE_DLG_OLD_VERSION); } else { - gridItem.setData(OpenTraceDialog.VERSION_KEY, - OpenTraceDialog.VERSION_VALID); + gridItem.setData(OpenTraceDialog.VERSION_KEY, OpenTraceDialog.VERSION_VALID); String path = PathManager.DA_SAVE_PATH + File.separator + text.get(TRACE_NAME_INDEX); @@ -139,8 +130,7 @@ public class SaveFilesTable extends DATableComposite { String projectPath = project.getSavePath(); if (path.equals(projectPath)) { gridItem.setForeground(ColorResources.BLUE); - gridItem.setData(OpenTraceDialog.CURRENT_KEY, - OpenTraceDialog.CURRENT); + gridItem.setData(OpenTraceDialog.CURRENT_KEY, OpenTraceDialog.CURRENT); gridItem.setToolTipText(TRACE_NAME_INDEX, AnalyzerLabels.OPEN_TRACE_DLG_CURRENT_TRACE); gridItem.setToolTipText(DATE_INDEX, 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 f8713f3..3fa8ad0 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 @@ -34,7 +34,6 @@ import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.path.PathConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.model.TableInput; @@ -61,15 +60,13 @@ public class TempFilesTable extends DATableComposite { for (int i = 0; i < size; i++) { // create text List text = new ArrayList(); - if (!tempFileList.get(i).equals(PathConstants.TEMP_FOLDER_NAME)) { - String path = PathManager.DA_TEMP_FOLDER_PATH + File.separator - + tempFileList.get(i); - text.add(tempFileList.get(i)); - text.add(getCreateTime(path)); - TableInput tableInput = new TableInput(); - tableInput.setText(text); - input.add(tableInput); - } + String path = PathManager.DA_TEMP_FOLDER_PATH + File.separator + + tempFileList.get(i); + text.add(tempFileList.get(i)); + text.add(getCreateTime(path)); + TableInput tableInput = new TableInput(); + tableInput.setText(text); + input.add(tableInput); } } return input; @@ -113,8 +110,7 @@ public class TempFilesTable extends DATableComposite { gridItem.setData(OpenTraceDialog.CURRENT_KEY, OpenTraceDialog.CURRENT); gridItem.setToolTipText(TRACE_NAME_INDEX, AnalyzerLabels.OPEN_TRACE_DLG_CURRENT_TRACE); - gridItem.setToolTipText(DATE_INDEX, - AnalyzerLabels.OPEN_TRACE_DLG_CURRENT_TRACE); + gridItem.setToolTipText(DATE_INDEX, AnalyzerLabels.OPEN_TRACE_DLG_CURRENT_TRACE); } } } -- 2.7.4