From 8820ec00f5cb17486f602366d4648c546ac78fa0 Mon Sep 17 00:00:00 2001
From: greatim <jaewon81.lim@samsung.com>
Date: Wed, 10 Apr 2013 14:43:55 +0900
Subject: [PATCH] [Title] fix for communication [Desc.] [Issue]

---
 .../communicator/DACommunicator.java               | 23 ++++++++++++++--------
 .../ui/toolbar/ConfigureManager.java               | 12 +++++++----
 .../ui/toolbar/RecordStartStopThread.java          | 13 ++++++------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
index 9db2d9c..f1526e0 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
@@ -532,11 +532,20 @@ public class DACommunicator {
 
 			System.out.println("wait for ack...");
 			while (isRunning) {
-				if (null != (result = controlReader.readLine())
-						&& !result.isEmpty()) {
-					break;
+				char cbuf[] = new char[64];
+				int readsize = controlReader.read(cbuf);
+//				System.out.println(readsize);
+				
+				if(readsize > 0)
+				{
+					result = String.copyValueOf(cbuf, 0, readsize);
+					System.out.println(result.length() + "="+ result);
+				
+					if (null != result	&& !result.isEmpty()) {
+						break;
+					}
 				}
-				System.out.println("wait!!");
+//				System.out.println("wait!!");
 			}
 			System.out.println("pass");
 			// result = "test ack message";
@@ -889,14 +898,12 @@ public class DACommunicator {
 	// NEW_COM
 	public static boolean sendVersionMessage() {
 		String message = AnalyzerConstants.MSG_VERSION
-				+ CommonConstants.CMD_SPLIT + AnalyzerConstants.DA_VERSION;
+				+ CommonConstants.CMD_SPLIT + AnalyzerConstants.DA_VERSION.length() +
+				CommonConstants.CMD_SPLIT + AnalyzerConstants.DA_VERSION;
 		System.out.println("Send control message :" + message); //$NON-NLS-1$
 
 		String result = handleControlMessage(message);
 
-		// test
-		result = "901|1|0";
-		// result = "902|3|2.0";
 		if (null != result) {
 			System.out.println("version message ack :" + result);
 			String[] splitResult = result.split(CommonConstants.CMD_SPLIT_READ);
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java
index 7deab23..0b6a99a 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java
@@ -258,11 +258,15 @@ public class ConfigureManager {
 			return 0;
 		}
 		String valuestr = data.get(key);
-		if (valuestr.equalsIgnoreCase(ConfigureLabels.ON)) {
-			return 1;
-		} else {
+		if(valuestr == null)
 			return 0;
-		}
+		else
+			return Integer.parseInt(valuestr);
+//		if (valuestr.equalsIgnoreCase(ConfigureLabels.ON)) {
+//			return 1;
+//		} else {
+//			return 0;
+//		}
 	}
 
 	public void setValue(String key, String val) {
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/RecordStartStopThread.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/RecordStartStopThread.java
index af27036..71a0605 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/RecordStartStopThread.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/RecordStartStopThread.java
@@ -162,11 +162,12 @@ public class RecordStartStopThread implements Runnable {
 			}
 		});
 
-		if (DACommunicator.isRunning()) {
-			String message = AnalyzerConstants.MSG_STOP
-					+ CommonConstants.CMD_SPLIT + 0 + CommonConstants.CMD_SPLIT;
-			DACommunicator.sendMessage(message);
-			System.out.println("stop send message :" + message);
-		}
+		DACommunicator.sendStopMessage();
+//		if (DACommunicator.isRunning()) {
+//			String message = AnalyzerConstants.MSG_STOP
+//					+ CommonConstants.CMD_SPLIT + 0 + CommonConstants.CMD_SPLIT;
+//			DACommunicator.sendMessage(message);
+//			System.out.println("stop send message :" + message);
+//		}
 	}
 }
-- 
2.7.4