leaktable : fix. comparator feature

Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I2bd02c9e56696ca086440117ec0515b4ad41fdda

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java
index d56000c..d24b04d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java
@@ -192,10 +192,11 @@ public class LeakTable extends DATreeComposite {
                        }
 
                        TreeInput leakInput = makeTreeInputForLeakData(iLeakData, i);
-                       if (leakInput != null)
+                       if (leakInput != null){
                                output.add(leakInput);
+                       }
                }
-
+               
                return output;
        }
 
@@ -211,7 +212,11 @@ public class LeakTable extends DATreeComposite {
                        Logger.error("very strange case !!");
                        return null;
                }
-
+               // 2 : sequence number
+               int seq = (Integer) leakData.get(MemoryAllocationDataDBTable.COLUMN_INDEX_SEQUENCE_NUMBER);
+               text.add(Integer.toString(seq));
+               data.add(seq);
+               
                // 0 : column empty value for tree
                int apiId = (Integer) leakData.get(MemoryAllocationDataDBTable.COLUMN_INDEX_API_ID);
                String apiName = FunctionNameManager.getFunctionName(apiId);
@@ -221,10 +226,7 @@ public class LeakTable extends DATreeComposite {
                int pid = (Integer) leakData.get(MemoryAllocationDataDBTable.COLUMN_INDEX_PROCESS_ID);
                text.add(Integer.toString(pid));
                data.add(pid);
-               // 2 : sequence number
-               int seq = (Integer) leakData.get(MemoryAllocationDataDBTable.COLUMN_INDEX_SEQUENCE_NUMBER);
-               text.add(Integer.toString(seq));
-               data.add(seq);
+
                // 3 : message id
                int id = (Integer) leakData.get(MemoryAllocationDataDBTable.COLUMN_INDEX_MESSAGE_ID);
                String type = LogDataFactory.getLogFormatById(id).getName();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java
index 25bf123..02c4676 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java
@@ -42,17 +42,17 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData;
 
 public class LeakView extends DAViewComposite {
-       protected String[] columnNames = { SummaryLabels.LEAK_VIEW_NAME,
-                       SummaryLabels.LEAK_VIEW_PID, SummaryLabels.LEAK_VIEW_INDEX,
+       protected String[] columnNames = {SummaryLabels.LEAK_VIEW_INDEX, SummaryLabels.LEAK_VIEW_NAME,
+                       SummaryLabels.LEAK_VIEW_PID, 
                        SummaryLabels.LEAK_VIEW_TYPE, SummaryLabels.LEAK_VIEW_TIME,
                        SummaryLabels.LEAK_VIEW_FILE_PARAMETER,
                        SummaryLabels.LEAK_VIEW_RETURN, AnalyzerLabels.TABLE_COLUMN_LIBNAME };
-       protected int[] columnSizes = { 150, 45, 25, 60, 60, 100, 70, 200 };
-       protected boolean[] columnVisibility = { true, true, false, true, true,
+       protected int[] columnSizes = { 25, 150, 45, 60, 60, 100, 70, 200 };
+       protected boolean[] columnVisibility = { false, true, true, true, true,
                        true, true, true };
-       protected int[] sortTypes = { AnalyzerConstants.SORT_TYPE_GRID,
-                       AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
-                       AnalyzerConstants.SORT_TYPE_GRID, AnalyzerConstants.SORT_TYPE_NUM,
+       protected int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,
+                       AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_NUM,
+                       AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_NUM,
                        AnalyzerConstants.SORT_TYPE_STRING,
                        AnalyzerConstants.SORT_TYPE_STRING,
                        AnalyzerConstants.SORT_TYPE_STRING };