From adde131401f69973da8917b180345a692276ff92 Mon Sep 17 00:00:00 2001 From: da Date: Thu, 9 Jan 2014 18:20:50 +0900 Subject: [PATCH] refactoring --- .../ApplicationWorkbenchWindowAdvisor.java | 2 +- .../workbench/DefaultKeyBindingHandler.java | 1 - .../dynamicanalyzer/common/AnalyzerManager.java | 3 ++- .../tizen/dynamicanalyzer/common/HostResult.java | 4 ++-- .../org/tizen/dynamicanalyzer/project/Project.java | 9 ++++----- .../tizen/dynamicanalyzer/sql/DBTableManager.java | 2 +- .../ui/toolbar/StartProcessManager.java | 23 +++++++++++----------- .../ui/toolbar/TraceStartStopThread.java | 10 +++++----- .../tizen/dynamicanalyzer/utils/AnalyzerUtil.java | 1 - 9 files changed, 26 insertions(+), 29 deletions(-) diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java index 702023d..a6c17c7 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java @@ -73,7 +73,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { @Override public void createWindowContents(Shell shell) { ToolbarArea.createInstance(getWindowConfigurer(), shell); - + PathManager.setLogPostFix(WorkbenchUtils.getLogPostFix()); AboutDialog.updateBuildInfoForMac(); } diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/DefaultKeyBindingHandler.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/DefaultKeyBindingHandler.java index 34f0677..770dad0 100644 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/DefaultKeyBindingHandler.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/DefaultKeyBindingHandler.java @@ -11,5 +11,4 @@ public class DefaultKeyBindingHandler extends AbstractHandler { System.out.println("binding key ctrl + 3 ignore"); return null; } - } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java index c5ae06c..40c3cc4 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java @@ -317,7 +317,7 @@ public class AnalyzerManager { return calledChecker; } - public static void initRecordStart() { + public static void initTraceStart() { AnalyzerUtil.executeCommand(ClearHandler.ID); if (!AnalyzerManager.isExit()) { Project project = new Project(); @@ -327,6 +327,7 @@ public class AnalyzerManager { if (!AnalyzerManager.isExit()) { AnalyzerUtil.executeCommand(StartHandler.ID); } + } public static boolean isOsp() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java index 8aa5ae0..6f0fd50 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java @@ -164,7 +164,7 @@ public enum HostResult { } // depth is callstack depth - public static String getMethoName(int depth) { + public static String getMethodName(int depth) { StackTraceElement[] elements = null; try { @@ -205,7 +205,7 @@ public enum HostResult { } public static HostResult printAndReturn(HostResult result) { - result.setMethod(getMethoName(2) + "()"); + result.setMethod(getMethodName(2) + "()"); System.out.println(result.getMethod()); return result; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java index 5856436..b6e3f45 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java @@ -288,8 +288,7 @@ public class Project { setVersion(AnalyzerConstants.SAVE_DATA_VERSION); - SimpleDateFormat format = new SimpleDateFormat(DEFAULT_TIME_FORMAT, - Locale.KOREA); + SimpleDateFormat format = new SimpleDateFormat(DEFAULT_TIME_FORMAT); Date date = new Date(); setCreateTime(date.toString()); String tmpAppName = getAppName(); @@ -305,11 +304,11 @@ public class Project { if (!imgFolder.mkdirs()) { System.out.println("image directory create failed..."); } else { - File samallImage = new File(getSavePath() + File.separator + File smallImage = new File(getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + AnalyzerConstants.SMALL_IMAGE_FOLDER_NAME); - if (!samallImage.isDirectory()) { - if (!samallImage.mkdirs()) { + if (!smallImage.isDirectory()) { + if (!smallImage.mkdirs()) { System.out .println("small image directory create failed..."); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java index bdd99d2..5e948a9 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java @@ -315,7 +315,7 @@ public class DBTableManager { { String[] names = { APINAME_NAME }; String[] options = { EMPTY }; - String[] types = { TEXT }; + String[] types = { "varchar(1024)" }; DBTableInfo apiName = new DBTableInfo(TABLE_NAME_APINAME, names, options, types); tableInfos.set(TABLE_INDEX_APINAME, apiName); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java index 92180aa..5c0d5f4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java @@ -44,16 +44,22 @@ public class StartProcessManager implements Runnable { public void stopProgress() { if (null != dialog) { - dialog.setValue(100); - dialog.close(); + Display.getDefault().syncExec(new Runnable() { + @Override + public void run() { + dialog.setValue(100); + dialog.close(); + } + }); } } @Override public void run() { count = 10; - System.out.println("appinfo : " + AnalyzerManager.isProcessInfoArrived() - + "is exit :" + AnalyzerManager.isExit()); + System.out.println("appinfo : " + + AnalyzerManager.isProcessInfoArrived() + "is exit :" + + AnalyzerManager.isExit()); while (!AnalyzerManager.isExit()) { if (AnalyzerManager.isRunning() @@ -80,13 +86,6 @@ public class StartProcessManager implements Runnable { e.printStackTrace(); } } - - Display.getDefault().syncExec(new Runnable() { - @Override - public void run() { - stopProgress(); - } - }); - + stopProgress(); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java index ebabe03..22b7b7b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java @@ -57,7 +57,7 @@ public class TraceStartStopThread implements Runnable { @Override public void run() { if (AnalyzerManager.isRunning()) { - HostResult isStarted = recordStart(); + HostResult isStarted = traceStart(); if (isStarted.isSuccess()) { if (ReplayTraceHandler.isReplay) { ReplayTraceHandler.setStopAlarm(); @@ -99,12 +99,12 @@ public class TraceStartStopThread implements Runnable { }); } } else { - recordStop(); + traceStop(); } count--; } - private HostResult recordStart() { + private HostResult traceStart() { Display.getDefault().syncExec(new Runnable() { @Override public void run() { @@ -115,12 +115,12 @@ public class TraceStartStopThread implements Runnable { } }); - AnalyzerManager.initRecordStart(); + AnalyzerManager.initTraceStart(); return HostResult.printAndReturn(DACommunicator.startTrace()); } - private void recordStop() { + private void traceStop() { AnalyzerManager.setRunningState(false); Display.getDefault().syncExec(new Runnable() { @Override 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 1351510..a778824 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -540,7 +540,6 @@ public class AnalyzerUtil { return false; } - public static String getTargetPathKey(String targetPath) { String returnStr = null; String[] splitPath = targetPath.split(CommonConstants.SLASH); -- 2.7.4