From: Hyunjong,park Date: Wed, 11 Sep 2013 02:26:39 +0000 (+0900) Subject: [Title] rollback opentrace X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=110d3979297e52282b128b2712990d26a911bc58;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] rollback opentrace [Desc.] chekc db version [Issue] - --- 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 6ba99d2..1bd7415 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 @@ -36,11 +36,11 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.AnalyzerPaths; -import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.resources.ColorResources; +import org.tizen.dynamicanalyzer.sql.SqlManager; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; @@ -65,18 +65,12 @@ public class SaveFilesTable extends DATableComposite { for (int i = 0; i < size; i++) { // create text List text = new ArrayList(); - if (!saveFileList.get(i).contains( + if (!saveFileList.get(i).equals( AnalyzerConstants.TEMP_FOLDER_NAME)) { - - String[] projectInfo = saveFileList.get(i).split( - AnalyzerConstants.DATA_PARSING_TOKEN); - - String inputText1 = CommonConstants.EMPTY; - String inputText2 = CommonConstants.EMPTY; - if (projectInfo.length > 1) { - inputText1 = projectInfo[0]; - inputText2 = projectInfo[1]; - } + String path = AnalyzerPaths.DYNAMIC_ANALYZER_SAVE_PATH + + File.separator + saveFileList.get(i); + String inputText1 = saveFileList.get(i); + String inputText2 = getCreateTime(path); if (inputText1.isEmpty() || null == inputText2 || inputText2.isEmpty()) { @@ -160,4 +154,21 @@ public class SaveFilesTable extends DATableComposite { } table.update(); } + + private String getCreateTime(String path) { + isVaildVersion = true; + List pInfo = SqlManager.getInstance().getDetailsInfo(path); + if (null == pInfo || pInfo.isEmpty()) { + isVaildVersion = false; + return null; + } + String version = pInfo.get(AnalyzerConstants.PROJECT_VERSION_INDEX); + if (version.isEmpty() + || !version.equals(AnalyzerConstants.SAVE_DATA_VERSION)) { + isVaildVersion = false; + } else { + isVaildVersion = true; + } + return pInfo.get(AnalyzerConstants.PROJECT_CREATE_TIME_INDEX); + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java index 94288cb..fa3fc69 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -40,7 +40,6 @@ import java.net.ServerSocket; import java.net.Socket; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; import org.eclipse.core.commands.ExecutionException; @@ -199,13 +198,10 @@ public class AnalyzerUtil { for (int i = 0; i < fileListLength; i++) { File dir = new File(path + File.separator + fileList[i]); if (dir.isDirectory()) { - Date fileCreateDate = new Date(dir.lastModified()); - String saveProjectInfo = fileList[i] - + AnalyzerConstants.DATA_PARSING_TOKEN - + fileCreateDate.toString(); - list.add(saveProjectInfo); + list.add(fileList[i]); } } + return list; }