[Title] fix. print file name

[Desc.] split file name in file page
[Issue] -

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java
index 7f3923c..7bafa26 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java
@@ -336,13 +336,20 @@ public class FileDataMaker {
                DAChartBoardItem item;
                DAChart chart;
                if (null == parent) {
-                       item = new DAChartBoardItem(board, sync.getFileName());
+                       String fileName = sync.getFileName();
+                       if (sync.getFileName().length() > 12) {
+                               fileName = sync.getFileName().substring(0, 12);
+                               fileName += CommonConstants.NEW_LINE
+                                               + sync.getFileName().substring(12,
+                                                               sync.getFileName().length());
+                       }
+                       item = new DAChartBoardItem(board, fileName);
                        chart = item.getChart();
                        initFileChart(chart, true);
                } else {
                        DAChartBoardItem parentItem = parent.getItem();
                        if (sync.getFD() > 999999999) {
-                               item = new DAChartBoardItem(parentItem, "0x"
+                               item = new DAChartBoardItem(parentItem, "0x"//$NON-NLS-1$
                                                + Long.toHexString(sync.getFD()));
                        } else {
                                item = new DAChartBoardItem(parentItem, Long.toString(sync
@@ -502,6 +509,5 @@ public class FileDataMaker {
                                data.checkUpdate();
                        }
                }
-
        }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java
index 1504181..16beabd 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java
@@ -143,16 +143,13 @@ public class NetworkDataMaker {
        private NetworkChartDataEvent makeEventData(NetworkData input) {
                String apiAddress = input.getDestinationAddress();
                String apiFD = Long.toString(input.getFdValue());
+               apiFD = getHexString(apiFD);
                String apiThread = Integer.toString(input.getTid());
                String apiName = input.getApiName();
                int apiType = input.getFdApiType();
                double time = input.getTime();
                long errno = input.getErrno();
 
-               if (input.getApiName().contains("accept")) {
-                       System.out.println(input.getApiName() + " " + apiFD);
-               }
-
                int connectedType = 5;
                String parentAddress = addressByFdHashMap.get(apiFD);
                if (null != parentAddress) { // get Address by FD
@@ -232,10 +229,10 @@ public class NetworkDataMaker {
                                return null;
                        }
                        String clientAddress = strInput[2];
+                       
                        addressByFdHashMap.put(apiFD, clientAddress);
                        parentFDByFdHashMap.put(apiFD, apiFD);
                        connectedType = NetworkChartDataEvent.NETWORK_CHART_SESSION_NAME;
-                       System.out.println("input.getArgs() : "+input.getArgs());
                        break;
                case LogCenterConstants.HTTP_API_TRANSACTION_OPEN: {
                        String clientFD = input.getReturn();
@@ -491,20 +488,7 @@ public class NetworkDataMaker {
                        } else if (connectedType == NetworkChartDataEvent.NETWORK_CHART_TRANSACTION_NAME) {
                                objectName = NetworkPageLabels.NETWORK_CHART_TRANSACTION_NAME;
                        }
-                       
-                       String fd = CommonConstants.EMPTY;
-                       if(sync.getEvent().getApiName().contains(CommonConstants.DOUBLE_COLON)){
-                               if(sync.getFD().contains("0x")){//$NON-NLS-1$
-                                       fd = sync.getFD();
-                               }else{
-                                       fd = AnalyzerUtil.toHexdecimal(Long.parseLong(sync.getFD()));
-                               }
-                               
-                       }else{
-                               fd = sync.getFD();
-                       }
-                       
-                       item = new DAChartBoardItem(parentItem, objectName + fd);
+                       item = new DAChartBoardItem(parentItem, objectName + sync.getFD());
 
                        chart = item.getChart();
                        initNetworkChart(chart, false);
@@ -832,4 +816,16 @@ public class NetworkDataMaker {
                        }
                }
        }
+       private String getHexString(String input){
+               String retStr = null;
+               long lInput = Long.parseLong(input);
+               if (lInput < 0x10000000) {
+                       retStr = Long.toString(lInput);
+               } else {
+                       retStr = AnalyzerUtil.toHexdecimal(lInput);
+               }
+               return retStr;
+       }
+       
+       
 }