[Title] Warning view fix, hex value fix

[Desc.] warning view selection bug fixed, warning detail view fixed, hex value prefix "0x" attached.
[Issue]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/CommonConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/CommonConstants.java
index 180ca13..8736403 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/CommonConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/CommonConstants.java
@@ -64,6 +64,7 @@ public class CommonConstants {
        public static final String QUESION_MARK = "?"; //$NON-NLS-1$
 
        public static final String EOS = "\0";//$NON-NLS-1$
+       public static final String HEX_PREFIX = "0x";//$NON-NLS-1$
 
        public static final String LOCAL_HOST = "127.0.0.1"; //$NON-NLS-1$
 
@@ -84,12 +85,11 @@ public class CommonConstants {
        public static final String LINUX = "linux"; //$NON-NLS-1$
        public static final String MAC = "mac"; //$NON-NLS-1$
        public static final String WIN = "win"; //$NON-NLS-1$
-       
+
        public final static int SHORT_SIZE = Short.SIZE / Byte.SIZE;
        public final static int INT_SIZE = Integer.SIZE / Byte.SIZE;
        public final static int LONG_SIZE = Long.SIZE / Byte.SIZE;
        public final static int FLOAT_SIZE = Float.SIZE / Byte.SIZE;
        public final static int DOUBLE_SIZE = Double.SIZE / Byte.SIZE;
-       
 
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelinePageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelinePageLabels.properties
index 76e9d5d..b1a5e99 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelinePageLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelinePageLabels.properties
@@ -1,7 +1,7 @@
 CALL_TRACE_VIEW_NAME=API
 CALL_TRACE_VIEW_TIME=Time
-CALL_TRACE_VIEW_TID=Thread id
-CALL_TRACE_VIEW_PID=Process id
+CALL_TRACE_VIEW_TID=TID
+CALL_TRACE_VIEW_PID=PID
 CALL_TRACE_VIEW_TITLE=Call Trace
 
 UI_EVENT_LIST_TYPE=Type

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java
index 0ed8bda..1dbd76a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java
@@ -126,6 +126,8 @@ public class LogDataUtils {
                int length = LogDataUtils.getStringLength(start, payload);
                byte[] temp = new byte[length];
                System.arraycopy(payload, start, temp, 0, length);
-               return new String(temp);
+               String str = new String(temp);
+               str = str.substring(0, str.length() - 1);
+               return str;
        }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningChecker.java
index db01278..cb8a26b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningChecker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningChecker.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.tizen.dynamicanalyzer.common.CommonConstants;
+import org.tizen.dynamicanalyzer.swap.model.data.LogData;
 
 public class WarningChecker {
        private List<WarningData> warningData = null;
@@ -49,8 +50,8 @@ public class WarningChecker {
                int size = getWarningData().size();
                for (int i = 0; i < size; i++) {
                        WarningData data = getWarningData().get(i);
-                       int wSeq = data.getSeq();
-                       if (wSeq == seq) {
+                       LogData logData = data.getLogData();
+                       if (null != logData && logData.getSeq() == seq) {
                                return data;
                        }
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java
index ddddb7d..c413e70 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java
@@ -113,8 +113,8 @@ public class WarningTable extends DATableComposite {
                        // create images
 
                        // create DATableDataFormat
-                       DATableDataFormat tableData = new DATableDataFormat(
-                                       warningData.getSeq());
+                       DATableDataFormat tableData = new DATableDataFormat(warningData
+                                       .getLogData().getSeq());
                        tableData.getData().addAll(text);
                        tableData.setLogData(warningData.getLogData());
                        tableData.setType(AnalyzerConstants.TYPE_TABLE_WARNING);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java
index 8637f72..2f60205 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java
@@ -65,7 +65,7 @@ public class CallTraceView extends DAView {
                        AnalyzerLabels.TABLE_COLUMN_ARGUMENT,
                        AnalyzerLabels.TABLE_COLUMN_RETURN,
                        AnalyzerLabels.TABLE_COLUMN_LIBNAME };
-       private int[] columnSizes = { 60, 35, 35, 180, 100, 80, 200 };
+       private int[] columnSizes = { 60, 35, 35, 350, 150, 80, 200 };
        private boolean[] columnVisibility = { true, true, true, true, true, true,
                        true };
        int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,

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 29813af..5661b28 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java
@@ -1098,15 +1098,14 @@ public class AnalyzerUtil {
        }
 
        public static String toHexdecimal(long value) {
-//             String str = String.format("%x", value);
-//             if (str.length() < 8) {
-//                     StringBuffer zeroBuffer = new StringBuffer();
-//                     for (int i = str.length() - 1; i < 8; i++) {
-//                             zeroBuffer.append(CommonConstants.ZERO);
-//                     }
-//                     str = zeroBuffer.toString() + str;
-//             }
-               return Long.toHexString(value);
+               return CommonConstants.HEX_PREFIX + Long.toHexString(value);
+               // if (str.length() < 8) {
+               // StringBuffer zeroBuffer = new StringBuffer();
+               // for (int i = str.length() - 1; i < 8; i++) {
+               // zeroBuffer.append(CommonConstants.ZERO);
+               // }
+               // str = zeroBuffer.toString() + str;
+               // }
        }
 
        public static String getProcessLocalBinaryPath(int pid, long time) {
@@ -1122,8 +1121,7 @@ public class AnalyzerUtil {
        public static String getBinarySourcePath(int pid, long time) {
                String localBinPath = AnalyzerUtil.getProcessLocalBinaryPath(pid, time);
                String key = getTargetPathKey(localBinPath);
-               BinaryInfo binInfo = DACommunicator.getSelectedApp().getBinaryInfo(
-                               key);
+               BinaryInfo binInfo = DACommunicator.getSelectedApp().getBinaryInfo(key);
                String sourceBinPath = binInfo.getSourceBinaryPath();
                return sourceBinPath;
        }
@@ -1255,7 +1253,7 @@ public class AnalyzerUtil {
                                String path = libraryObject.getLibPath();
                                BinaryInfo binInfo = binInfoMap.get(path);
                                if (null != binInfo) {
-                                       String localPath = binInfo.getSourceBinaryPath();                                       
+                                       String localPath = binInfo.getSourceBinaryPath();
                                        String baseAddr = Long.toString(libraryObject
                                                        .getLowestAddress());
                                        String pcStr = Long.toString(pcAddr);