From 9e24c25feef15a7cc8759a9b8439a843422408cd Mon Sep 17 00:00:00 2001 From: "jy.exe.lee" Date: Fri, 6 Jul 2012 12:19:41 +0900 Subject: [PATCH] [Title] DACombo bug fix, exception fixed [Type] bug fix [Module] DynamicAnalyzer [Priority] major [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../widgets/combo/DACustomCombo.java | 5 +++- .../src/org/tizen/dynamicanalyzer/LogSpliter.java | 35 +++++++++++----------- .../org/tizen/dynamicanalyzer/SymbolManager.java | 5 ++++ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java index 8e7730a..d4f95b1 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java @@ -409,7 +409,10 @@ public class DACustomCombo extends Canvas { return false; } int size = items.size(); - if (index + MAX_SIZE >= size) { + if (size < MAX_SIZE) { + selection = index; + select(selection); + } else if (index + MAX_SIZE >= size) { int lower = size - index; selection = MAX_SIZE - lower; itemIndex = size - MAX_SIZE; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java index 3673fa4..1b79d28 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java @@ -384,23 +384,24 @@ public class LogSpliter { imgInfo.setTime(input.get(LogCenterConstants.TIME_INDEX)); AnalyzerManager.getImageSet().put(imgInfo.getSeq(), imgInfo); } else if (id == LogCenterConstants.LOG_DEVICE) { - Long power = DeviceCurrent.calculatePower(input - .get(LogCenterConstants.DEVICE_AUDIO_INDEX), input - .get(LogCenterConstants.DEVICE_RSSI_INDEX), input - .get(LogCenterConstants.DEVICE_BRIGHTNESS_INDEX), input - .get(LogCenterConstants.DEVICE_VIDEO_INDEX), input - .get(LogCenterConstants.DEVICE_CALL_INDEX), input - .get(LogCenterConstants.DEVICE_WIFI_INDEX), input - .get(LogCenterConstants.DEVICE_BLUETOOTH_INDEX), input - .get(LogCenterConstants.DEVICE_DNET_INDEX), input - .get(LogCenterConstants.DEVICE_GPS_INDEX), input - .get(LogCenterConstants.DEVICE_CAMERA_INDEX), input - .get(LogCenterConstants.DEVICE_CPU_FREQUENCY_INDEX), input - .get(LogCenterConstants.DEVICE_SYSTEM_USED_MEMORY_INDEX), - input.get(LogCenterConstants.DEVICE_CALL_ALPHA_INDEX), - input.get(LogCenterConstants.DEVICE_RSSI_ALPHA_INDEX), - input.get(LogCenterConstants.DEVICE_VOLTAGE_INDEX)); - input.set(LogCenterConstants.DEVICE_ENERGY_INDEX, power.toString()); + // TODO: calculate power usage +// Long power = DeviceCurrent.calculatePower(input +// .get(LogCenterConstants.DEVICE_AUDIO_INDEX), input +// .get(LogCenterConstants.DEVICE_RSSI_INDEX), input +// .get(LogCenterConstants.DEVICE_BRIGHTNESS_INDEX), input +// .get(LogCenterConstants.DEVICE_VIDEO_INDEX), input +// .get(LogCenterConstants.DEVICE_CALL_INDEX), input +// .get(LogCenterConstants.DEVICE_WIFI_INDEX), input +// .get(LogCenterConstants.DEVICE_BLUETOOTH_INDEX), input +// .get(LogCenterConstants.DEVICE_DNET_INDEX), input +// .get(LogCenterConstants.DEVICE_GPS_INDEX), input +// .get(LogCenterConstants.DEVICE_CAMERA_INDEX), input +// .get(LogCenterConstants.DEVICE_CPU_FREQUENCY_INDEX), input +// .get(LogCenterConstants.DEVICE_SYSTEM_USED_MEMORY_INDEX), +// input.get(LogCenterConstants.DEVICE_CALL_ALPHA_INDEX), +// input.get(LogCenterConstants.DEVICE_RSSI_ALPHA_INDEX), +// input.get(LogCenterConstants.DEVICE_VOLTAGE_INDEX)); +// input.set(LogCenterConstants.DEVICE_ENERGY_INDEX, power.toString()); } logPack.setLogs(id, input); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/SymbolManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/SymbolManager.java index 202b6e2..1c74e15 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/SymbolManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/SymbolManager.java @@ -19,6 +19,7 @@ */ package org.tizen.dynamicanalyzer; +import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.lang.ref.WeakReference; @@ -226,6 +227,10 @@ public class SymbolManager { if (strBinPath == null || strBinPath.isEmpty()) { // FIXME : temp code return AnalyzerLabels.SYMBOL_MANAGER_UNKNOWN; + } else { + if (!new File(strBinPath).exists()) { + return AnalyzerLabels.SYMBOL_MANAGER_UNKNOWN; + } } if (strAddr == null || strAddr.isEmpty()) { -- 2.7.4