From bf7798c9f40fc2266a1dc4b3f2c0b60f7e4402be Mon Sep 17 00:00:00 2001 From: "jy.exe.lee" Date: Mon, 2 Jul 2012 17:47:18 +0900 Subject: [PATCH] [Title] rename and bug fix [Type] bug fix [Module] DynamicAnalyzer [Priority] normal [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../org/tizen/dynamicanalyzer/AnalyzerManager.java | 12 ----- .../src/org/tizen/dynamicanalyzer/SqlManager.java | 32 +++++++------ .../listeners/TableTooltipListener.java | 2 +- .../tizen/dynamicanalyzer/model/ColorTheme.java | 56 ---------------------- .../tableInfo/{TableInfo.java => DBTableInfo.java} | 4 +- .../dynamicanalyzer/tableInfo/DBTableManager.java | 54 ++++++++++----------- 6 files changed, 47 insertions(+), 113 deletions(-) delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/ColorTheme.java rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/{TableInfo.java => DBTableInfo.java} (96%) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java index 77dabf4..4f54d9d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java @@ -34,7 +34,6 @@ import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.constants.AnalyzerConstants; import org.tizen.dynamicanalyzer.handlers.ClearHandler; import org.tizen.dynamicanalyzer.model.BaseLogCenter; -import org.tizen.dynamicanalyzer.model.ColorTheme; import org.tizen.dynamicanalyzer.model.DeviceCurrent; import org.tizen.dynamicanalyzer.model.ImageInfo; import org.tizen.dynamicanalyzer.model.InsertLogQueue; @@ -68,7 +67,6 @@ public class AnalyzerManager { private static HashMap imageSet = null; private static List imageList = null; private static int imageListSize = 0; - private static ColorTheme theme = null; private static LeakDetector leakDetector = null; private static FailedChecker failedChecker = null; private static FunctionUsageProfiler functionUserProfiler = null; @@ -136,16 +134,6 @@ public class AnalyzerManager { } - public static ColorTheme getTheme() { - if (null == theme) { - theme = new ColorTheme(ColorResources.DEFAULT_FOREGROUND, - ColorResources.BAR_GRAY3, - ColorResources.DEFAULT_CHART_FOREGROUND, - ColorResources.DEFAULt_CHART_BACKGROUND); - } - return theme; - } - public static void clear() { if (null != project) { project = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/SqlManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/SqlManager.java index 8bb4690..8f43973 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/SqlManager.java @@ -39,7 +39,7 @@ import org.tizen.dynamicanalyzer.model.LogCenter; import org.tizen.dynamicanalyzer.model.ProfilingChildData; import org.tizen.dynamicanalyzer.model.Project; import org.tizen.dynamicanalyzer.tableInfo.DBTableManager; -import org.tizen.dynamicanalyzer.tableInfo.TableInfo; +import org.tizen.dynamicanalyzer.tableInfo.DBTableInfo; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.FailedChecker; import org.tizen.dynamicanalyzer.utils.FunctionUsageProfiler; @@ -439,11 +439,13 @@ public class SqlManager { LeakDetector leakDectector = AnalyzerManager.getLeakDectector(); try { - List leakList = leakDectector.getLeakDataList(); - String insertQuery = "insert into LeakData values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"; //$NON-NLS-1$ + DBTableInfo leakTableInfo = DBTableManager.getLeakData(); + String insertQuery = leakTableInfo.insertQuery(); + // String insertQuery = "insert into LeakData values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"; //$NON-NLS-1$ int size = DBTableManager.getLeakData().getColumnNames().length; PreparedStatement prep = conn.prepareStatement(insertQuery); + List leakList = leakDectector.getLeakDataList(); for (LeakData leakData : leakList) { for (int ii = 0; ii < size; ii++) { prep.setString(ii + 1, leakData.getData().get(ii)); @@ -484,10 +486,8 @@ public class SqlManager { try { String[] columns = DBTableManager.commonColumns; List failedList = failedChecker.getFailedList(); - String insertQuery = "insert into " //$NON-NLS-1$ - + AnalyzerConstants.FAILED_DATA_TABLE_NAME - + " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"; //$NON-NLS-1$ - + DBTableInfo failedTableInfo = DBTableManager.getFailedData(); + String insertQuery = failedTableInfo.insertQuery(); PreparedStatement prep = conn.prepareStatement(insertQuery); int size = columns.length; @@ -525,10 +525,9 @@ public class SqlManager { } try { - String insertQuery = "insert into CallStackApis values (?, ?);"; //$NON-NLS-1$ + DBTableInfo unitData = DBTableManager.getCallStackUnits(); + String insertQuery = unitData.insertQuery(); PreparedStatement prep = conn.prepareStatement(insertQuery); - // List callstackApis = - // LogSpliter.getCallStackApiList(); HashMap callstackMap = LogSpliter .getCallStackApiByAddrMap(); @@ -570,7 +569,8 @@ public class SqlManager { } try { - String insertQuery = "insert into CallStackData values (?, ?);"; //$NON-NLS-1$ + DBTableInfo callstackData = DBTableManager.getCallStackData(); + String insertQuery = callstackData.insertQuery(); PreparedStatement prep = conn.prepareStatement(insertQuery); Collection col = LogSpliter .getCallStackDataBySeqMap().values(); @@ -611,7 +611,9 @@ public class SqlManager { } try { - String insertQuery = "insert into AppInfo values (?);"; //$NON-NLS-1$ + DBTableInfo appInfoData = DBTableManager.getAppInfo(); + String insertQuery = appInfoData.insertQuery(); + // String insertQuery = "insert into AppInfo values (?);"; //$NON-NLS-1$ PreparedStatement prep = conn.prepareStatement(insertQuery); List info = AnalyzerManager.getProject().getAppInfo(); int size = info.size(); @@ -643,7 +645,7 @@ public class SqlManager { Statement stat = conn.createStatement(); stat.executeUpdate(DBTableManager.getApiCountInfo().createQuery()); stat.executeUpdate(DBTableManager.getAppInfo().createQuery()); - stat.executeUpdate(DBTableManager.getCallStackApis().createQuery()); + stat.executeUpdate(DBTableManager.getCallStackUnits().createQuery()); stat.executeUpdate(DBTableManager.getCallStackData().createQuery()); stat.executeUpdate(DBTableManager.getFailedData().createQuery()); stat.executeUpdate(DBTableManager.getLeakData().createQuery()); @@ -818,7 +820,7 @@ public class SqlManager { pDataList.addAll(profilingDataMap.values()); try { - TableInfo profilingData = DBTableManager.getProfilingData(); + DBTableInfo profilingData = DBTableManager.getProfilingData(); String insertQuery = profilingData.insertQuery(); PreparedStatement prep = conn.prepareStatement(insertQuery); @@ -863,7 +865,7 @@ public class SqlManager { pDataList.addAll(profilingDataMap.values()); try { - TableInfo profilingChildData = DBTableManager + DBTableInfo profilingChildData = DBTableManager .getProfilingChildData(); String insertQuery = profilingChildData.insertQuery(); PreparedStatement prep = conn.prepareStatement(insertQuery); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java index fd2127a..a5fcd84 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java @@ -172,7 +172,7 @@ public class TableTooltipListener implements Listener { // error no check if (AnalyzerConstants.SOURCELINE_NO_MATCHING_LINE == errno) { - boolean isPie = AnalyzerManager.getProject().isPieBuild(); +// boolean isPie = AnalyzerManager.getProject().isPieBuild(); // if (isPie) { // errno = AnalyzerConstants.SOURCELINE_PIE_BUILD; // } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/ColorTheme.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/ColorTheme.java deleted file mode 100644 index 81fab05..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/ColorTheme.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.tizen.dynamicanalyzer.model; - -import org.eclipse.swt.graphics.Color; -import org.tizen.dynamicanalyzer.ColorResources; - - -public class ColorTheme { - private Color foregroundColor = null; - private Color backGroundColor = null; - private Color redColor = null; - - private java.awt.Color chartForegroundColor = null; - private java.awt.Color chartBackgroundColor = null; - - - public ColorTheme(Color foreground, Color backGround, java.awt.Color chartForeground, java.awt.Color chartBackground) - { - foregroundColor = foreground; - backGroundColor = backGround; - redColor = ColorResources.DEFAULT_RED; - chartForegroundColor = chartForeground; - chartBackgroundColor = chartBackground; - } - - public java.awt.Color getChartForegroundColor() { - return chartForegroundColor; - } - public void setChartForegroundColor(java.awt.Color chartForegroundColor) { - this.chartForegroundColor = chartForegroundColor; - } - public java.awt.Color getChartBackgroundColor() { - return chartBackgroundColor; - } - public void setChartBackgroundColor(java.awt.Color chartBackgroundColor) { - this.chartBackgroundColor = chartBackgroundColor; - } - public Color getForegroundColor() { - return foregroundColor; - } - public void setForegroundColor(Color foregroundColor) { - this.foregroundColor = foregroundColor; - } - public Color getBackGroundColor() { - return backGroundColor; - } - public void setBackGroundColor(Color backGroundColor) { - this.backGroundColor = backGroundColor; - } - public Color getRedColor() { - return redColor; - } - public void setRedColor(Color redColor) { - this.redColor = redColor; - } - -} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/TableInfo.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableInfo.java similarity index 96% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/TableInfo.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableInfo.java index 0f97a4c..e22c8b8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/TableInfo.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableInfo.java @@ -1,12 +1,12 @@ package org.tizen.dynamicanalyzer.tableInfo; -public class TableInfo { +public class DBTableInfo { protected String tableName; protected String[] columnNames; protected String[] columnOptions; protected String[] columnTypes; - public TableInfo(String tableName, String[] columnNames, + public DBTableInfo(String tableName, String[] columnNames, String[] columnOptions, String[] columnTypes) { this.tableName = tableName; this.columnNames = columnNames; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java index 5fadacf..41dd68a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java @@ -4,21 +4,21 @@ public class DBTableManager { public static final String TABLE_NAME_API_COUNT_INFO = "ApiCountInfo"; public static final String TABLE_NAME_APP_INFO = "AppInfo"; - public static final String TABLE_NAME_CALLSTACK_APIS = "CallstackAPIs"; + public static final String TABLE_NAME_CALLSTACK_UNITS = "CallstackUnits"; public static final String TABLE_NAME_CALLSTACK_DATA = "CallstackData"; public static final String TABLE_NAME_FAILED_DATA = "FailedData"; public static final String TABLE_NAME_LEAK_DATA = "LeakData"; public static final String TABLE_NAME_PROFILING_DATA = "ProfilingData"; public static final String TABLE_NAME_PROFILING_CHILD_DATA = "ProfilingChildData"; - private static TableInfo apiCountInfo = null; - private static TableInfo appInfo = null; - private static TableInfo callstackApis = null; - private static TableInfo callstackData = null; - private static TableInfo failedData = null; - private static TableInfo leakData = null; - private static TableInfo profilingData = null; - private static TableInfo profilingChildData = null; + private static DBTableInfo apiCountInfo = null; + private static DBTableInfo appInfo = null; + private static DBTableInfo callstackUnits = null; + private static DBTableInfo callstackData = null; + private static DBTableInfo failedData = null; + private static DBTableInfo leakData = null; + private static DBTableInfo profilingData = null; + private static DBTableInfo profilingChildData = null; public static final String[] commonColumns = { "Rid", "Id", "SeqNumber", "APINmae", "Time", "Pid", "Tid", "InputParm", "Return", "PCAddr", @@ -31,90 +31,90 @@ public class DBTableManager { "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT" }; - public static TableInfo getApiCountInfo() { + public static DBTableInfo getApiCountInfo() { if (null == apiCountInfo) { String[] names = { "cid", "name", "count" }; String[] options = { "", "primary key not null", "" }; String[] types = { "INTEGER", "TEXT", "INTEGER" }; - apiCountInfo = new TableInfo(TABLE_NAME_API_COUNT_INFO, names, + apiCountInfo = new DBTableInfo(TABLE_NAME_API_COUNT_INFO, names, options, types); } return apiCountInfo; } - public static TableInfo getAppInfo() { + public static DBTableInfo getAppInfo() { if (null == appInfo) { String[] names = { "info" }; String[] options = { "" }; String[] types = { "TEXT" }; - appInfo = new TableInfo(TABLE_NAME_APP_INFO, names, options, types); + appInfo = new DBTableInfo(TABLE_NAME_APP_INFO, names, options, types); } return appInfo; } - public static TableInfo getCallStackApis() { - if (null == callstackApis) { + public static DBTableInfo getCallStackUnits() { + if (null == callstackUnits) { String[] names = { "addr", "api" }; String[] options = { "primary key not null", "" }; String[] types = { "INTEGER", "TEXT" }; - callstackApis = new TableInfo(TABLE_NAME_CALLSTACK_APIS, names, + callstackUnits = new DBTableInfo(TABLE_NAME_CALLSTACK_UNITS, names, options, types); } - return callstackApis; + return callstackUnits; } - public static TableInfo getCallStackData() { + public static DBTableInfo getCallStackData() { if (null == callstackData) { String[] names = { "seq", "callstack" }; String[] options = { "not null", "" }; String[] types = { "INTEGER", "TEXT" }; - callstackData = new TableInfo(TABLE_NAME_CALLSTACK_DATA, names, + callstackData = new DBTableInfo(TABLE_NAME_CALLSTACK_DATA, names, options, types); } return callstackData; } - public static TableInfo getFailedData() { + public static DBTableInfo getFailedData() { if (null == failedData) { String[] names = commonColumns; String[] options = commonOptions; String[] types = commonTypes; - failedData = new TableInfo(TABLE_NAME_FAILED_DATA, names, options, + failedData = new DBTableInfo(TABLE_NAME_FAILED_DATA, names, options, types); } return failedData; } - public static TableInfo getLeakData() { + public static DBTableInfo getLeakData() { if (null == leakData) { String[] names = commonColumns; String[] options = commonOptions; String[] types = commonTypes; - leakData = new TableInfo(TABLE_NAME_LEAK_DATA, names, options, + leakData = new DBTableInfo(TABLE_NAME_LEAK_DATA, names, options, types); } return leakData; } - public static TableInfo getProfilingData() { + public static DBTableInfo getProfilingData() { if (null == profilingData) { String[] names = { "seq", "name", "exCount", "inCount", "callCount", "parent", "key", "exeTime" }; String[] options = { "not null", "", "", "", "", "", "", "" }; String[] types = { "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT" }; - profilingData = new TableInfo(TABLE_NAME_PROFILING_DATA, names, + profilingData = new DBTableInfo(TABLE_NAME_PROFILING_DATA, names, options, types); } return profilingData; } - public static TableInfo getProfilingChildData() { + public static DBTableInfo getProfilingChildData() { if (null == profilingChildData) { String[] names = { "seq", "childList" }; String[] options = { "not null", "" }; String[] types = { "TEXT", "TEXT" }; - profilingChildData = new TableInfo(TABLE_NAME_PROFILING_CHILD_DATA, + profilingChildData = new DBTableInfo(TABLE_NAME_PROFILING_CHILD_DATA, names, options, types); } return profilingChildData; -- 2.7.4