From: j0kim <j0.kim@samsung.com>
Date: Fri, 4 Jul 2014 01:58:54 +0000 (+0900)
Subject: Merge branch 'tizen' into mw
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da4f6cf5c638f6f93b0359f4af7e9b06bb80e023;p=sdk%2Ftools%2Fdynamic-analyzer.git

Merge branch 'tizen' into mw

Refactoring openGL, Network, Chart
Bugfix of leak detection in the range analysis
Fixed below Conflicts:
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLUtil.java
	package/pkginfo.manifest

Change-Id: I5c4d948712326d1781eccc7bd4b98b24a633b203
Signed-off-by: j0kim <j0.kim@samsung.com>
---

da4f6cf5c638f6f93b0359f4af7e9b06bb80e023
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java
index d5477e7,fd515da..e3f9d32
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java
@@@ -73,34 -74,33 +73,33 @@@ public class ReplayTraceHandler extend
  
  			// make replay event
  			// on/off , replay start time, count, event objs
- 			ReplayData replayData = ReplayDataManager.getInstance().getReplayDBManager()
- 					.getReplayLogs(true);
+ 			ReplayData replayData = ReplayDataManager.getInstance()
+ 					.getReplayDBManager().getReplayLogs(true);
  			int count = 0;
- 			if (null != replayData) {
+ 			if(null != replayData){
  				count = replayData.getObjectCount();
  			}
- 
  			byte[] eventObjs = null;
  			for (int i = 0; i < count; i++) {
 -				eventObjs = ByteUtil.concatByteArray(eventObjs, replayData
 -						.getRecordEvent().get(i).getByteValues());
 +				eventObjs = ByteUtil.concatByteArray(eventObjs, replayData.getRecordEvent().get(i)
 +						.getByteValues());
  
 -//				System.out.println(" sec : "
 -//						+ replayData.getRecordEvent().get(i).getEventTime()
 -//								.getSec()
 -//						+ " nano : "
 -//						+ replayData.getRecordEvent().get(i).getEventTime()
 -//								.getNano() + " id : "
 -//						+ replayData.getRecordEvent().get(i).getEventId()
 -//						+ " code : "
 -//						+ replayData.getRecordEvent().get(i).getEventCode()
 -//						+ " type : "
 -//						+ replayData.getRecordEvent().get(i).getEventType()
 -//						+ " value : "
 -//						+ replayData.getRecordEvent().get(i).getEventValue());
 +				// System.out.println(" sec : "
 +				// + replayData.getRecordEvent().get(i).getEventTime()
 +				// .getSec()
 +				// + " nano : "
 +				// + replayData.getRecordEvent().get(i).getEventTime()
 +				// .getNano() + " id : "
 +				// + replayData.getRecordEvent().get(i).getEventId()
 +				// + " code : "
 +				// + replayData.getRecordEvent().get(i).getEventCode()
 +				// + " type : "
 +				// + replayData.getRecordEvent().get(i).getEventType()
 +				// + " value : "
 +				// + replayData.getRecordEvent().get(i).getEventValue());
  			}
 -			replayEvent = ByteUtil.getByte(REPLAY_ON, startTime.getSec(),
 -					startTime.getNano(), count, eventObjs);
 +			replayEvent = ByteUtil.getByte(REPLAY_ON, startTime.getSec(), startTime.getNano(),
 +					count, eventObjs);
  		}
  		return null;
  	}
diff --cc package/changelog
index d98ca3f,a352b45..39f83bf
--- a/package/changelog
+++ b/package/changelog
@@@ -1,29 -1,3 +1,33 @@@
++* 2.1.38
++- Refactoring: OpenGL, Network, Chart
++- Bug fix: failure in leak detection of range analysis
++== j0kim <j0.kim@samsung.com> 2014-06-17
 +* 2.1.37
 +- apply new DB schema to Range Analysis
 +- screenshot bug fix for not getting screenshot file from target
 +- revision configuration default value, disable timelinechart (UI event, Device)
 +== woojin jung <woojin2.jung@samsung.com> 2014-06-27
 +* 2.1.36
 +- bug fix for trace on real device
 +== Jungwook Ryu <jungwook.ryu@samsung.com> 2014-06-27
 +* 2.1.35
 +- launch bug fix for mac
 +== Jaewon Lim <jaewon81.lim@samsung.com> 2014-06-27
 +* 2.1.34
 +- fix for release
 +== j0kim <j0.kim@samsung.com> 2014-06-27
 +* 2.1.33
 +- new UX Design
 +== j0kim <j0.kim@samsung.com> 2014-06-17
 +* 2.1.32
 +- enable source view for EFL application
 +== woojin jung <woojin2.jung@samsung.com> 2014-05-17
 +* 2.1.31
 +- fix build properties
 +== jaewon81 <jaewon81.lim@samsung.com> 2014-05-16
 +* 2.1.30
 +- supporting EFL
 +== j0kim <j0.kim@samsung.com> 2014-05-16
  * 2.1.29
  - add build properties in appearance and common plugin
  == jaewon81 <jaewon81.lim@samsung.com> 2014-04-17
diff --cc package/pkginfo.manifest
index 917c4b5,840658a..047b975
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,6 -1,6 +1,6 @@@
  Source:dynamic-analyzer
- Version:2.1.37
- Maintainer:Jaewon Lim <jaewon81.lim@samsung.com>, Juyoung Kim
 -Version:2.1.29
 -Maintainer:Jaewon Lim <jaewon81.lim@samsung.com>, Juyoung Kim<j0.kim@samsung.com>
++Version:2.1.38
++Maintainer:Jaewon Lim <jaewon81.lim@samsung.com>, Juyoung Kim <j0.kim@samsung.com>
  
  Package:dynamic-analyzer-product
  OS:ubuntu-32
@@@ -30,4 -34,6 +30,5 @@@ Package:dynamic-analyzer-produc
  OS:macos-64
  Build-host-os:ubuntu-64
  Build-dependency:indigo-macpde [macos-64], common-eplugin [macos-64]
 -Install-dependency:dynamic-analysis-ide-eplugin [macos-64]
  Description:Make Dynamic analyzer
+