[Title] fix. return column in table widget

[Desc.] print integer or hex
[Issue] -

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
index 6ecceef..0e2b86d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
@@ -178,8 +178,14 @@ public class FileApiListTable extends DAApiListTableComposite {
                        contentText.add(contentTemp.getArgs());
                        contentData.add(contentTemp.getArgs());
 
-                       contentText.add(contentTemp.getHexReturn());
+                       if(contentTemp.getReturn() > 999999999){
+                               contentText.add(contentTemp.getHexReturn());
+                       }else{
+                               contentText.add(Long.toString(contentTemp.getReturn()));
+                       }
                        contentData.add(Long.toString(contentTemp.getReturn()));
+                       
+                       
 
                        String errMsg = ErrorCodeManager.getInatance()
                                        .getErrorCode(contentTemp.getErrno()).name();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java
index 232db00..eab141e 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java
@@ -203,7 +203,11 @@ public class NetworkApiListTable extends DAApiListTableComposite {
                        contentText.add(contentTemp.getArgs());
                        contentData.add(contentTemp.getArgs());
 
-                       contentText.add(contentTemp.getHexReturn());
+                       if(contentTemp.getReturn() > 999999999){
+                               contentText.add(contentTemp.getHexReturn());
+                       }else{
+                               contentText.add(Long.toString(contentTemp.getReturn()));
+                       }
                        contentData.add(Long.toString(contentTemp.getReturn()));
 
                        int apiType = contentTemp.getFdApiType();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java
index 8aa6267..c195d26 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java
@@ -324,8 +324,7 @@ public class NetworkChartData {
        }
 
        public void checkUpdate() {
-               if (false == hasUpdate
-                               && !AnalyzerManager.isRunning() ) {
+               if (false == hasUpdate && AnalyzerManager.isRunning()) {
                        return;
                } else {
                        hasUpdate = false;
@@ -385,10 +384,10 @@ public class NetworkChartData {
                        break;
                }
                case LogCenterConstants.SOCKET_API_CONNECT: {
-//                     if (event.isFailedAPI()) {
-//                             setFDCloseStatusManager(event);
-//                             return;
-//                     }
+                       // if (event.isFailedAPI()) {
+                       // setFDCloseStatusManager(event);
+                       // return;
+                       // }
                        if (isParent()) {
                                setConnectedParentStatus(event);
                        } else {
@@ -399,10 +398,10 @@ public class NetworkChartData {
                case LogCenterConstants.SOCKET_API_ACCEPT_START:
                        break;
                case LogCenterConstants.SOCKET_API_ACCEPT_END: {
-//                     if (event.isFailedAPI()) {
-//                             setFDCloseStatusManager(event);
-//                             return;
-//                     }
+                       // if (event.isFailedAPI()) {
+                       // setFDCloseStatusManager(event);
+                       // return;
+                       // }
                        if (isParent()) {
                                setConnectedParentStatus(event);
                        } else {
@@ -442,15 +441,15 @@ public class NetworkChartData {
                case LogCenterConstants.SOCKET_API_EVENT_END:
                        break;
                case LogCenterConstants.SOCKET_API_BIND: {
-//                     if (event.isFailedAPI() == true) {
-//                             setFDCloseStatusManager(event);
-//                     }
+                       // if (event.isFailedAPI() == true) {
+                       // setFDCloseStatusManager(event);
+                       // }
                        break;
                }
                case LogCenterConstants.SOCKET_API_LISTEN: {
-//                     if (event.isFailedAPI() == true) {
-//                             setFDCloseStatusManager(event);
-//                     }
+                       // if (event.isFailedAPI() == true) {
+                       // setFDCloseStatusManager(event);
+                       // }
                        break;
                }
                case LogCenterConstants.SOCKET_API_OTHER:
@@ -981,17 +980,17 @@ public class NetworkChartData {
                return socketTotalUsedTime;
        }
 
-//     public double getTotalUseTime() {
-//             if (isParent()) {
-//                     return parentTotalUsedTime();
-//             }
-//             if (isClosed(null) == true) {
-//                     return this.socketLastUsedTime - this.socketOpendTime;
-//             } else {
-//                     return this.socketTotalUsedTime;
-//             }
-//     }
-       
+       // public double getTotalUseTime() {
+       // if (isParent()) {
+       // return parentTotalUsedTime();
+       // }
+       // if (isClosed(null) == true) {
+       // return this.socketLastUsedTime - this.socketOpendTime;
+       // } else {
+       // return this.socketTotalUsedTime;
+       // }
+       // }
+
        public double getTotalUseTime() {
 
                if (isParent()) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java
index 69cebb2..68b2f14 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java
@@ -180,20 +180,30 @@ public class NetworkChartManager implements Runnable {
                        StringBuffer out = new StringBuffer();
                        StringBuffer strHex = new StringBuffer();
                        StringBuffer strAscii = new StringBuffer();
-                       int index = 1;
+                       int index = 0;
                        long hexAddress = 0;
                        for (int nIndex = 0; nIndex < packetMessage.length(); nIndex++) {
 
                                strAscii.append(packetMessage.charAt(nIndex));
 
-                               if (index == 1) {
-                                       strHex.append(
-                                                       Long.toHexString((Long) hexAddress++).toUpperCase())
-                                                       .append(CommonConstants.TAB);
-                               } else if (index % 8 == 0) {
+                               if (index % 8 == 0) {
+                                       hexAddress++;
+                                       String strHexCode = Long.toHexString((Long) hexAddress)
+                                                       .toUpperCase();
+                                       String strhexCodeFormat = CommonConstants.EMPTY;
+                                       if (strHexCode.length() == 1) {
+                                               strhexCodeFormat += CommonConstants.ZERO
+                                                               + CommonConstants.ZERO + strHexCode
+                                                               + CommonConstants.ZERO;
+                                       } else if (strHexCode.length() == 2) {
+                                               strhexCodeFormat += CommonConstants.ZERO + strHexCode
+                                                               + CommonConstants.ZERO;
+                                       } else if (strHexCode.length() == 3) {
+                                               strhexCodeFormat += strHexCode + CommonConstants.ZERO;
+                                       }
                                        strHex.append(CommonConstants.NEW_LINE)
-                                                       .append(Long.toHexString((Long) hexAddress++)
-                                                                       .toUpperCase()).append(CommonConstants.TAB);
+                                                       .append(strhexCodeFormat)
+                                                       .append(CommonConstants.TAB);
 
                                }
                                strHex.append(String.format("%02X ",
@@ -213,7 +223,6 @@ public class NetworkChartManager implements Runnable {
                        out.append(CommonConstants.SPACE).append(CommonConstants.SPACE);
 
                        out.append(NetworkPageLabels.NETWORK_DETAILS_PAYLOAD_HEXCODE)
-                                       .append(CommonConstants.NEW_LINE)
                                        .append(CommonConstants.NEW_LINE);
                        out.append(strHex.toString());
                        this.packetMessage = out.toString();