From 0d4f7ace291e225840065dca559e7565556f5745 Mon Sep 17 00:00:00 2001
From: greatim <jaewon81.lim@samsung.com>
Date: Fri, 16 May 2014 21:44:59 +0900
Subject: [PATCH] [Title] fix build properties and fix some bugs (args of
 function log, retry count of device connect) [Desc.] [Issue]

Change-Id: I0ff335a78caca7d26550d161f9da44354bbe3ec5
---
 org.tizen.dynamicanalyzer/build.properties                           | 5 +----
 .../org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java    | 5 ++---
 .../src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java   | 2 +-
 .../dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java  | 1 +
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/org.tizen.dynamicanalyzer/build.properties b/org.tizen.dynamicanalyzer/build.properties
index 648b644..da10751 100644
--- a/org.tizen.dynamicanalyzer/build.properties
+++ b/org.tizen.dynamicanalyzer/build.properties
@@ -11,8 +11,5 @@ bin.includes = .,\
                .settings/,\
                .project,\
                .classpath,\
-               lib/org.eclipse.nebula.widgets.grid_1.0.0.jar,\
-               lib/hsqldb.jar,\
-               lib/json-simple-1.1.1.jar,\
-               lib/protobuf.jar
+               lib/
 
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java
index 6cccf2e..3adb168 100755
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java
@@ -305,11 +305,11 @@ public class CommunicatorUtils {
 	}
 
 	public static int getRemotePort(IDevice device) {
-		int count = 0;
 		int remotePort = -1;
 		// add error check
 		System.out.print("Getting Port Progress \n ");
-		while (count < PORT_WAIT_TIME) {
+		long start = System.currentTimeMillis();
+		while ((System.currentTimeMillis() - start) < PORT_WAIT_TIME) {
 			try {
 				execShellCommand(device,
 						AnalyzerShellCommands.CMD_CAT_PORT_FILE,
@@ -332,7 +332,6 @@ public class CommunicatorUtils {
 						System.out.print("=");
 					}
 				}
-				count++;
 				Thread.sleep(10);
 			} catch (InterruptedException e) {
 				// e.printStackTrace();
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java
index 85b3179..bfbae26 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java
@@ -111,7 +111,7 @@ public class ProfileData extends LogData {
 			cpuNum = ByteUtils.toInt(data, index);
 			index += INT_SIZE;
 			ArgsInfo info = LogDataUtils.parseArgs(data, index);
-			args = info.getProfileArgs();
+			args = info.getArgs();
 			index = info.getLastIndex();
 			break;
 		case MSG_FUNCTION_EXIT:
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java
index 194d7d8..a5afc0f 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java
@@ -509,6 +509,7 @@ public abstract class DAWindowingTableComposite extends DATableComposite {
 		queriedLogData = null;
 		queriedObjectData = null;
 		totalItemCount = 0;
+		previousItemCount = -1;
 	}
 
 	@Override
-- 
2.7.4