From 177521fd2f09e52548835cfea4f8789ac5f2ee34 Mon Sep 17 00:00:00 2001
From: Maria Guseva <m.guseva@samsung.com>
Date: Mon, 23 May 2016 14:32:37 +0300
Subject: [PATCH] SRADA-629: Communicator40.serializeApplicationInst() fixed to
 work in CLI mode.

* Communicator40.addCheckpointsToInstList() - new private method extracted from
serializeApplicationInst().
* Communicator40.serializeApplicationInst() - call addCheckpointsToInstList() only
in GUI mode.

Change-Id: I497d7ad3253c171e3eefb2c8b1133eaadd9d3568
---
 .../protocol/p40/Communicator40.java               | 32 ++++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/Communicator40.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/Communicator40.java
index ea806d2..6c862aa 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/Communicator40.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/Communicator40.java
@@ -287,15 +287,9 @@ public class Communicator40 extends Communicator30 {
 					continue;
 				}
 
-				List<FunctionBodyInstrument40> fbiList = getFBIList(InteractiveDataManager
-						.getInstance().getVariableInfoList());
-				Logger.debug("fbiList.size() : " + fbiList.size());
-				for (int i = 0; i < fbiList.size(); i++) {
-					FunctionInst40 functionInst = new FunctionInst40();
-					functionInst.setAddr(fbiList.get(i).getAddress());
-					functionInst.setType(ProtocolConstant40.PROBE_FBI);
-					functionInst.setFBI(fbiList.get(i));
-					functionInstList.add(functionInst);
+				if (Global.isGUIMode()) {
+					// checkpoints are not supported in CLI mode yet
+					addCheckpointsToInstList(functionInstList);
 				}
 
 				// TODO : make sure that first app of package is main app
@@ -341,6 +335,26 @@ public class Communicator40 extends Communicator30 {
 		}
 	}
 
+	/**
+	 * Add checkpoints data to function instrumentation list
+	 *
+	 * @param functionInstList list of ISerializable objects to add new
+	 *            functions to
+	 */
+	private void addCheckpointsToInstList(
+			List<ISerializable> functionInstList) {
+		List<FunctionBodyInstrument40> fbiList = getFBIList(InteractiveDataManager
+				.getInstance().getVariableInfoList());
+		Logger.debug("fbiList.size() : " + fbiList.size());
+		for (int i = 0; i < fbiList.size(); i++) {
+			FunctionInst40 functionInst = new FunctionInst40();
+			functionInst.setAddr(fbiList.get(i).getAddress());
+			functionInst.setType(ProtocolConstant40.PROBE_FBI);
+			functionInst.setFBI(fbiList.get(i));
+			functionInstList.add(functionInst);
+		}
+	}
+
 	@Override
 	protected List<ISerializable> getFunctionInstList(List<AddrSymbolPair> symbols) {
 		List<ISerializable> functionInstList = new ArrayList<ISerializable>();
-- 
2.7.4