From: jungwook.ryu <jungwook.ryu@samsung.com>
Date: Tue, 26 Aug 2014 09:00:33 +0000 (+0900)
Subject: Merge branch 'da-timeline' into tizen
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ce621154de36571b71c02cb2e529cc0182b6013;p=sdk%2Ftools%2Fdynamic-analyzer.git

Merge branch 'da-timeline' into tizen

Conflicts:
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java

Change-Id: Id6f77b7640bf81dc1beb3ccc5a7c444fb0f0d452
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
---

5ce621154de36571b71c02cb2e529cc0182b6013
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
index 0db2b15,7a9f821..a9e967d
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
@@@ -1,30 -1,6 +1,31 @@@
 +/*
 + *  Dynamic Analyzer
 + *
 + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
 + *
 + * Contact: 
 + * Jaewon Lim <jaewon81.lim@samsung.com>
 + * Juyoung Kim <j0.kim@samsung.com>
 + *
 + * Licensed under the Apache License, Version 2.0 (the "License");
 + * you may not use this file except in compliance with the License.
 + * You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + * 
 + * Contributors:
 + * - S-Core Co., Ltd
 + * 
 + */
  package org.tizen.dynamicanalyzer.database;
  
+ import java.sql.Array;
  import java.sql.Connection;
  import java.sql.DriverManager;
  import java.sql.PreparedStatement;
@@@ -505,11 -494,11 +517,11 @@@ public class SqlConnectionManager 
  							} else if (rsMetaData.getColumnTypeName(i)
  									.contains(DBConstants.BOOLEAN)) {
  								rowData.add(Boolean.valueOf(rs.getBoolean(i)));
- 							} else if (rsMetaData.getColumnTypeName(i)
- 									.contains(DBConstants.DBTYPE_INT1)) {
- 								rowData.add(Byte.valueOf(rs.getByte(i)));								
+ 							} else if (rsMetaData.getColumnTypeName(i).contains(
+ 									DBConstants.DBTYPE_INT1)) {
+ 								rowData.add(Byte.valueOf(rs.getByte(i)));
  							} else {
 -								DA_LOG.error(query + " undefined type : "
 +								Logger.error("undefined type : "
  										+ rsMetaData.getColumnTypeName(i));
  							}
  						}
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
index 529a157,c2df351..27f7145
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
@@@ -39,10 -39,9 +39,9 @@@ import org.tizen.dynamicanalyzer.resour
  import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants;
  import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener;
  import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter;
- import org.tizen.dynamicanalyzer.ui.timeline.EnergyDBTable;
  import org.tizen.dynamicanalyzer.ui.timeline.SystemDataDBTable;
  import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 -import org.tizen.dynamicanalyzer.util.DALogger;
 +import org.tizen.dynamicanalyzer.util.Logger;
  import org.tizen.dynamicanalyzer.widgets.chart.DAChart;
  import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot;
  import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType;
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java
index 4a70d25,023ddc8..6bf4c06
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java
@@@ -569,17 -575,12 +576,17 @@@ public class TimelineChartManager exten
  				ScreenShotData log = (ScreenShotData) screenShotLogList.get(i);
  				ArrayList<Object> dbScreenShotData = new ArrayList<Object>();
  				String imagePathLog = null;
 -				if (DACommunicator.isTargetEmulator() && SocketClient.getInstance().isConnected()) {
 -					imagePathLog = GlobalInformation.getCurrentDeviceInfo().emulatorScreenshot.getFilePath();
 +				String[] splitedImagePathLog = null;
 +				if (DACommunicator.isTargetEmulator()
 +						&& SocketClient.getInstance().isConnected()) {
 +					imagePathLog = GlobalInformation.getCurrentDeviceInfo().emulatorScreenshot
 +							.getFilePath();
 +					splitedImagePathLog = AnalyzerUtil.splitFilePath(imagePathLog, File.separator);
  				} else {
  					imagePathLog = log.getImageFilePath();
- 					splitedImagePathLog = AnalyzerUtil.splitFilePath(imagePathLog, "/");
++					splitedImagePathLog = AnalyzerUtil.splitFilePath(imagePathLog, CommonConstants.SLASH);
  				}
 -				String[] splitedImagePathLog = imagePathLog.split(File.separator); //$NON-NLS-1$
 +				
  				String fileName = splitedImagePathLog[splitedImagePathLog.length - 1];
  
  				dbScreenShotData.add(new Long(log.getTime()));