From f4a9d18f60418a4e95529fb01c4ada651bf18b51 Mon Sep 17 00:00:00 2001
From: kamuru <kamuru@kamuru-Samsung-Desktop-System.(none)>
Date: Tue, 3 Dec 2013 16:24:50 +0900
Subject: [PATCH] [Title] Fix bug on da chart [Desc.] Fix bug on da chart's
 null buffer disposing [Issue]

---
 .../org/tizen/dynamicanalyzer/widgets/chart/DAChart.java  |  6 ++++--
 .../dynamicanalyzer/ui/timeline/chart/DeviceChart.java    | 15 +++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChart.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChart.java
index c7f804c..cc569bf 100644
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChart.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChart.java
@@ -129,7 +129,9 @@ public class DAChart extends Canvas {
 	public void clear() {
 		seriesList.clear();
 		plot.clear();
-		chartBuffer.dispose();
+		if (chartBuffer != null) {
+			chartBuffer.dispose();
+		}
 	}
 
 	public void contentsClear() {
@@ -148,7 +150,7 @@ public class DAChart extends Canvas {
 	
 	protected void redrawBuffer(){
 		Rectangle rt = getClientArea();
-		if (null != chartBuffer) {
+		if (chartBuffer != null) {
 			chartBuffer.dispose();
 		}
 		if (rt.width > 0 && rt.height > 0) {
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DeviceChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DeviceChart.java
index 3bef6ae..725494a 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DeviceChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DeviceChart.java
@@ -18,6 +18,7 @@ import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard;
 import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem;
 
 public class DeviceChart extends TimelineChart {
+	private static final String EMPTY = ""; //$NON-NLS-1$
 	private static final String OFF = "Off"; //$NON-NLS-1$
 	private static final String ON = "On"; //$NON-NLS-1$
 	private static final String CONNECTED = "Connected"; //$NON-NLS-1$
@@ -27,12 +28,10 @@ public class DeviceChart extends TimelineChart {
 	private static final String SEARCHING = "Searching"; //$NON-NLS-1$
 	private static final String NORMAL_CONNECTED = "Normal connected"; //$NON-NLS-1$
 	private static final String SECURE_CONNECTED = "Secure connected"; //$NON-NLS-1$
+	private static final String OPEN = "Open"; //$NON-NLS-1$
 	private static final String PREVIEW = "Preview"; //$NON-NLS-1$
-	private static final String PREVIEW_LOCK = "Preview lock"; //$NON-NLS-1$
-	private static final String CAPTURING = "Capturing"; //$NON-NLS-1$
 	private static final String RECORDING = "Recording"; //$NON-NLS-1$
-	private static final String RECORDING_LOCK = "Recording lock"; //$NON-NLS-1$
-	private static final String REVIEW = "Review"; //$NON-NLS-1$
+	private static final String RECORDING_PAUSE = "Recording pause"; //$NON-NLS-1$
 	
 	private static DeviceChart instance = null;
 	
@@ -45,15 +44,15 @@ public class DeviceChart extends TimelineChart {
 	private final String[] wifiStates = new String[] { OFF, UNCONNECTED,
 			CONNECTED, TRANSFER };
 	private final String[] bluetoothStates = new String[] { OFF, ON, VISIBLE,
-			TRANSFER };
+			EMPTY, TRANSFER };
 	private final String[] gpsStates = new String[] { OFF, SEARCHING, CONNECTED };
 	private final String[] dnetStates = new String[] { OFF, NORMAL_CONNECTED,
 			SECURE_CONNECTED, TRANSFER };
-	private final String[] cameraStates = new String[] { OFF, ON, PREVIEW,
-			PREVIEW_LOCK, CAPTURING, RECORDING, RECORDING_LOCK, REVIEW };
+	private final String[] cameraStates = new String[] { OFF, OPEN, PREVIEW,
+			RECORDING, RECORDING_PAUSE };
 
 	public static DeviceChart getInstance() {
-		if(instance == null) {
+		if (instance == null) {
 			instance = new DeviceChart();
 		}
 		
-- 
2.7.4