From: Hyunjong,park <phjwithyou.park@samsung.com>
Date: Thu, 7 Nov 2013 07:32:19 +0000 (+0900)
Subject: [Title] fix. bug comparator
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9505376e7ad70d51bb5a86009af6dd34d5796bb;p=sdk%2Ftools%2Fdynamic-analyzer.git

[Title] fix. bug comparator
[Desc.] support file, ui table widget
[Issue] -
---

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java
index 91821b8..c499bd1 100644
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java
@@ -425,4 +425,8 @@ public class DAChartBoardItem extends Composite {
 			return null;
 		}
 	}
+	
+	public DAChartBoard getChartBoard() {
+		return parentBoard;
+	}
 }
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java
index cea0012..b30ef7a 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java
@@ -64,16 +64,16 @@ public class FileApiListView extends DAView {
 			FilePageLabels.FILE_API_LIST_VIEW_RETURN,
 			FilePageLabels.FILE_API_LIST_VIEW_ERRNO };
 
-	private int[] columnSizes = { 40, 70, 100, 40, 40, 120, 250,  70, 100 };
-	private int[] columnAlignment = { SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT,SWT.RIGHT,
-			SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT };
+	private int[] columnSizes = { 40, 70, 100, 40, 40, 120, 250, 70, 100 };
+	private int[] columnAlignment = { SWT.RIGHT, SWT.RIGHT, SWT.RIGHT,
+			SWT.RIGHT, SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT };
 
 	int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,
+			AnalyzerConstants.SORT_TYPE_STRING,
+			AnalyzerConstants.SORT_TYPE_STRING,
 			AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
-			AnalyzerConstants.SORT_TYPE_NUM,
 			AnalyzerConstants.SORT_TYPE_STRING,
 			AnalyzerConstants.SORT_TYPE_STRING,
-			AnalyzerConstants.SORT_TYPE_NUM,
 			AnalyzerConstants.SORT_TYPE_STRING,
 			AnalyzerConstants.SORT_TYPE_STRING };
 
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java
index f649858..2a9917b 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java
@@ -68,11 +68,11 @@ public class UIFunctionProfilingView extends DAView {
 	UIFunctionProfilingTable treeComp = null;
 	private boolean[] columnVisibility = { true, true, true, true, true, true,
 			true, true, true };
-	int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NONE,
-			AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
-			AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
-			AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
-			AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM };
+	int[] sortTypes = { AnalyzerConstants.SORT_TYPE_STRING,
+			AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING,
+			AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING,
+			AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING,
+			AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING };
 
 	public UIFunctionProfilingView(Composite parent, int style) {
 		super(parent, style);
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DefaultTableComparator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DefaultTableComparator.java
index dbf7c90..19f51e0 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DefaultTableComparator.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DefaultTableComparator.java
@@ -88,7 +88,15 @@ public class DefaultTableComparator implements Comparator<Object> {
 		switch (type) {
 		case AnalyzerConstants.SORT_TYPE_NUM:
 			try {
-				rc = Integer.parseInt(str1) - Integer.parseInt(str2);
+
+				long returnData = Long.parseLong(str1) - Long.parseLong(str2);
+				if (returnData > 0) {
+					rc = 1;
+				} else if (returnData < 0) {
+					rc = -1;
+				} else {
+					rc = 0;
+				}
 				break;
 			} catch (NumberFormatException e) {
 				e.printStackTrace();