[Title] Remove dprecated charts
authorsanghyunnim.lee <sanghyunnim.lee@samsung.com>
Tue, 3 Jul 2012 10:46:56 +0000 (19:46 +0900)
committersanghyunnim.lee <sanghyunnim.lee@samsung.com>
Tue, 3 Jul 2012 10:46:56 +0000 (19:46 +0900)
[Type] feature
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

15 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineChartManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ChartDataSetCenter.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/AllocFreeChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/AudioChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/BTChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/BrightnessChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/CameraChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/GPSChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/MemoryUsageChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/ResourceUsageChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/SoundChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/UIEventsChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/VibrationChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/VoltageChart.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/WIFIChart.java [deleted file]

index b6f1bdb..7a3f60d 100644 (file)
@@ -6,29 +6,18 @@ import java.util.List;
 import org.jfree.chart.JFreeChart;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
+import org.tizen.dynamicanalyzer.timeline.chart.CPUChart;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUCoreChart;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUFrequencyChart;
-import org.tizen.dynamicanalyzer.timeline.chart.HeapChart;
-import org.tizen.dynamicanalyzer.timeline.chart.CPUChart;
 import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
 import org.tizen.dynamicanalyzer.timeline.chart.DeviceChart;
 import org.tizen.dynamicanalyzer.timeline.chart.EnergyChart;
 import org.tizen.dynamicanalyzer.timeline.chart.FileChart;
-import org.tizen.dynamicanalyzer.timeline.chart.SystemMemoryChart;
+import org.tizen.dynamicanalyzer.timeline.chart.HeapChart;
 import org.tizen.dynamicanalyzer.timeline.chart.ProcessMemoryChart;
 import org.tizen.dynamicanalyzer.timeline.chart.SnapShotChart;
+import org.tizen.dynamicanalyzer.timeline.chart.SystemMemoryChart;
 import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.AudioChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.BTChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.BrightnessChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.CameraChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.GPSChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.ResourceUsageChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.SoundChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.UIEventsChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.VibrationChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.VoltageChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.WIFIChart;
 
 
 public class TimelineChartManager {
@@ -44,9 +33,6 @@ public class TimelineChartManager {
                TimelineChart timelineChart = null;
 
                switch (chartType) {
-               case TimelineConstants.CHART_TYPE_RESOURCE_USAGE:
-                       timelineChart = new ResourceUsageChart();
-                       break;
                case TimelineConstants.CHART_TYPE_FILE:
                        timelineChart = new FileChart();
                        break;
@@ -62,39 +48,9 @@ public class TimelineChartManager {
                case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
                        timelineChart = new CPUFrequencyChart();
                        break;
-               case TimelineConstants.CHART_TYPE_WIFI:
-                       timelineChart = new WIFIChart();
-                       break;
-               case TimelineConstants.CHART_TYPE_BT:
-                       timelineChart = new BTChart();
-                       break;
-               case TimelineConstants.CHART_TYPE_GPS:
-                       timelineChart = new GPSChart();
-                       break;
-               case TimelineConstants.CHART_TYPE_BRIGHTNESS:
-                       timelineChart = new BrightnessChart();
-                       break;
-               case TimelineConstants.CHART_TYPE_CAMERA:
-                       timelineChart = new CameraChart();
-                       break;
-               case TimelineConstants.CHART_TYPE_SOUND:
-                       timelineChart = new SoundChart();
-                       break;
-               case TimelineConstants.CHART_TYPE_AUDIO:
-                       timelineChart = new AudioChart();
-                       break;
-               case TimelineConstants.CHART_TYPE_VIBRATION:
-                       timelineChart = new VibrationChart();
-                       break;
                case TimelineConstants.CHART_TYPE_PROCESS_SIZE:
                        timelineChart = new ProcessMemoryChart();
                        break;
-               case TimelineConstants.CHART_TYPE_VOLTAGE:
-                       timelineChart = new VoltageChart();
-                       break;
-               case TimelineConstants.CHART_TYPE_UI_EVENTS:
-                       timelineChart = new UIEventsChart();
-                       break;
                case TimelineConstants.CHART_TYPE_SNAPSHOT:
                        timelineChart = new SnapShotChart();
                        break;
index 0c06dbd..aa56a39 100644 (file)
@@ -9,17 +9,6 @@ import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
 import org.tizen.dynamicanalyzer.model.Logs;
 import org.tizen.dynamicanalyzer.timeline.TimelineItemsProvider;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.AudioChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.BTChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.BrightnessChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.CameraChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.GPSChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.ResourceUsageChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.SoundChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.UIEventsChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.VibrationChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.VoltageChart;
-import org.tizen.dynamicanalyzer.timeline.chart.deprecated.WIFIChart;
 import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 
 public class ChartDataSetCenter {
@@ -43,45 +32,12 @@ public class ChartDataSetCenter {
                case TimelineConstants.CHART_TYPE_HEAP:
                        chartDataSet.setSeriesDataSetList(HeapChart.newSeriesDataSetList());
                        break;
-               case TimelineConstants.CHART_TYPE_AUDIO:
-                       chartDataSet.setSeriesDataSetList(AudioChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_BRIGHTNESS:
-                       chartDataSet.setSeriesDataSetList(BrightnessChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_BT:
-                       chartDataSet.setSeriesDataSetList(BTChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_CAMERA:
-                       chartDataSet.setSeriesDataSetList(CameraChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_RESOURCE_USAGE:
-                       chartDataSet.setSeriesDataSetList(ResourceUsageChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_GPS:
-                       chartDataSet.setSeriesDataSetList(GPSChart.newSeriesDataSetList());
-                       break;
                case TimelineConstants.CHART_TYPE_PROCESS_SIZE:
                        chartDataSet.setSeriesDataSetList(ProcessMemoryChart.newSeriesDataSetList());
                        break;
                case TimelineConstants.CHART_TYPE_FILE:
                        chartDataSet.setSeriesDataSetList(FileChart.newSeriesDataSetList());
                        break;
-               case TimelineConstants.CHART_TYPE_SOUND:
-                       chartDataSet.setSeriesDataSetList(SoundChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_VIBRATION:
-                       chartDataSet.setSeriesDataSetList(VibrationChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_VOLTAGE:
-                       chartDataSet.setSeriesDataSetList(VoltageChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_WIFI:
-                       chartDataSet.setSeriesDataSetList(WIFIChart.newSeriesDataSetList());
-                       break;
-               case TimelineConstants.CHART_TYPE_UI_EVENTS:
-                       chartDataSet.setSeriesDataSetList(UIEventsChart.newSeriesDataSetList());
-                       break;
                case TimelineConstants.CHART_TYPE_SNAPSHOT:
                        chartDataSet.setSeriesDataSetList(SnapShotChart.newSeriesDataSetList());
                        break;
@@ -134,42 +90,12 @@ public class ChartDataSetCenter {
                        case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
                                CPUCoreChart.parsingLogList(logs);
                                break;
-                       case TimelineConstants.CHART_TYPE_AUDIO:
-                               AudioChart.parsingLogList(logs);
-                               break;
-                       case TimelineConstants.CHART_TYPE_BRIGHTNESS:
-                               BrightnessChart.parsingLogList(logs);
-                               break;
-                       case TimelineConstants.CHART_TYPE_BT:
-                               BTChart.parsingLogList(logs);
-                               break;
-                       case TimelineConstants.CHART_TYPE_CAMERA:
-                               CameraChart.parsingLogList(logs);
-                               break;
-                       case TimelineConstants.CHART_TYPE_RESOURCE_USAGE:
-                               ResourceUsageChart.parsingLogList(logs);
-                               break;
-                       case TimelineConstants.CHART_TYPE_GPS:
-                               GPSChart.parsingLogList(logs);
-                               break;
                        case TimelineConstants.CHART_TYPE_PROCESS_SIZE:
                                ProcessMemoryChart.parsingLogList(logs);
                                break;
                        case TimelineConstants.CHART_TYPE_FILE:
                                FileChart.parsingLogList(logs);
                                break;
-                       case TimelineConstants.CHART_TYPE_SOUND:
-                               SoundChart.parsingLogList(logs);
-                               break;
-                       case TimelineConstants.CHART_TYPE_VIBRATION:
-                               VibrationChart.parsingLogList(logs);
-                               break;
-                       case TimelineConstants.CHART_TYPE_WIFI:
-                               WIFIChart.parsingLogList(logs);
-                               break;
-                       case TimelineConstants.CHART_TYPE_UI_EVENTS:
-                               UIEventsChart.parsingLogList(logs);
-                               break;
                        case TimelineConstants.CHART_TYPE_SNAPSHOT:
                                SnapShotChart.parsingLogList(logs);
                                break;
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/AllocFreeChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/AllocFreeChart.java
deleted file mode 100644 (file)
index 878067b..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.StandardXYBarPainter;
-import org.jfree.chart.renderer.xy.XYBarRenderer;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class AllocFreeChart extends TimelineChart {
-
-       class AllocSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       AllocSeriesInfo allocInfo;
-       AllocSeriesInfo freeInfo;
-
-       public AllocFreeChart() {
-
-               allocInfo = new AllocSeriesInfo();
-               allocInfo.baseSeries = new TimeSeries("Alloc");
-               allocInfo.newSeries = new TimeSeries("Alloc");
-
-               freeInfo = new AllocSeriesInfo();
-               freeInfo.baseSeries = new TimeSeries("Free");
-               freeInfo.newSeries = new TimeSeries("Free");
-       }
-
-       @Override
-       public JFreeChart createChart() {
-               /* Data */
-
-               TimeSeriesCollection dataset = createRWDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createXYBarChart("Alloc/Free chart", "Time", true,
-                               "Size", dataset, PlotOrientation.VERTICAL, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               setChartStyle();
-
-               XYPlot xyplot = (XYPlot) chart.getPlot();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-               if (null == allocInfo.newSeries || null == freeInfo.newSeries) {
-                       return;
-               }
-
-               // final long finalTime = updateTime;
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-
-                               allocInfo.baseSeries.addAndOrUpdate(allocInfo.newSeries);
-                               freeInfo.baseSeries.addAndOrUpdate(freeInfo.newSeries);
-
-                               allocInfo.newSeries.clear();
-                               freeInfo.newSeries.clear();
-
-                               // if (TimelineConstants.CHART_RANGE_DEFAULT < finalTime) {
-                               // setTimeDomainScopeEnd(finalTime);
-                               // }
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-
-               /* new Series clear */
-               if (null != allocInfo && null != allocInfo.newSeries) {
-                       if (null != allocInfo.newSeries) {
-                               allocInfo.newSeries.clear();
-                       }
-               }
-               if (null != freeInfo && null != freeInfo.newSeries) {
-                       if (null != freeInfo.newSeries) {
-                               freeInfo.newSeries.clear();
-                       }
-               }
-
-               /* base Series clear */
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-
-                               if (null != allocInfo && null != allocInfo.baseSeries) {
-                                       if (null != allocInfo.baseSeries) {
-                                               allocInfo.baseSeries.clear();
-                                       }
-                               }
-                               if (null != freeInfo && null != freeInfo.baseSeries) {
-                                       if (null != freeInfo.baseSeries) {
-                                               freeInfo.baseSeries.clear();
-                                       }
-                               }
-                       }
-               });
-
-               setTimeDomainScopeStart(0);
-
-       }
-
-       private TimeSeriesCollection createRWDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               allocInfo.baseSeries);
-               timeDataSet.addSeries(freeInfo.baseSeries);
-
-               return timeDataSet;
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == xyplot) {
-                       return;
-               }
-
-               XYBarRenderer barRenderer = (XYBarRenderer) xyplot.getRenderer();
-
-               barRenderer.setBarPainter(new StandardXYBarPainter());
-
-               barRenderer.setShadowVisible(false);
-               barRenderer.setDrawBarOutline(false);
-
-               barRenderer.setSeriesPaint(0, Color.PINK);
-               barRenderer.setSeriesPaint(1, Color.ORANGE);
-
-               // Tooltip
-
-               xyplot.setRenderer(barRenderer);
-
-       }
-
-       protected long parsingElement(List<String> log) {
-
-               long updatedTime = 0;
-
-               if (null == log || 0 > log.size()) {
-                       return updatedTime;
-               }
-
-               /* API check */
-               int memApiType = 0;
-
-               try {
-                       memApiType = Integer.parseInt(log
-                                       .get(LogCenterConstants.MEMORY_APITYPE_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               }
-
-               if (!(TimelineConstants.MEM_API_TYPE_ALLOC == memApiType
-                               || TimelineConstants.MEM_API_TYPE_FREE == memApiType || TimelineConstants.MEM_API_TYPE_MANAGE == memApiType)) {
-                       return updatedTime;
-               }
-
-               long time = 0;
-               try {
-                       time = Long.parseLong(log.get(LogCenterConstants.TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addNewSeriesData(memApiType, time, log);
-
-               updatedTime = time;
-
-               return updatedTime;
-       }
-
-       private void addNewSeriesData(int fdApiType, long time, List<String> log) {
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-
-               long size = 0;
-               long addr = 0;
-
-               if (TimelineConstants.MEM_API_TYPE_ALLOC == fdApiType) {
-
-                       if (log.get(LogCenterConstants.MEMORY_SIZE_INDEX).isEmpty()) {
-                               return;
-                       }
-
-                       try {
-                               size = Long.parseLong(log
-                                               .get(LogCenterConstants.MEMORY_SIZE_INDEX));// TimelineConstants.MEM_COL_SIZE
-                               addr = Long.parseLong(log
-                                               .get(LogCenterConstants.MEMORY_ADDR_INDEX));// TimelineConstants.MEM_COL_ADDR
-                       } catch (NumberFormatException ne) {
-                               ne.printStackTrace();
-                       }
-
-                       allocInfo.newSeries.addOrUpdate(fmSec, size);
-
-               } else if (TimelineConstants.MEM_API_TYPE_FREE == fdApiType) {
-
-                       if (log.get(LogCenterConstants.MEMORY_SIZE_INDEX).isEmpty()) {
-                               return;
-                       }
-
-                       try {
-                               size =  Long.parseLong(log
-                                               .get(LogCenterConstants.MEMORY_SIZE_INDEX));// TimelineConstants.MEM_COL_SIZE
-                               addr = Long.parseLong(log
-                                               .get(LogCenterConstants.MEMORY_ADDR_INDEX));// TimelineConstants.MEM_COL_ADDR
-                       } catch (NumberFormatException ne) {
-                               ne.printStackTrace();
-                       }
-
-                       if (0 == addr) { /* Free Failed */
-                               return;
-                       }
-
-                       freeInfo.newSeries.addOrUpdate(fmSec, size);
-
-               } else {
-                       return;
-               }
-       }
-
-       @Override
-       public void dispose() {
-
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-       }
-
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/AudioChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/AudioChart.java
deleted file mode 100644 (file)
index 726c6bd..0000000
+++ /dev/null
@@ -1,313 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.DeviceConstants;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class AudioChart extends TimelineChart {
-
-       class AudioSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private AudioSeriesInfo headphoneInfo;
-       private AudioSeriesInfo speakerInfo;
-
-       public AudioChart() {
-               headphoneInfo = new AudioSeriesInfo();
-               headphoneInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_AUDIO_STATUS_HEADPHONE);
-               headphoneInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_AUDIO_STATUS_HEADPHONE);
-               // set Default Value
-               headphoneInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-                               0);
-
-               speakerInfo = new AudioSeriesInfo();
-               speakerInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_AUDIO_STATUS_SPEAKER);
-               speakerInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_AUDIO_STATUS_SPEAKER);
-               // set Default Value
-               speakerInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createAudioDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createTimeSeriesChart("Audio chart", "Time", "%",
-                               dataSet, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-
-               if (null == speakerInfo.newSeries && null == headphoneInfo.newSeries) {
-                       return;
-               }
-
-               // final long finalTime = updateTime;
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-
-                               if (null != speakerInfo.newSeries) {
-                                       speakerInfo.baseSeries
-                                                       .addAndOrUpdate(speakerInfo.newSeries);
-                                       speakerInfo.newSeries.clear();
-                               }
-
-                               if (null != headphoneInfo.newSeries) {
-                                       headphoneInfo.baseSeries
-                                                       .addAndOrUpdate(headphoneInfo.newSeries);
-                                       headphoneInfo.newSeries.clear();
-                               }
-
-                               // if (TimelineConstants.CHART_RANGE_DEFAULT < finalTime) {
-                               // setTimeDomainScopeEnd(finalTime);
-                               // }
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-
-               if (null == chart) {
-                       return;
-               }
-
-               if (null != speakerInfo.newSeries) {
-                       speakerInfo.newSeries.clear();
-
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       speakerInfo.baseSeries.clear();
-                               }
-                       });
-               }
-
-               if (null != headphoneInfo.newSeries) {
-                       headphoneInfo.newSeries.clear();
-
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       headphoneInfo.baseSeries.clear();
-                               }
-                       });
-               }
-
-               setTimeDomainScopeStart(0);
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer(2);
-
-               renderer.setDefaultEntityRadius(6);
-
-               renderer.setSeriesPaint(0, Color.RED);
-               renderer.setSeriesPaint(1, Color.GREEN.darker());
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               xyplot.getRangeAxis().setRange(new Range(0, 1), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               renderer.setShapesVisible(false);
-
-               xyplot.getRangeAxis().setTickLabelsVisible(false);
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createAudioDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               speakerInfo.baseSeries);
-               timeDataSet.addSeries(headphoneInfo.baseSeries);
-
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesAudioData(long time, int status) {
-
-               double setValue = 1;
-               double clearValue = 0;
-
-               SeriesDataSet sDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_AUDIO,
-                               DeviceConstants.DEVICE_AUDIO_STATUS_SPEAKER);
-
-               SeriesDataSet hDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_AUDIO,
-                               DeviceConstants.DEVICE_AUDIO_STATUS_HEADPHONE);
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-
-               switch (status) {
-               case DeviceConstants.DEVICE_AUDIO_VALUE_SPEAKER:
-                       sDataSet.getNewSeries().addOrUpdate(fmSec, setValue);
-                       hDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_AUDIO_VALUE_HEADPHONE:
-                       sDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       hDataSet.getNewSeries().addOrUpdate(fmSec, setValue);
-                       break;
-
-               default:
-                       break;
-               }
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_AUDIO,
-                               DeviceConstants.DEVICE_AUDIO_STATUS_SPEAKER, sDataSet);
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_AUDIO,
-                               DeviceConstants.DEVICE_AUDIO_STATUS_HEADPHONE, sDataSet);
-
-               return;
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String seriesName1 = DeviceConstants.DEVICE_AUDIO_STATUS_SPEAKER;
-
-               SeriesDataSet sDataSet1 = new SeriesDataSet();
-               sDataSet1.setSeriesName(seriesName1);
-               sDataSet1.setBaseSeries(new TimeSeries(seriesName1));
-               sDataSet1.setNewSeries(new TimeSeries(seriesName1));
-
-               seriesDataSetList.add(sDataSet1);
-
-               String seriesName2 = DeviceConstants.DEVICE_AUDIO_STATUS_HEADPHONE;
-
-               SeriesDataSet sDataSet2 = new SeriesDataSet();
-               sDataSet2.setSeriesName(seriesName2);
-               sDataSet2.setBaseSeries(new TimeSeries(seriesName2));
-               sDataSet2.setNewSeries(new TimeSeries(seriesName2));
-
-               seriesDataSetList.add(sDataSet2);
-
-               return seriesDataSetList;
-       }
-
-       public static List<SeriesDataSet> parsingLogList(List<List<String>> logList) {
-
-               if (null == logList || 0 == logList.size()) {
-                       return null;
-               }
-
-               List<SeriesDataSet> sDataSetList = new ArrayList<SeriesDataSet>();
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i), sDataSetList);
-               }
-
-               return sDataSetList;
-       }
-
-       private static void parsingLog(List<String> log,
-                       List<SeriesDataSet> sDataSetList) {
-
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               int statusValue = 0;
-
-               if (log.get(LogCenterConstants.DEVICE_AUDIO_INDEX).isEmpty()) {
-                       return;
-               }
-
-               try {
-                       time = Long
-                                       .parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       statusValue = Integer.parseInt(log
-                                       .get(LogCenterConstants.DEVICE_AUDIO_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addNewSeriesAudioData(time, statusValue);
-
-               return;
-
-               // TODO Auto-generated method stub
-
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/BTChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/BTChart.java
deleted file mode 100644 (file)
index 053e652..0000000
+++ /dev/null
@@ -1,414 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.DeviceConstants;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-public class BTChart extends TimelineChart {
-
-       class BTSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private BTSeriesInfo onInfo;
-       private BTSeriesInfo visibleInfo;
-       private BTSeriesInfo transferInfo;
-
-       public BTChart() {
-               onInfo = new BTSeriesInfo();
-               onInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_BT_STATUS_ENABLED);
-               onInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_BT_STATUS_ENABLED);
-               // set Default Value
-               onInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-
-               visibleInfo = new BTSeriesInfo();
-               visibleInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_BT_STATUS_CONNECTED);
-               visibleInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_BT_STATUS_CONNECTED);
-               // set Default Value
-               visibleInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-
-               transferInfo = new BTSeriesInfo();
-               transferInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_BT_STATUS_TRANSFER);
-               transferInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_BT_STATUS_TRANSFER);
-               // set Default Value
-               transferInfo.newSeries
-                               .addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createBTDataset();
-
-               /* Create */
-               chart = ChartFactory.createTimeSeriesChart("Bluetooth chart", "Time",
-                               "%", dataSet, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-
-               /* First or Its added new */
-               if (null == onInfo.baseSeries) {
-                       return;
-               } else if (onInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_BT,
-                                       DeviceConstants.DEVICE_BT_STATUS_ENABLED);
-                       if (null != baseSeries) {
-                               onInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               if (null == visibleInfo.baseSeries) {
-                       return;
-               } else if (visibleInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_BT,
-                                       DeviceConstants.DEVICE_BT_STATUS_CONNECTED);
-                       if (null != baseSeries) {
-                               visibleInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               if (null == transferInfo.baseSeries) {
-                       return;
-               } else if (transferInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_BT,
-                                       DeviceConstants.DEVICE_BT_STATUS_CONNECTED);
-                       if (null != baseSeries) {
-                               transferInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               TimeSeries newOnSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_ENABLED);
-               if (null != newOnSeries) {
-                       onInfo.newSeries.addAndOrUpdate(newOnSeries);
-                       ChartDataSetCenter.clearNewSeries(TimelineConstants.CHART_TYPE_BT,
-                                       DeviceConstants.DEVICE_BT_STATUS_ENABLED);
-               }
-
-               TimeSeries newVisSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_CONNECTED);
-               if (null != newVisSeries) {
-                       visibleInfo.newSeries.addAndOrUpdate(newVisSeries);
-                       ChartDataSetCenter.clearNewSeries(TimelineConstants.CHART_TYPE_BT,
-                                       DeviceConstants.DEVICE_BT_STATUS_CONNECTED);
-               }
-
-               TimeSeries newTrSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_TRANSFER);
-               if (null != newOnSeries) {
-                       transferInfo.newSeries.addAndOrUpdate(newTrSeries);
-                       ChartDataSetCenter.clearNewSeries(TimelineConstants.CHART_TYPE_BT,
-                                       DeviceConstants.DEVICE_BT_STATUS_TRANSFER);
-               }
-
-               if (null == onInfo.newSeries && null == visibleInfo.newSeries
-                               && null == transferInfo.newSeries) {
-                       return;
-               }
-
-               // final long finalTime = updateTime;
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-
-                               if (null != onInfo.newSeries) {
-                                       onInfo.baseSeries.addAndOrUpdate(onInfo.newSeries);
-                                       onInfo.newSeries.clear();
-                               }
-
-                               if (null != visibleInfo.newSeries) {
-                                       visibleInfo.baseSeries
-                                                       .addAndOrUpdate(visibleInfo.newSeries);
-                                       visibleInfo.newSeries.clear();
-                               }
-
-                               if (null != transferInfo.newSeries) {
-                                       transferInfo.baseSeries
-                                                       .addAndOrUpdate(transferInfo.newSeries);
-                                       transferInfo.newSeries.clear();
-                               }
-
-                               // if (TimelineConstants.CHART_RANGE_DEFAULT < finalTime) {
-                               // setTimeDomainScopeEnd(finalTime);
-                               // }
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-
-               if (null == chart) {
-                       return;
-               }
-
-               if (null != onInfo.newSeries) {
-                       onInfo.newSeries.clear();
-
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       onInfo.baseSeries.clear();
-                               }
-                       });
-               }
-
-               if (null != visibleInfo.newSeries) {
-                       visibleInfo.newSeries.clear();
-
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       visibleInfo.baseSeries.clear();
-                               }
-                       });
-               }
-
-               if (null != transferInfo.newSeries) {
-                       transferInfo.newSeries.clear();
-
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       transferInfo.baseSeries.clear();
-                               }
-                       });
-               }
-               setTimeDomainScopeStart(0);
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer(2);
-
-               renderer.setDefaultEntityRadius(6);
-
-               renderer.setSeriesPaint(0, Color.LIGHT_GRAY);
-               renderer.setSeriesPaint(1, Color.GREEN.darker());
-               renderer.setSeriesPaint(2, Color.RED);
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               xyplot.getRangeAxis().setRange(new Range(0, 1), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               renderer.setShapesVisible(false);
-
-               xyplot.getRangeAxis().setTickLabelsVisible(false);
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createBTDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               onInfo.baseSeries);
-               timeDataSet.addSeries(visibleInfo.baseSeries);
-               timeDataSet.addSeries(transferInfo.baseSeries);
-
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesBTData(long time, int status) {
-               double setValue = 1;
-               double clearValue = 0;
-
-               SeriesDataSet onDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_ENABLED);
-
-               SeriesDataSet visDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_CONNECTED);
-
-               SeriesDataSet trDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_TRANSFER);
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-
-               switch (status) {
-               case DeviceConstants.DEVICE_BT_VALUE_DISABLED:
-                       onDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       visDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       trDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_BT_VALUE_ENABLED:
-                       onDataSet.getNewSeries().addOrUpdate(fmSec, setValue);
-                       visDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       trDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_BT_VALUE_CONNECTED:
-                       onDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       visDataSet.getNewSeries().addOrUpdate(fmSec, setValue);
-                       trDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_BT_VALUE_TRANSFER:
-                       onDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       visDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       trDataSet.getNewSeries().addOrUpdate(fmSec, setValue);
-                       break;
-               default:
-                       break;
-               }
-
-               ChartDataSetCenter.setNewSeriesDataSet(TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_ENABLED, onDataSet);
-
-               ChartDataSetCenter.setNewSeriesDataSet(TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_CONNECTED, visDataSet);
-
-               ChartDataSetCenter.setNewSeriesDataSet(TimelineConstants.CHART_TYPE_BT,
-                               DeviceConstants.DEVICE_BT_STATUS_TRANSFER, trDataSet);
-
-               return;
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String seriesName1 = DeviceConstants.DEVICE_BT_STATUS_ENABLED;
-
-               SeriesDataSet dataSet1 = new SeriesDataSet();
-               dataSet1.setSeriesName(seriesName1);
-               dataSet1.setBaseSeries(new TimeSeries(seriesName1));
-               dataSet1.setNewSeries(new TimeSeries(seriesName1));
-
-               seriesDataSetList.add(dataSet1);
-
-               String seriesName2 = DeviceConstants.DEVICE_BT_STATUS_CONNECTED;
-
-               SeriesDataSet dataSet2 = new SeriesDataSet();
-               dataSet2.setSeriesName(seriesName2);
-               dataSet2.setBaseSeries(new TimeSeries(seriesName2));
-               dataSet2.setNewSeries(new TimeSeries(seriesName2));
-
-               seriesDataSetList.add(dataSet2);
-
-               String seriesName3 = DeviceConstants.DEVICE_BT_STATUS_TRANSFER;
-
-               SeriesDataSet dataSet3 = new SeriesDataSet();
-               dataSet3.setSeriesName(seriesName3);
-               dataSet3.setBaseSeries(new TimeSeries(seriesName3));
-               dataSet3.setNewSeries(new TimeSeries(seriesName3));
-
-               seriesDataSetList.add(dataSet3);
-
-               return seriesDataSetList;
-       }
-
-       public static void parsingLogList(List<List<String>> logList) {
-
-               if (null == logList || 0 == logList.size()) {
-                       return;
-               }
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-
-       }
-
-       private static void parsingLog(List<String> log) {
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               int statusValue = 0;
-
-               if (log.get(LogCenterConstants.DEVICE_BLUETOOTH_INDEX).isEmpty()) {
-                       return;
-               }
-
-               try {
-                       time = Long
-                                       .parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       statusValue = Integer.parseInt(log
-                                       .get(LogCenterConstants.DEVICE_BLUETOOTH_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addNewSeriesBTData(time, statusValue);
-
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/BrightnessChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/BrightnessChart.java
deleted file mode 100644 (file)
index 2c1ef29..0000000
+++ /dev/null
@@ -1,284 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.DeviceConstants;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class BrightnessChart extends TimelineChart {
-
-       class BrightnessSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private BrightnessSeriesInfo BrightnessInfo;
-
-       // private final int DEFAULT_RANGE_VALUE = 100;
-
-       public BrightnessChart() {
-               BrightnessInfo = new BrightnessSeriesInfo();
-               BrightnessInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_INFO_NAME_BRIGHTNESS);
-               BrightnessInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_INFO_NAME_BRIGHTNESS);
-
-               // set Default Value
-               BrightnessInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-                               0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createBrightnessDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createTimeSeriesChart("Brightness chart", "Time",
-                               "Level", dataSet, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-
-               /* First or Its added new */
-               if (null == BrightnessInfo.baseSeries) {
-                       return;
-               } else if (BrightnessInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_BRIGHTNESS,
-                                       DeviceConstants.DEVICE_INFO_NAME_BRIGHTNESS);
-                       if (null != baseSeries) {
-                               BrightnessInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               TimeSeries newSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_BRIGHTNESS,
-                               DeviceConstants.DEVICE_INFO_NAME_BRIGHTNESS);
-
-               if (null == newSeries) {
-                       return;
-               }
-
-               if (null == BrightnessInfo.newSeries) {
-                       return;
-               }
-
-               BrightnessInfo.newSeries.addAndOrUpdate(newSeries);
-               ChartDataSetCenter.clearNewSeries(
-                               TimelineConstants.CHART_TYPE_BRIGHTNESS,
-                               DeviceConstants.DEVICE_INFO_NAME_BRIGHTNESS);
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               BrightnessInfo.baseSeries
-                                               .addAndOrUpdate(BrightnessInfo.newSeries);
-
-                               BrightnessInfo.newSeries.clear();
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-               if (null == chart) {
-                       return;
-               }
-
-               BrightnessInfo.newSeries.clear();
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               BrightnessInfo.baseSeries.clear();
-                       }
-               });
-
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer();
-
-               renderer.setDefaultEntityRadius(5);
-
-               renderer.setSeriesPaint(0, Color.GREEN.darker());
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               // xyplot.getRangeAxis().setRange(new Range(0, DEFAULT_RANGE_VALUE),
-               // true,
-               // true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createBrightnessDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               BrightnessInfo.baseSeries);
-
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesBrightnessData(long time, double value) {
-
-               SeriesDataSet bDataSet = ChartDataSetCenter
-                               .getSeriesDataSet(
-                                               TimelineConstants.CHART_TYPE_BRIGHTNESS,
-                                               TimelineUtils
-                                                               .getStringChartType(TimelineConstants.CHART_TYPE_BRIGHTNESS));
-
-               if (null == bDataSet) {
-                       return;
-               }
-
-               if (null == bDataSet.getNewSeries()) {
-                       return;
-               }
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-               bDataSet.getNewSeries().addOrUpdate(fmSec, value);
-
-               ChartDataSetCenter
-                               .setNewSeriesDataSet(
-                                               TimelineConstants.CHART_TYPE_BRIGHTNESS,
-                                               TimelineUtils
-                                                               .getStringChartType(TimelineConstants.CHART_TYPE_BRIGHTNESS),
-                                               bDataSet);
-               return;
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String chartName = TimelineUtils
-                               .getStringChartType(TimelineConstants.CHART_TYPE_BRIGHTNESS);
-
-               String seriesName = chartName;
-
-               SeriesDataSet dataSet = new SeriesDataSet();
-               dataSet.setSeriesName(seriesName);
-               dataSet.setBaseSeries(new TimeSeries(seriesName));
-               dataSet.setNewSeries(new TimeSeries(seriesName));
-
-               seriesDataSetList.add(dataSet);
-
-               return seriesDataSetList;
-       }
-
-       public static List<SeriesDataSet> parsingLogList(List<List<String>> logList) {
-               if (null == logList || 0 == logList.size()) {
-                       return null;
-               }
-
-               String chartName = TimelineUtils
-                               .getStringChartType(TimelineConstants.CHART_TYPE_BRIGHTNESS);
-               String seriesName = chartName;
-
-               List<SeriesDataSet> sDataSetList = new ArrayList<SeriesDataSet>();
-
-               SeriesDataSet sDataSet = new SeriesDataSet();
-               sDataSet.setSeriesName(seriesName);
-               sDataSet.setNewSeries(new TimeSeries(seriesName));
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-
-               sDataSetList.add(sDataSet);
-
-               return sDataSetList;
-       }
-
-       private static void parsingLog(List<String> log) {
-
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               double onOff = 0;
-
-               if (log.get(LogCenterConstants.DEVICE_BRIGHTNESS_INDEX).isEmpty()) {
-                       return;
-               }
-
-               try {
-                       time = Long
-                                       .parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       onOff = Integer.parseInt(log
-                                       .get(LogCenterConstants.DEVICE_BRIGHTNESS_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addNewSeriesBrightnessData(time, onOff);
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/CameraChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/CameraChart.java
deleted file mode 100644 (file)
index 41cfe95..0000000
+++ /dev/null
@@ -1,443 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.DeviceConstants;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-public class CameraChart extends TimelineChart {
-
-       class CamSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private CamSeriesInfo onInfo;
-
-       // private CamSeriesInfo previewInfo;
-       // private CamSeriesInfo captureingInfo;
-       // private CamSeriesInfo recordingInfo;
-       // private CamSeriesInfo reviewInfo;
-
-       public CameraChart() {
-               onInfo = new CamSeriesInfo();
-               onInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_CAMERA_STATUS_ON);
-               onInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_CAMERA_STATUS_ON);
-               // set Default Value
-               onInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-
-               // previewInfo = new CamSeriesInfo();
-               // previewInfo.baseSeries = new TimeSeries(
-               // BatteryConstants.DEVICE_CAMERA_STATUS_PREVIEW);
-               // previewInfo.newSeries = new TimeSeries(
-               // BatteryConstants.DEVICE_CAMERA_STATUS_PREVIEW);
-               // // set Default Value
-               // previewInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-               // 0);
-               //
-               // captureingInfo = new CamSeriesInfo();
-               // captureingInfo.baseSeries = new TimeSeries(
-               // BatteryConstants.DEVICE_CAMERA_STATUS_CAPTURING);
-               // captureingInfo.newSeries = new TimeSeries(
-               // BatteryConstants.DEVICE_CAMERA_STATUS_CAPTURING);
-               // // set Default Value
-               // captureingInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-               // 0);
-               //
-               // recordingInfo = new CamSeriesInfo();
-               // recordingInfo.baseSeries = new TimeSeries(
-               // BatteryConstants.DEVICE_CAMERA_STATUS_RECORDING);
-               // recordingInfo.newSeries = new TimeSeries(
-               // BatteryConstants.DEVICE_CAMERA_STATUS_RECORDING_LOCK);
-               // // set Default Value
-               // recordingInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-               // 0);
-               //
-               // reviewInfo = new CamSeriesInfo();
-               // reviewInfo.baseSeries = new TimeSeries(
-               // BatteryConstants.DEVICE_CAMERA_STATUS_REVIEW);
-               // reviewInfo.newSeries = new TimeSeries(
-               // BatteryConstants.DEVICE_CAMERA_STATUS_REVIEW);
-               // // set Default Value
-               // reviewInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-               // 0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createCameraDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createTimeSeriesChart("CAMERA chart", "Time", "%",
-                               dataSet, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-
-               /* First or Its added new */
-               if (null == onInfo.baseSeries) {
-                       return;
-               } else if (onInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_CAMERA, "On");
-                       if (null != baseSeries) {
-                               onInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               TimeSeries newSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_CAMERA, "On");
-
-               if (null == newSeries) {
-                       return;
-               }
-
-               if (null == onInfo.newSeries) {
-                       return;
-               }
-
-               // if (null == onInfo.newSeries && null == previewInfo.newSeries
-               // && null == captureingInfo.newSeries
-               // && null == recordingInfo.newSeries
-               // && null == reviewInfo.newSeries) {
-               // return;
-               // }
-
-               onInfo.newSeries.addAndOrUpdate(newSeries);
-               ChartDataSetCenter.clearNewSeries(TimelineConstants.CHART_TYPE_CAMERA,
-                               "On");
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-
-                               if (null != onInfo.newSeries) {
-                                       onInfo.baseSeries.addAndOrUpdate(onInfo.newSeries);
-                                       onInfo.newSeries.clear();
-                               }
-
-                               // if (null != previewInfo.newSeries) {
-                               // previewInfo.baseSeries
-                               // .addAndOrUpdate(previewInfo.newSeries);
-                               // previewInfo.newSeries.clear();
-                               // }
-                               //
-                               // if (null != captureingInfo.newSeries) {
-                               // captureingInfo.baseSeries
-                               // .addAndOrUpdate(captureingInfo.newSeries);
-                               // captureingInfo.newSeries.clear();
-                               // }
-                               //
-                               // if (null != recordingInfo.newSeries) {
-                               // recordingInfo.baseSeries
-                               // .addAndOrUpdate(recordingInfo.newSeries);
-                               // recordingInfo.newSeries.clear();
-                               // }
-                               //
-                               // if (null != reviewInfo.newSeries) {
-                               // reviewInfo.baseSeries.addAndOrUpdate(reviewInfo.newSeries);
-                               // reviewInfo.newSeries.clear();
-                               // }
-
-                               // if (TimelineConstants.CHART_RANGE_DEFAULT < finalTime) {
-                               // setTimeDomainScopeEnd(finalTime);
-                               // }
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-
-               if (null == chart) {
-                       return;
-               }
-
-               if (null != onInfo.newSeries) {
-                       onInfo.newSeries.clear();
-
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       onInfo.baseSeries.clear();
-                               }
-                       });
-               }
-
-               // if (null != previewInfo.newSeries) {
-               // previewInfo.newSeries.clear();
-               //
-               // Display.getDefault().asyncExec(new Runnable() {
-               // @Override
-               // public void run() {
-               // previewInfo.baseSeries.clear();
-               // }
-               // });
-               // }
-               //
-               // if (null != recordingInfo.newSeries) {
-               // recordingInfo.newSeries.clear();
-               //
-               // Display.getDefault().asyncExec(new Runnable() {
-               // @Override
-               // public void run() {
-               // recordingInfo.baseSeries.clear();
-               // }
-               // });
-               // }
-               //
-               // if (null != reviewInfo.newSeries) {
-               // reviewInfo.newSeries.clear();
-               //
-               // Display.getDefault().asyncExec(new Runnable() {
-               // @Override
-               // public void run() {
-               // reviewInfo.baseSeries.clear();
-               // }
-               // });
-               // }
-               //
-               // if (null != captureingInfo.newSeries) {
-               // captureingInfo.newSeries.clear();
-               //
-               // Display.getDefault().asyncExec(new Runnable() {
-               // @Override
-               // public void run() {
-               // captureingInfo.baseSeries.clear();
-               // }
-               // });
-               // }
-               setTimeDomainScopeStart(0);
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer(2);
-
-               renderer.setDefaultEntityRadius(6);
-
-               renderer.setSeriesPaint(0, Color.LIGHT_GRAY);
-               renderer.setSeriesPaint(1, Color.GREEN.darker());
-               renderer.setSeriesPaint(2, Color.RED);
-               renderer.setSeriesPaint(4, Color.BLUE);
-               renderer.setSeriesPaint(3, Color.CYAN);
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               xyplot.getRangeAxis().setRange(new Range(0, 1), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               renderer.setShapesVisible(false);
-
-               xyplot.getRangeAxis().setTickLabelsVisible(false);
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createCameraDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               onInfo.baseSeries);
-               // timeDataSet.addSeries(previewInfo.baseSeries);
-               // timeDataSet.addSeries(captureingInfo.baseSeries);
-               // timeDataSet.addSeries(recordingInfo.baseSeries);
-               // timeDataSet.addSeries(reviewInfo.baseSeries);
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesCameraData(long time, int status) {
-
-               double setValue = 1;
-               double clearValue = 0;
-
-               SeriesDataSet onDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_CAMERA, "On");
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-
-               switch (status) {
-               case DeviceConstants.DEVICE_CAMERA_VALUE_OFF:
-                       onDataSet.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       // previewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-                       // captureingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-                       // recordingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-                       // reviewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-                       break;
-               // case BatteryConstants.DEVICE_CAMERA_VALUE_ON:
-               // onInfo.newSeries.addOrUpdate(fmSec, setValue);
-               // previewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // captureingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // recordingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // reviewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // break;
-               // case BatteryConstants.DEVICE_CAMERA_VALUE_PREVIEW:
-               // case BatteryConstants.DEVICE_CAMERA_VALUE_PREVIEW_LOCK:
-               // onInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // previewInfo.newSeries.addOrUpdate(fmSec, setValue);
-               // captureingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // recordingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // reviewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // break;
-               // case BatteryConstants.DEVICE_CAMERA_VALUE_CAPTURING:
-               // onInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // previewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // captureingInfo.newSeries.addOrUpdate(fmSec, setValue);
-               // recordingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // reviewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // case BatteryConstants.DEVICE_CAMERA_VALUE_RECORDING:
-               // case BatteryConstants.DEVICE_CAMERA_VALUE_RECORDING_LOCK:
-               // onInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // previewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // captureingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // recordingInfo.newSeries.addOrUpdate(fmSec, setValue);
-               // reviewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // case BatteryConstants.DEVICE_CAMERA_VALUE_REVIEW:
-               // onInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // previewInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // captureingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // recordingInfo.newSeries.addOrUpdate(fmSec, clearValue);
-               // reviewInfo.newSeries.addOrUpdate(fmSec, setValue);
-               // break;
-               default:
-                       onDataSet.getNewSeries().addOrUpdate(fmSec, setValue);
-                       break;
-               }
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_CAMERA,
-                               DeviceConstants.DEVICE_CAMERA_STATUS_ON, onDataSet);
-
-               return;
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String seriesName = DeviceConstants.DEVICE_CAMERA_STATUS_ON;
-
-               SeriesDataSet dataSet = new SeriesDataSet();
-               dataSet.setSeriesName(seriesName);
-               dataSet.setBaseSeries(new TimeSeries(seriesName));
-               dataSet.setNewSeries(new TimeSeries(seriesName));
-
-               seriesDataSetList.add(dataSet);
-
-               return seriesDataSetList;
-       }
-
-       public static List<SeriesDataSet> parsingLogList(List<List<String>> logList) {
-
-               if (null == logList || 0 == logList.size()) {
-                       return null;
-               }
-
-               String chartName = TimelineUtils
-                               .getStringChartType(TimelineConstants.CHART_TYPE_CAMERA);
-               String seriesName = chartName;
-
-               List<SeriesDataSet> sDataSetList = new ArrayList<SeriesDataSet>();
-
-               SeriesDataSet sDataSet = new SeriesDataSet();
-               sDataSet.setSeriesName(seriesName);
-               sDataSet.setNewSeries(new TimeSeries(seriesName));
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-
-               sDataSetList.add(sDataSet);
-
-               return sDataSetList;
-       }
-
-       private static void parsingLog(List<String> log) {
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               int statusValue = 0;
-
-               if (log.get(LogCenterConstants.DEVICE_CAMERA_INDEX).isEmpty()) {
-                       return;
-               }
-
-               try {
-                       time = Long
-                                       .parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       statusValue = Integer.parseInt(log
-                                       .get(LogCenterConstants.DEVICE_CAMERA_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addNewSeriesCameraData(time, statusValue);
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/GPSChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/GPSChart.java
deleted file mode 100644 (file)
index 7d7b3f3..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.DeviceConstants;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class GPSChart extends TimelineChart {
-
-       class GPSSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private GPSSeriesInfo searchInfo;
-       private GPSSeriesInfo connectedInfo;
-
-       private int SERIES_NUM = 2;
-
-       public GPSChart() {
-
-               /* Searching */
-               searchInfo = new GPSSeriesInfo();
-               searchInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_GPS_STATUS_ENABLED);
-               searchInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_GPS_STATUS_ENABLED);
-
-               // set Default Value
-               searchInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-
-               /* Connected */
-               connectedInfo = new GPSSeriesInfo();
-               connectedInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_GPS_STATUS_CONNECTED);
-               connectedInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_GPS_STATUS_CONNECTED);
-
-               // set Default Value
-               connectedInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-                               0);
-
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createGPSDataset();
-
-               /* Create */
-               chart = ChartFactory.createTimeSeriesChart("GPS chart", "Time", "%",
-                               dataSet, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-
-               /* First or Its added new */
-               if (null == connectedInfo.baseSeries) {
-                       return;
-               } else if (connectedInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_GPS,
-                                       DeviceConstants.DEVICE_GPS_STATUS_CONNECTED);
-                       if (null != baseSeries) {
-                               connectedInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               if (null == searchInfo.baseSeries) {
-                       return;
-               } else if (searchInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_GPS,
-                                       DeviceConstants.DEVICE_GPS_STATUS_ENABLED);
-                       if (null != baseSeries) {
-                               searchInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               TimeSeries newOnSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_GPS,
-                               DeviceConstants.DEVICE_GPS_STATUS_CONNECTED);
-               if (null != newOnSeries) {
-                       connectedInfo.newSeries.addAndOrUpdate(newOnSeries);
-                       ChartDataSetCenter.clearNewSeries(TimelineConstants.CHART_TYPE_GPS,
-                                       DeviceConstants.DEVICE_GPS_STATUS_CONNECTED);
-               }
-
-               TimeSeries newVisSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_GPS,
-                               DeviceConstants.DEVICE_GPS_STATUS_ENABLED);
-               if (null != newVisSeries) {
-                       searchInfo.newSeries.addAndOrUpdate(newVisSeries);
-                       ChartDataSetCenter.clearNewSeries(TimelineConstants.CHART_TYPE_GPS,
-                                       DeviceConstants.DEVICE_GPS_STATUS_ENABLED);
-               }
-
-               // final long finalTime = updateTime;
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-
-                               if (null != connectedInfo.newSeries) {
-                                       connectedInfo.baseSeries
-                                                       .addAndOrUpdate(connectedInfo.newSeries);
-                                       connectedInfo.newSeries.clear();
-                               }
-
-                               if (null != searchInfo.newSeries) {
-                                       searchInfo.baseSeries.addAndOrUpdate(searchInfo.newSeries);
-                                       searchInfo.newSeries.clear();
-                               }
-
-                               // if (TimelineConstants.CHART_RANGE_DEFAULT < finalTime) {
-                               // setTimeDomainScopeEnd(finalTime);
-                               // }
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-               if (null == chart) {
-                       return;
-               }
-
-               if (null != searchInfo.newSeries) {
-                       searchInfo.newSeries.clear();
-
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       searchInfo.baseSeries.clear();
-                               }
-                       });
-               }
-
-               if (null != connectedInfo.newSeries) {
-                       connectedInfo.newSeries.clear();
-
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       connectedInfo.baseSeries.clear();
-                               }
-                       });
-               }
-               setTimeDomainScopeStart(0);
-       }
-
-       @Override
-       public void dispose() {
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer(SERIES_NUM);
-
-               renderer.setDefaultEntityRadius(5);
-
-               renderer.setSeriesPaint(0, Color.RED);
-               renderer.setSeriesPaint(1, Color.GREEN.darker());
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               xyplot.getRangeAxis().setRange(new Range(0, 1), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-               xyplot.getRangeAxis().setTickLabelsVisible(false);
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createGPSDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               searchInfo.baseSeries);
-               timeDataSet.addSeries(connectedInfo.baseSeries);
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesGPSData(long time, int status) {
-               double setValue = 1;
-               double clearValue = 0;
-
-               SeriesDataSet searchInfo = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_GPS,
-                               DeviceConstants.DEVICE_GPS_STATUS_ENABLED);
-
-               SeriesDataSet connectedInfo = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_GPS,
-                               DeviceConstants.DEVICE_GPS_STATUS_CONNECTED);
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-
-               switch (status) {
-               case DeviceConstants.DEVICE_GPS_VALUE_DISABLED:
-                       searchInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       connectedInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_GPS_VALUE_ENABLED:
-                       searchInfo.getNewSeries().addOrUpdate(fmSec, setValue);
-                       connectedInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_GPS_VALUE_CONNECTED:
-                       searchInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       connectedInfo.getNewSeries().addOrUpdate(fmSec, setValue);
-                       break;
-               default:
-                       break;
-               }
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_GPS,
-                               DeviceConstants.DEVICE_GPS_STATUS_ENABLED, searchInfo);
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_GPS,
-                               DeviceConstants.DEVICE_GPS_STATUS_CONNECTED, connectedInfo);
-
-               return;
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String seriesName1 = DeviceConstants.DEVICE_GPS_STATUS_ENABLED;
-
-               SeriesDataSet dataSet1 = new SeriesDataSet();
-               dataSet1.setSeriesName(seriesName1);
-               dataSet1.setBaseSeries(new TimeSeries(seriesName1));
-               dataSet1.setNewSeries(new TimeSeries(seriesName1));
-
-               seriesDataSetList.add(dataSet1);
-
-               String seriesName2 = DeviceConstants.DEVICE_GPS_STATUS_CONNECTED;
-
-               SeriesDataSet dataSet2 = new SeriesDataSet();
-               dataSet2.setSeriesName(seriesName2);
-               dataSet2.setBaseSeries(new TimeSeries(seriesName2));
-               dataSet2.setNewSeries(new TimeSeries(seriesName2));
-
-               seriesDataSetList.add(dataSet2);
-
-               return seriesDataSetList;
-       }
-
-       public static List<SeriesDataSet> parsingLogList(List<List<String>> logList) {
-
-               if (null == logList || 0 == logList.size()) {
-                       return null;
-               }
-
-               List<SeriesDataSet> sDataSetList = new ArrayList<SeriesDataSet>();
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-
-               return sDataSetList;
-       }
-
-       private static void parsingLog(List<String> log) {
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               int statusValue = 0;
-
-               if (log.get(LogCenterConstants.DEVICE_GPS_INDEX).isEmpty()) {
-                       return;
-               }
-
-               try {
-                       time = Long.parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX)) / TimelineConstants.TIME_US_TO_MS;
-                       statusValue = Integer.parseInt(log.get(LogCenterConstants.DEVICE_GPS_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addNewSeriesGPSData(time, statusValue);
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/MemoryUsageChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/MemoryUsageChart.java
deleted file mode 100644 (file)
index 1b6b330..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class MemoryUsageChart extends TimelineChart {
-
-       class MemorySeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       class AllocationSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-               long allocByte;
-       }
-
-       private MemorySeriesInfo memoryInfo;
-       private AllocationSeriesInfo allocationInfo;
-       private final int DEFAULT_RANGE_VALUE = 100;
-
-       public MemoryUsageChart() {
-               memoryInfo = new MemorySeriesInfo();
-               memoryInfo.baseSeries = new TimeSeries("Memory");
-               memoryInfo.newSeries = new TimeSeries("Memory");
-
-               allocationInfo = new AllocationSeriesInfo();
-               allocationInfo.baseSeries = new TimeSeries("Allocation");
-               allocationInfo.newSeries = new TimeSeries("Allocation");
-
-               memoryInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-               allocationInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-                               0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createMemoryUsageDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createXYAreaChart("Memory chart", "Time", "byte",
-                               dataSet, PlotOrientation.VERTICAL, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               // String chartname = TimelineUtils
-               // .getStringChartType(TimelineConstants.CHART_TYPE_MEMORYUSAGE);
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-               if (null == memoryInfo.newSeries && null == allocationInfo.newSeries) {
-                       return;
-               }
-
-               // final long finalTime = updateTime;
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               memoryInfo.baseSeries.addAndOrUpdate(memoryInfo.newSeries);
-                               allocationInfo.baseSeries
-                                               .addAndOrUpdate(allocationInfo.newSeries);
-
-                               allocationInfo.newSeries.clear();
-                               memoryInfo.newSeries.clear();
-                       }
-               });
-       }
-
-       @Override
-       public void clear() {
-               if (null == chart) {
-                       return;
-               }
-
-               /* new Series clear */
-               if (null != allocationInfo && null != allocationInfo.newSeries) {
-                       if (null != allocationInfo.newSeries) {
-                               allocationInfo.newSeries.clear();
-                       }
-               }
-
-               if (null != memoryInfo && null != memoryInfo.newSeries) {
-                       if (null != memoryInfo.newSeries) {
-                               memoryInfo.newSeries.clear();
-                       }
-               }
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-
-                               if (null != memoryInfo && null != memoryInfo.baseSeries) {
-                                       if (null != memoryInfo.baseSeries) {
-                                               memoryInfo.baseSeries.clear();
-                                       }
-                               }
-
-                               if (null != allocationInfo && null != allocationInfo.baseSeries) {
-                                       if (null != allocationInfo.baseSeries) {
-                                               allocationInfo.baseSeries.clear();
-                                       }
-                               }
-                       }
-               });
-
-               setTimeDomainScopeStart(0);
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-       }
-
-       private TimeSeriesCollection createMemoryUsageDataset() {
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               allocationInfo.baseSeries);
-               timeDataSet.addSeries(memoryInfo.baseSeries);
-
-               return timeDataSet;
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == xyplot) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYAreaRenderer renderer = (XYAreaRenderer) xyplot.getRenderer();
-
-               renderer.setSeriesPaint(0, Color.MAGENTA);
-               renderer.setSeriesPaint(1, Color.GREEN);
-
-               xyplot.getRangeAxis().setRange(new Range(0, DEFAULT_RANGE_VALUE), true,
-                               true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/ResourceUsageChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/ResourceUsageChart.java
deleted file mode 100644 (file)
index 7e84aee..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepRenderer;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class ResourceUsageChart extends TimelineChart {
-
-       // private final int DEFAULT_RANGE_FD_VALUE = 3;
-
-       private static String SERIES_NAME_FILE = "File";
-       private static String SERIES_NAME_SOCKET = "Socket";
-
-       class FDSeriesInfo {
-               String FDType;
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-
-               HashSet<Integer> fdValueSet;
-       }
-
-       private FDSeriesInfo fileFDinfo;
-       private FDSeriesInfo socketFDinfo;
-       static int maxValue = 3;
-
-       public ResourceUsageChart() {
-
-               fileFDinfo = new FDSeriesInfo();
-               fileFDinfo.FDType = SERIES_NAME_FILE;
-               fileFDinfo.baseSeries = new TimeSeries(fileFDinfo.FDType);
-               fileFDinfo.newSeries = new TimeSeries(fileFDinfo.FDType);
-               fileFDinfo.fdValueSet = new HashSet<Integer>();
-
-               socketFDinfo = new FDSeriesInfo();
-               socketFDinfo.FDType = SERIES_NAME_SOCKET;
-               socketFDinfo.baseSeries = new TimeSeries(socketFDinfo.FDType);
-               socketFDinfo.newSeries = new TimeSeries(socketFDinfo.FDType);
-               socketFDinfo.fdValueSet = new HashSet<Integer>();
-
-               // set Default Value
-               fileFDinfo.newSeries.add(TimelineUtils.convertToFixedMs(0), 0);
-               socketFDinfo.newSeries.add(TimelineUtils.convertToFixedMs(0), 0);
-
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-
-               TimeSeriesCollection dataset = createFDDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createTimeSeriesChart("FD Usage chart", "Time",
-                               "Number", dataset, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-               return chart;
-       }
-
-       @Override
-       public void clear() {
-
-               if (null == chart) {
-                       return;
-               }
-
-               fileFDinfo.newSeries.clear();
-               socketFDinfo.newSeries.clear();
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               fileFDinfo.baseSeries.clear();
-                               socketFDinfo.baseSeries.clear();
-                       }
-               });
-
-               setTimeDomainScopeStart(0);
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               // XYStepRenderer renderer = new XYStepRenderer();
-               XYStepRenderer renderer = new XYStepRenderer();
-
-               renderer.setSeriesPaint(0, new Color(135, 135, 235));
-               renderer.setSeriesPaint(1, new Color(0, 200, 0));
-
-               /* Stroke */
-               renderer.setSeriesStroke(0, new BasicStroke(3.0F));
-               renderer.setSeriesStroke(1, new BasicStroke(2.0F));
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               // xyplot.getRangeAxis().setRange(new Range(0, 3), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createFDDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               fileFDinfo.baseSeries);
-               timeDataSet.addSeries(socketFDinfo.baseSeries);
-
-               return timeDataSet;
-
-       }
-
-       private static void addFDData(long time, int fdValue, int fdType,
-                       int fdApiType) {
-
-               if (TimelineConstants.FD_TYPE_FILE == fdType) {
-                       addNewSeriesFileData(time, fdValue, fdApiType);
-               } else if (TimelineConstants.FD_TYPE_SOCKET == fdType) {
-                       addNewSeriesSocketData(time, fdValue, fdApiType);
-               } else {
-                       return;
-               }
-
-       }
-
-       private static void addNewSeriesFileData(long time, int fdValue,
-                       int fdApiType) {
-
-               SeriesDataSet fileFDinfo = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_RESOURCE_USAGE, SERIES_NAME_FILE);
-
-               if (TimelineConstants.FD_API_TYPE_OPEN == fdApiType) {
-                       fileFDinfo.getFdValueSet().add(fdValue);
-               } else if (TimelineConstants.FD_API_TYPE_CLOSE == fdApiType) {
-                       fileFDinfo.getFdValueSet().remove(fdValue);
-               } else {
-                       return;
-               }
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-               fileFDinfo.getNewSeries().addOrUpdate(fmSec,
-                               fileFDinfo.getFdValueSet().size());
-
-               if (maxValue < fileFDinfo.getFdValueSet().size()) {
-                       maxValue = fileFDinfo.getFdValueSet().size();
-               }
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_RESOURCE_USAGE, SERIES_NAME_FILE,
-                               fileFDinfo);
-               return;
-       }
-
-       private static void addNewSeriesSocketData(long time, int fdValue,
-                       int fdApiType) {
-
-               SeriesDataSet socketFDinfo = ChartDataSetCenter
-                               .getSeriesDataSet(TimelineConstants.CHART_TYPE_RESOURCE_USAGE,
-                                               SERIES_NAME_SOCKET);
-
-               if (TimelineConstants.FD_API_TYPE_OPEN == fdApiType) {
-                       socketFDinfo.getFdValueSet().add(fdValue);
-               } else if (TimelineConstants.FD_API_TYPE_CLOSE == fdApiType) {
-                       socketFDinfo.getFdValueSet().remove(fdValue);
-               } else {
-                       return;
-               }
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-               socketFDinfo.getNewSeries().addOrUpdate(fmSec,
-                               socketFDinfo.getFdValueSet().size());
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_RESOURCE_USAGE,
-                               SERIES_NAME_SOCKET, socketFDinfo);
-               return;
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       @Override
-       public void update() {
-
-               /* First or Its added new */
-               if (null == fileFDinfo.baseSeries) {
-                       return;
-               } else if (fileFDinfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_RESOURCE_USAGE,
-                                       SERIES_NAME_FILE);
-                       if (null != baseSeries) {
-                               fileFDinfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               if (null == socketFDinfo.baseSeries) {
-                       return;
-               } else if (socketFDinfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_RESOURCE_USAGE,
-                                       SERIES_NAME_SOCKET);
-                       if (null != baseSeries) {
-                               socketFDinfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               if (null == fileFDinfo.newSeries || null == socketFDinfo.newSeries) {
-                       return;
-               }
-
-               TimeSeries newFileSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_RESOURCE_USAGE, SERIES_NAME_FILE);
-               if (null != newFileSeries) {
-                       fileFDinfo.newSeries.addAndOrUpdate(newFileSeries);
-                       ChartDataSetCenter.clearNewSeries(
-                                       TimelineConstants.CHART_TYPE_RESOURCE_USAGE,
-                                       SERIES_NAME_FILE);
-               }
-
-               TimeSeries newSockSeries = ChartDataSetCenter
-                               .getNewSeries(TimelineConstants.CHART_TYPE_RESOURCE_USAGE,
-                                               SERIES_NAME_SOCKET);
-               if (null != newSockSeries) {
-                       socketFDinfo.newSeries.addAndOrUpdate(newSockSeries);
-                       ChartDataSetCenter.clearNewSeries(
-                                       TimelineConstants.CHART_TYPE_RESOURCE_USAGE,
-                                       SERIES_NAME_SOCKET);
-               }
-
-               // final long finalTime = updateTime;
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               fileFDinfo.baseSeries.addAndOrUpdate(fileFDinfo.newSeries);
-                               socketFDinfo.baseSeries.addAndOrUpdate(socketFDinfo.newSeries);
-
-                               fileFDinfo.newSeries.clear();
-                               socketFDinfo.newSeries.clear();
-
-                               // if (TimelineConstants.CHART_RANGE_DEFAULT < finalTime) {
-                               // setTimeDomainScopeEnd(finalTime);
-                               // }
-                       }
-               });
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String seriesName1 = SERIES_NAME_FILE;
-
-               SeriesDataSet dataSet1 = new SeriesDataSet();
-               dataSet1.setSeriesName(seriesName1);
-               dataSet1.setBaseSeries(new TimeSeries(seriesName1));
-               dataSet1.setNewSeries(new TimeSeries(seriesName1));
-               dataSet1.setFdValueSet(new HashSet<Integer>());
-
-               seriesDataSetList.add(dataSet1);
-
-               String seriesName2 = SERIES_NAME_SOCKET;
-
-               SeriesDataSet dataSet2 = new SeriesDataSet();
-               dataSet2.setSeriesName(seriesName2);
-               dataSet2.setBaseSeries(new TimeSeries(seriesName2));
-               dataSet2.setNewSeries(new TimeSeries(seriesName2));
-               dataSet2.setFdValueSet(new HashSet<Integer>());
-
-               seriesDataSetList.add(dataSet2);
-
-               return seriesDataSetList;
-       }
-
-       public static List<SeriesDataSet> parsingLogList(List<List<String>> logList) {
-
-               if (null == logList || 0 == logList.size()) {
-                       return null;
-               }
-
-               String chartName = TimelineUtils
-                               .getStringChartType(TimelineConstants.CHART_TYPE_CPU);
-               String seriesName = chartName;
-
-               List<SeriesDataSet> sDataSetList = new ArrayList<SeriesDataSet>();
-
-               SeriesDataSet sDataSet = new SeriesDataSet();
-               sDataSet.setSeriesName(seriesName);
-               sDataSet.setNewSeries(new TimeSeries(seriesName));
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-
-               sDataSetList.add(sDataSet);
-
-               return sDataSetList;
-       }
-
-       private static void parsingLog(List<String> log) {
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               int fdApiType = 0;
-
-               try {
-                       fdApiType = Integer.parseInt(log
-                                       .get(LogCenterConstants.RESOURCE_FDAPITYPE_INDEX));// TimelineConstants.RSRC_COL_FD_API_TYPE
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               }
-
-               if (TimelineConstants.FD_API_TYPE_OPEN != fdApiType
-                               && TimelineConstants.FD_API_TYPE_CLOSE != fdApiType) {
-                       return;
-               }
-
-               long time = 0;
-               int fdValue = 0;
-               int fdType = 0;
-
-               try {
-                       time = Long.parseLong(log.get(LogCenterConstants.TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       fdValue = Integer.parseInt(log
-                                       .get(LogCenterConstants.RESOURCE_FDVALUE_INDEX));// TimelineConstants.RSRC_COL_FD_VALUE
-                       fdType = Integer.parseInt(log
-                                       .get(LogCenterConstants.RESOURCE_FDTYPE_INDEX));// TimelineConstants.RSRC_COL_FD_TYPE
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addFDData(time, fdValue, fdType, fdApiType);
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/SoundChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/SoundChart.java
deleted file mode 100644 (file)
index bc93922..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.DeviceConstants;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class SoundChart extends TimelineChart {
-
-       class SoundSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private SoundSeriesInfo SoundOnInfo;
-
-       public SoundChart() {
-
-               SoundOnInfo = new SoundSeriesInfo();
-               SoundOnInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_SOUND_STATUS_ON);
-               SoundOnInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_SOUND_STATUS_ON);
-               // set Default Value
-               SoundOnInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createSoundDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createTimeSeriesChart("Sound chart", "Time", "%",
-                               dataSet, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-
-               /* First or Its added new */
-               if (null == SoundOnInfo.baseSeries) {
-                       return;
-               } else if (SoundOnInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_SOUND,
-                                       DeviceConstants.DEVICE_CAMERA_STATUS_ON);
-                       if (null != baseSeries) {
-                               SoundOnInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               TimeSeries newSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_SOUND,
-                               DeviceConstants.DEVICE_CAMERA_STATUS_ON);
-
-               if (null == newSeries) {
-                       return;
-               }
-
-               if (null == SoundOnInfo.newSeries) {
-                       return;
-               }
-
-               SoundOnInfo.newSeries.addAndOrUpdate(newSeries);
-               ChartDataSetCenter.clearNewSeries(TimelineConstants.CHART_TYPE_SOUND,
-                               DeviceConstants.DEVICE_CAMERA_STATUS_ON);
-
-               if (null == SoundOnInfo.newSeries) {
-                       return;
-               }
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               SoundOnInfo.baseSeries.addAndOrUpdate(SoundOnInfo.newSeries);
-                               SoundOnInfo.newSeries.clear();
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-               if (null == chart) {
-                       return;
-               }
-
-               SoundOnInfo.newSeries.clear();
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               SoundOnInfo.baseSeries.clear();
-                       }
-               });
-
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer();
-
-               renderer.setDefaultEntityRadius(5);
-
-               renderer.setSeriesPaint(0, Color.GREEN.darker());
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               xyplot.getRangeAxis().setRange(new Range(0, 1), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               xyplot.getRangeAxis().setTickLabelsVisible(false);
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createSoundDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               SoundOnInfo.baseSeries);
-
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesSoundData(long time, double onOff) {
-
-               SeriesDataSet sDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_SOUND,
-                               DeviceConstants.DEVICE_CAMERA_STATUS_ON);
-
-               if (null == sDataSet) {
-                       return;
-               }
-
-               if (null == sDataSet.getNewSeries()) {
-                       return;
-               }
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-               sDataSet.getNewSeries().addOrUpdate(fmSec, onOff);
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_SOUND,
-                               DeviceConstants.DEVICE_CAMERA_STATUS_ON, sDataSet);
-
-               return;
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String seriesName = DeviceConstants.DEVICE_CAMERA_STATUS_ON;
-
-               SeriesDataSet dataSet = new SeriesDataSet();
-               dataSet.setSeriesName(seriesName);
-               dataSet.setBaseSeries(new TimeSeries(seriesName));
-               dataSet.setNewSeries(new TimeSeries(seriesName));
-
-               seriesDataSetList.add(dataSet);
-
-               return seriesDataSetList;
-       }
-
-       public static void parsingLogList(List<List<String>> logList) {
-
-               if (null == logList || 0 == logList.size()) {
-                       return;
-               }
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-       }
-
-       private static void parsingLog(List<String> log) {
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               double onOff = 0;
-
-               if (log.get(LogCenterConstants.DEVICE_SOUND_INDEX).isEmpty()) {
-                       return;
-               }
-
-               try {
-                       time = Long.parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX)) / TimelineConstants.TIME_US_TO_MS;
-                       onOff = Integer.parseInt(log.get(LogCenterConstants.DEVICE_SOUND_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addNewSeriesSoundData(time, onOff);
-
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/UIEventsChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/UIEventsChart.java
deleted file mode 100644 (file)
index 146f1db..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.StandardXYBarPainter;
-import org.jfree.chart.renderer.xy.XYBarRenderer;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class UIEventsChart extends TimelineChart {
-       private SeriesDataSet mDownDataSet;
-       // private SeriesDataSet mUPDataSet;
-       private SeriesDataSet mMoveDataSet;
-
-       private String chartName;
-
-       private static String SERIES_NAME_MOUSE_DOWN = "Down";
-       // private static String SERIES_NAME_MOUSE_UP = "Up";
-       private static String SERIES_NAME_MOUSE_MOVE = "Move";
-
-       public UIEventsChart() {
-               chartName = TimelineUtils
-                               .getStringChartType(TimelineConstants.CHART_TYPE_UI_EVENTS);
-
-               /* Down set */
-               mDownDataSet = new SeriesDataSet();
-               mDownDataSet.setSeriesName(SERIES_NAME_MOUSE_DOWN);
-               mDownDataSet
-                               .setBaseSeries(new TimeSeries(mDownDataSet.getSeriesName()));
-               mDownDataSet.setNewSeries(new TimeSeries(mDownDataSet.getSeriesName()));
-
-               mDownDataSet.getNewSeries().addOrUpdate(
-                               TimelineUtils.convertToFixedMs(0), 0);
-
-               /* Move set */
-               mMoveDataSet = new SeriesDataSet();
-               mMoveDataSet.setSeriesName(SERIES_NAME_MOUSE_MOVE);
-               mMoveDataSet
-                               .setBaseSeries(new TimeSeries(mMoveDataSet.getSeriesName()));
-               mMoveDataSet.setNewSeries(new TimeSeries(mMoveDataSet.getSeriesName()));
-
-               mMoveDataSet.getNewSeries().addOrUpdate(
-                               TimelineUtils.convertToFixedMs(0), 0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-               /* Data */
-               TimeSeriesCollection moveDataset = createUIEventsMoveDataset();
-
-               /* Create */
-               chart = ChartFactory.createXYBarChart(chartName, "Time", true,
-                               "Status", moveDataset, PlotOrientation.VERTICAL, true, true,
-                               false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               setChartStyle();
-               XYPlot xyplot = (XYPlot) chart.getPlot();
-               setSeriesRendering(xyplot);
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-               if (null == xyplot) {
-                       return;
-               }
-
-               XYBarRenderer barRenderer = (XYBarRenderer) xyplot.getRenderer();
-
-               barRenderer.setBarPainter(new StandardXYBarPainter());
-               barRenderer.setShadowVisible(false);
-               barRenderer.setDrawBarOutline(false);
-               barRenderer.setSeriesPaint(0, Color.GREEN);
-               xyplot.setRenderer(0, barRenderer);
-
-               /* New Axis */
-               TimeSeriesCollection downDataset = createUIEventsDownDataset();
-               xyplot.setDataset(1, downDataset);
-
-               XYStepAreaRenderer stepRenderer = new XYStepAreaRenderer(2);
-               stepRenderer.setSeriesPaint(0, new Color(135, 135, 235, 100));
-               stepRenderer.setSeriesStroke(0, new BasicStroke(2.0F));
-               stepRenderer.setDefaultEntityRadius(6);
-               xyplot.setRenderer(1, stepRenderer);
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               xyplot.getRangeAxis().setRange(new Range(0, 1), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-       }
-
-       private TimeSeriesCollection createUIEventsMoveDataset() {
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               mMoveDataSet.getBaseSeries());
-
-               return timeDataSet;
-       }
-
-       private TimeSeriesCollection createUIEventsDownDataset() {
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               mDownDataSet.getBaseSeries());
-
-               return timeDataSet;
-       }
-
-       @Override
-       public void update() {
-               /* First or Its added new */
-               if (null == mMoveDataSet.getBaseSeries()) {
-                       return;
-               } else if (mMoveDataSet.getBaseSeries().isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_UI_EVENTS,
-                                       SERIES_NAME_MOUSE_MOVE);
-                       if (null != baseSeries) {
-                               mMoveDataSet.getNewSeries().addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               if (null == mDownDataSet.getBaseSeries()) {
-                       return;
-               } else if (mDownDataSet.getBaseSeries().isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_UI_EVENTS,
-                                       SERIES_NAME_MOUSE_DOWN);
-                       if (null != baseSeries) {
-                               mDownDataSet.getNewSeries().addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               TimeSeries newMoveSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_UI_EVENTS, SERIES_NAME_MOUSE_MOVE);
-               if (null != newMoveSeries) {
-                       mMoveDataSet.getNewSeries().addAndOrUpdate(newMoveSeries);
-                       ChartDataSetCenter.clearNewSeries(
-                                       TimelineConstants.CHART_TYPE_UI_EVENTS,
-                                       SERIES_NAME_MOUSE_MOVE);
-               }
-
-               TimeSeries newDownSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_UI_EVENTS, SERIES_NAME_MOUSE_DOWN);
-               if (null != newDownSeries) {
-                       mDownDataSet.getNewSeries().addAndOrUpdate(newDownSeries);
-                       ChartDataSetCenter.clearNewSeries(
-                                       TimelineConstants.CHART_TYPE_UI_EVENTS,
-                                       SERIES_NAME_MOUSE_DOWN);
-               }
-
-               if (null == mMoveDataSet.getNewSeries()
-                               && null == mDownDataSet.getNewSeries()) {
-                       return;
-               }
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               mMoveDataSet.getBaseSeries().addAndOrUpdate(
-                                               mMoveDataSet.getNewSeries());
-
-                               mDownDataSet.getBaseSeries().addAndOrUpdate(
-                                               mDownDataSet.getNewSeries());
-
-                               mMoveDataSet.getNewSeries().clear();
-
-                               mDownDataSet.getNewSeries().clear();
-                       }
-               });
-       }
-
-       @Override
-       public void clear() {
-               if (null == chart) {
-                       return;
-               }
-
-               mMoveDataSet.getNewSeries().clear();
-               mDownDataSet.getNewSeries().clear();
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               mMoveDataSet.getBaseSeries().clear();
-                               mDownDataSet.getBaseSeries().clear();
-                       }
-               });
-
-               setTimeDomainScopeStart(0);
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String seriesName1 = SERIES_NAME_MOUSE_MOVE;
-
-               SeriesDataSet dataSet1 = new SeriesDataSet();
-               dataSet1.setSeriesName(seriesName1);
-               dataSet1.setBaseSeries(new TimeSeries(seriesName1));
-               dataSet1.setNewSeries(new TimeSeries(seriesName1));
-
-               seriesDataSetList.add(dataSet1);
-
-               String seriesName2 = SERIES_NAME_MOUSE_DOWN;
-
-               SeriesDataSet dataSet2 = new SeriesDataSet();
-               dataSet2.setSeriesName(seriesName2);
-               dataSet2.setBaseSeries(new TimeSeries(seriesName2));
-               dataSet2.setNewSeries(new TimeSeries(seriesName2));
-
-               seriesDataSetList.add(dataSet2);
-
-               return seriesDataSetList;
-       }
-
-       public static void parsingLogList(List<List<String>> logList) {
-               if (null == logList || 0 == logList.size()) {
-                       return;
-               }
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-       }
-
-       private static void parsingLog(List<String> log) {
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               String apiName = null;
-               int isMove = 0;
-               int isDown = 0;
-
-               try {
-                       time = Long.parseLong(log.get(LogCenterConstants.TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       apiName = log.get(LogCenterConstants.APINAME_INDEX);
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               isMove = getStatusMoveEvents(apiName);
-               isDown = getStatusDownEvents(apiName);
-
-               addNewSeriesMouseMoveData(time, isMove);
-               addNewSeriesMouseDownData(time, isDown);
-       }
-
-       private static void addNewSeriesMouseMoveData(long time, int isMove) {
-               SeriesDataSet moveDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_UI_EVENTS, SERIES_NAME_MOUSE_MOVE);
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-               moveDataSet.getNewSeries().addOrUpdate(fmSec, isMove);
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_UI_EVENTS, SERIES_NAME_MOUSE_MOVE,
-                               moveDataSet);
-       }
-
-       private static void addNewSeriesMouseDownData(long time, int isDown) {
-               SeriesDataSet moveDataSet = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_UI_EVENTS, SERIES_NAME_MOUSE_DOWN);
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-               moveDataSet.getNewSeries().addOrUpdate(fmSec, isDown);
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_UI_EVENTS, SERIES_NAME_MOUSE_DOWN,
-                               moveDataSet);
-       }
-
-       private static int getStatusMoveEvents(String apiName) {
-               if (null == apiName) {
-                       return 0;
-               }
-
-               if (apiName.equals("evas_event_feed_mouse_move")) {
-                       return 1;
-               }
-
-               return 0;
-       }
-
-       private static int getStatusDownEvents(String apiName) {
-               if (null == apiName) {
-                       return 0;
-               }
-
-               if (apiName.equals("evas_event_feed_mouse_down")) {
-                       return 1;
-               } else if (apiName.equals("evas_event_feed_mouse_move")) {
-                       return 1;
-               }
-
-               return 0;
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/VibrationChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/VibrationChart.java
deleted file mode 100644 (file)
index f69f10c..0000000
+++ /dev/null
@@ -1,263 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.DeviceConstants;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class VibrationChart extends TimelineChart {
-
-       class VibrationSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private VibrationSeriesInfo vibrationOnInfo;
-
-       public VibrationChart() {
-               vibrationOnInfo = new VibrationSeriesInfo();
-               vibrationOnInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_VIBRATION_STATUS_ON);
-               vibrationOnInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_VIBRATION_STATUS_ON);
-
-               // set Default Value
-               vibrationOnInfo.newSeries.addOrUpdate(
-                               TimelineUtils.convertToFixedMs(0), 0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createVibrationDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createTimeSeriesChart("Vibration chart", "Time",
-                               "%", dataSet, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-
-               /* First or Its added new */
-               if (null == vibrationOnInfo.baseSeries) {
-                       return;
-               } else if (vibrationOnInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_VIBRATION,
-                                       DeviceConstants.DEVICE_VIBRATION_STATUS_ON);
-                       if (null != baseSeries) {
-                               vibrationOnInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               TimeSeries newSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_VIBRATION,
-                               DeviceConstants.DEVICE_VIBRATION_STATUS_ON);
-
-               if (null == newSeries) {
-                       return;
-               }
-
-               if (null == vibrationOnInfo.newSeries) {
-                       return;
-               }
-
-               vibrationOnInfo.newSeries.addAndOrUpdate(newSeries);
-               ChartDataSetCenter.clearNewSeries(
-                               TimelineConstants.CHART_TYPE_VIBRATION,
-                               DeviceConstants.DEVICE_VIBRATION_STATUS_ON);
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               vibrationOnInfo.baseSeries
-                                               .addAndOrUpdate(vibrationOnInfo.newSeries);
-
-                               vibrationOnInfo.newSeries.clear();
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-               if (null == chart) {
-                       return;
-               }
-
-               vibrationOnInfo.newSeries.clear();
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               vibrationOnInfo.baseSeries.clear();
-                       }
-               });
-
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer();
-
-               renderer.setDefaultEntityRadius(5);
-
-               renderer.setSeriesPaint(0, Color.GREEN.darker());
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               xyplot.getRangeAxis().setRange(new Range(0, 1), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               xyplot.getRangeAxis().setTickLabelsVisible(false);
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createVibrationDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               vibrationOnInfo.baseSeries);
-
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesVibrationData(long time, double onOff) {
-
-               SeriesDataSet vibrationOnInfo = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_VIBRATION,
-                               DeviceConstants.DEVICE_VIBRATION_STATUS_ON);
-
-               if (null == vibrationOnInfo) {
-                       return;
-               }
-
-               if (null == vibrationOnInfo.getNewSeries()) {
-                       return;
-               }
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-               vibrationOnInfo.getNewSeries().addOrUpdate(fmSec, onOff);
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_VIBRATION,
-                               DeviceConstants.DEVICE_VIBRATION_STATUS_ON, vibrationOnInfo);
-
-               return;
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String seriesName = DeviceConstants.DEVICE_VIBRATION_STATUS_ON;
-
-               SeriesDataSet dataSet = new SeriesDataSet();
-               dataSet.setSeriesName(seriesName);
-               dataSet.setBaseSeries(new TimeSeries(seriesName));
-               dataSet.setNewSeries(new TimeSeries(seriesName));
-
-               seriesDataSetList.add(dataSet);
-
-               return seriesDataSetList;
-       }
-
-       public static void parsingLogList(List<List<String>> logList) {
-
-               if (null == logList || 0 == logList.size()) {
-                       return;
-               }
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-       }
-
-       private static void parsingLog(List<String> log) {
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               double onOff = 0;
-
-               if (log.get(LogCenterConstants.DEVICE_VIBRATION_INDEX).isEmpty()) {
-                       return;
-               }
-
-               try {
-                       time = Long
-                                       .parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       onOff = Integer.parseInt(log
-                                       .get(LogCenterConstants.DEVICE_VIBRATION_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               addNewSeriesVibrationData(time, onOff);
-
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/VoltageChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/VoltageChart.java
deleted file mode 100644 (file)
index 8643586..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYAreaRenderer;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class VoltageChart extends TimelineChart {
-
-       class VoltageSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private VoltageSeriesInfo voltageInfo;
-
-       // private final int DEFAULT_RANGE_VALUE = 100;
-
-       public VoltageChart() {
-               voltageInfo = new VoltageSeriesInfo();
-               voltageInfo.baseSeries = new TimeSeries("Voltage");
-               voltageInfo.newSeries = new TimeSeries("Voltage");
-
-               // set Default Value
-               voltageInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-
-               /* Data */
-               TimeSeriesCollection dataSet = createVoltageDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createXYAreaChart("Voltage chart", "Time", "mAh",
-                               dataSet, PlotOrientation.VERTICAL, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-
-               /* First or Its added new */
-               if (null == voltageInfo.baseSeries) {
-                       return;
-               } else if (voltageInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter
-                                       .getBaseSeries(
-                                                       TimelineConstants.CHART_TYPE_VOLTAGE,
-                                                       TimelineUtils
-                                                                       .getStringChartType(TimelineConstants.CHART_TYPE_VOLTAGE));
-                       if (null != baseSeries) {
-                               voltageInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               TimeSeries newSeries = ChartDataSetCenter
-                               .getNewSeries(
-                                               TimelineConstants.CHART_TYPE_VOLTAGE,
-                                               TimelineUtils
-                                                               .getStringChartType(TimelineConstants.CHART_TYPE_VOLTAGE));
-
-               if (null == newSeries) {
-                       return;
-               }
-
-               if (null == voltageInfo.newSeries) {
-                       return;
-               }
-
-               voltageInfo.newSeries.addAndOrUpdate(newSeries);
-               ChartDataSetCenter
-                               .clearNewSeries(
-                                               TimelineConstants.CHART_TYPE_VOLTAGE,
-                                               TimelineUtils
-                                                               .getStringChartType(TimelineConstants.CHART_TYPE_VOLTAGE));
-
-               // final long finalTime = updateTime;
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               voltageInfo.baseSeries.addAndOrUpdate(voltageInfo.newSeries);
-
-                               voltageInfo.newSeries.clear();
-                       }
-               });
-
-       }
-
-       @Override
-       public void clear() {
-               if (null == chart) {
-                       return;
-               }
-
-               voltageInfo.newSeries.clear();
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               voltageInfo.baseSeries.clear();
-                       }
-               });
-               setTimeDomainScopeStart(0);
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == xyplot) {
-                       return;
-               }
-
-               /* Axis set */
-               NumberAxis numAxis = (NumberAxis) xyplot.getRangeAxis();
-               numAxis.setNumberFormatOverride(NumberFormat.getPercentInstance());
-               numAxis.setUpperMargin(0.10000000000000001D);
-
-               // xyplot.getRangeAxis().setAutoRange(false);
-               // xyplot.getRangeAxis().setRange(new Range(0, 1));
-
-               /* Rendering */
-               XYAreaRenderer renderer = (XYAreaRenderer) xyplot.getRenderer();
-               renderer.setSeriesPaint(0, Color.GREEN.darker());
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createVoltageDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               voltageInfo.baseSeries);
-
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesVoltageData(long time, double voltageValue) {
-               SeriesDataSet voltageInfo = ChartDataSetCenter
-                               .getSeriesDataSet(
-                                               TimelineConstants.CHART_TYPE_VOLTAGE,
-                                               TimelineUtils
-                                                               .getStringChartType(TimelineConstants.CHART_TYPE_VOLTAGE));
-
-               if (null == voltageInfo) {
-                       return;
-               }
-
-               if (null == voltageInfo.getNewSeries()) {
-                       return;
-               }
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-               voltageInfo.getNewSeries().addOrUpdate(fmSec, voltageValue);
-
-               ChartDataSetCenter
-                               .setNewSeriesDataSet(
-                                               TimelineConstants.CHART_TYPE_VOLTAGE,
-                                               TimelineUtils
-                                                               .getStringChartType(TimelineConstants.CHART_TYPE_VOLTAGE),
-                                               voltageInfo);
-               return;
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-
-               String chartName = TimelineUtils
-                               .getStringChartType(TimelineConstants.CHART_TYPE_VOLTAGE);
-
-               String seriesName = chartName;
-
-               SeriesDataSet dataSet = new SeriesDataSet();
-               dataSet.setSeriesName(seriesName);
-               dataSet.setBaseSeries(new TimeSeries(seriesName));
-               dataSet.setNewSeries(new TimeSeries(seriesName));
-
-               seriesDataSetList.add(dataSet);
-
-               return seriesDataSetList;
-       }
-
-       public static void parsingLogList(List<List<String>> logList) {
-
-               if (null == logList || 0 == logList.size()) {
-                       return;
-               }
-
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-       }
-
-       private static void parsingLog(List<String> log) {
-
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               double voltageRate = 0;
-
-               if (log.get(LogCenterConstants.DEVICE_VOLTAGE_INDEX).isEmpty()) {
-                       return;
-               }
-
-               try {
-                       time = Long
-                                       .parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       voltageRate = Double.parseDouble(log
-                                       .get(LogCenterConstants.DEVICE_VOLTAGE_INDEX)) / 100;
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-               if (0 > voltageRate) {
-                       voltageRate = Math.abs(voltageRate);
-               }
-
-               addNewSeriesVoltageData(time, voltageRate);
-
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/WIFIChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/deprecated/WIFIChart.java
deleted file mode 100644 (file)
index 4023b5f..0000000
+++ /dev/null
@@ -1,402 +0,0 @@
-package org.tizen.dynamicanalyzer.timeline.chart.deprecated;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Display;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.time.FixedMillisecond;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.tizen.dynamicanalyzer.constants.DeviceConstants;
-import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.timeline.chart.ChartDataSetCenter;
-import org.tizen.dynamicanalyzer.timeline.chart.SeriesDataSet;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
-
-
-public class WIFIChart extends TimelineChart {
-       class WifiSeriesInfo {
-               TimeSeries baseSeries;
-               TimeSeries newSeries;
-       }
-
-       private WifiSeriesInfo unconnectedInfo;
-       private WifiSeriesInfo connectedInfo;
-       private WifiSeriesInfo transferInfo;
-
-       public WIFIChart() {
-               unconnectedInfo = new WifiSeriesInfo();
-               unconnectedInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_WIFI_STATUS_ENABLED);
-               unconnectedInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_WIFI_STATUS_ENABLED);
-               // set Default Value
-               unconnectedInfo.newSeries.addOrUpdate(
-                               TimelineUtils.convertToFixedMs(0), 0);
-
-               connectedInfo = new WifiSeriesInfo();
-               connectedInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_WIFI_STATUS_CONNECTED);
-               connectedInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_WIFI_STATUS_CONNECTED);
-               // set Default Value
-               connectedInfo.newSeries.addOrUpdate(TimelineUtils.convertToFixedMs(0),
-                               0);
-
-               transferInfo = new WifiSeriesInfo();
-               transferInfo.baseSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_WIFI_STATUS_TRANSFER);
-               transferInfo.newSeries = new TimeSeries(
-                               DeviceConstants.DEVICE_WIFI_STATUS_TRANSFER);
-               // set Default Value
-               transferInfo.newSeries
-                               .addOrUpdate(TimelineUtils.convertToFixedMs(0), 0);
-       }
-
-       @Override
-       public JFreeChart createChart() {
-               /* Data */
-               TimeSeriesCollection dataSet = createWIFIDataset();
-
-               /* Create */
-
-               chart = ChartFactory.createTimeSeriesChart("WIFI chart", "Time", "%",
-                               dataSet, true, true, false);
-
-               if (null == chart) {
-                       return null;
-               }
-
-               XYPlot xyplot = chart.getXYPlot();
-
-               setChartStyle();
-
-               setSeriesRendering(xyplot);
-
-               setTimeDomainScopeStart(0);
-
-               return chart;
-       }
-
-       @Override
-       public void update() {
-               /* First or Its added new */
-               if (null == unconnectedInfo.baseSeries) {
-                       return;
-               } else if (unconnectedInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_WIFI,
-                                       DeviceConstants.DEVICE_WIFI_STATUS_ENABLED);
-                       if (null != baseSeries) {
-                               unconnectedInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               if (null == connectedInfo.baseSeries) {
-                       return;
-               } else if (connectedInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_WIFI,
-                                       DeviceConstants.DEVICE_WIFI_STATUS_CONNECTED);
-                       if (null != baseSeries) {
-                               connectedInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               if (null == transferInfo.baseSeries) {
-                       return;
-               } else if (transferInfo.baseSeries.isEmpty()) {
-                       TimeSeries baseSeries = ChartDataSetCenter.getBaseSeries(
-                                       TimelineConstants.CHART_TYPE_WIFI,
-                                       DeviceConstants.DEVICE_WIFI_STATUS_TRANSFER);
-                       if (null != baseSeries) {
-                               transferInfo.newSeries.addAndOrUpdate(baseSeries);
-                       }
-               }
-
-               /**/
-               TimeSeries newUncoSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_ENABLED);
-               if (null != newUncoSeries) {
-                       unconnectedInfo.newSeries.addAndOrUpdate(newUncoSeries);
-                       ChartDataSetCenter.clearNewSeries(
-                                       TimelineConstants.CHART_TYPE_WIFI,
-                                       DeviceConstants.DEVICE_WIFI_STATUS_ENABLED);
-               }
-
-               TimeSeries newCoSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_CONNECTED);
-               if (null != newCoSeries) {
-                       connectedInfo.newSeries.addAndOrUpdate(newCoSeries);
-                       ChartDataSetCenter.clearNewSeries(
-                                       TimelineConstants.CHART_TYPE_WIFI,
-                                       DeviceConstants.DEVICE_WIFI_STATUS_CONNECTED);
-               }
-
-               TimeSeries newTrSeries = ChartDataSetCenter.getNewSeries(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_TRANSFER);
-               if (null != newUncoSeries) {
-                       transferInfo.newSeries.addAndOrUpdate(newTrSeries);
-                       ChartDataSetCenter.clearNewSeries(
-                                       TimelineConstants.CHART_TYPE_WIFI,
-                                       DeviceConstants.DEVICE_WIFI_STATUS_TRANSFER);
-               }
-
-               if (null == unconnectedInfo.newSeries
-                               && null == connectedInfo.newSeries
-                               && null == transferInfo.newSeries) {
-                       return;
-               }
-
-               // final long finalTime = updateTime;
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-
-                               if (null != unconnectedInfo.newSeries) {
-                                       unconnectedInfo.baseSeries
-                                                       .addAndOrUpdate(unconnectedInfo.newSeries);
-                                       unconnectedInfo.newSeries.clear();
-                               }
-
-                               if (null != connectedInfo.newSeries) {
-                                       connectedInfo.baseSeries
-                                                       .addAndOrUpdate(connectedInfo.newSeries);
-                                       connectedInfo.newSeries.clear();
-                               }
-
-                               if (null != transferInfo.newSeries) {
-                                       transferInfo.baseSeries
-                                                       .addAndOrUpdate(transferInfo.newSeries);
-                                       transferInfo.newSeries.clear();
-                               }
-
-                       }
-               });
-       }
-
-       @Override
-       public void clear() {
-               if (null == chart) {
-                       return;
-               }
-
-               unconnectedInfo.newSeries.clear();
-               connectedInfo.newSeries.clear();
-               transferInfo.newSeries.clear();
-
-               Display.getDefault().asyncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               unconnectedInfo.baseSeries.clear();
-                               connectedInfo.baseSeries.clear();
-                               transferInfo.baseSeries.clear();
-                       }
-               });
-
-               setTimeDomainScopeStart(0);
-       }
-
-       @Override
-       public void dispose() {
-               // TODO Auto-generated method stub
-       }
-
-       public static List<SeriesDataSet> newSeriesDataSetList() {
-               List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
-       
-               String seriesName1 = DeviceConstants.DEVICE_WIFI_STATUS_ENABLED;
-       
-               SeriesDataSet dataSet1 = new SeriesDataSet();
-               dataSet1.setSeriesName(seriesName1);
-               dataSet1.setBaseSeries(new TimeSeries(seriesName1));
-               dataSet1.setNewSeries(new TimeSeries(seriesName1));
-       
-               seriesDataSetList.add(dataSet1);
-       
-               String seriesName2 = DeviceConstants.DEVICE_WIFI_STATUS_CONNECTED;
-       
-               SeriesDataSet dataSet2 = new SeriesDataSet();
-               dataSet2.setSeriesName(seriesName2);
-               dataSet2.setBaseSeries(new TimeSeries(seriesName2));
-               dataSet2.setNewSeries(new TimeSeries(seriesName2));
-       
-               seriesDataSetList.add(dataSet2);
-       
-               String seriesName3 = DeviceConstants.DEVICE_WIFI_STATUS_TRANSFER;
-       
-               SeriesDataSet dataSet3 = new SeriesDataSet();
-               dataSet3.setSeriesName(seriesName3);
-               dataSet3.setBaseSeries(new TimeSeries(seriesName3));
-               dataSet3.setNewSeries(new TimeSeries(seriesName3));
-       
-               seriesDataSetList.add(dataSet3);
-       
-               return seriesDataSetList;
-       }
-
-       public static void parsingLogList(List<List<String>> logList) {
-       
-               if (null == logList || 0 == logList.size()) {
-                       return;
-               }
-       
-               for (int i = 0; i < logList.size(); i++) {
-                       parsingLog(logList.get(i));
-               }
-       
-       }
-
-       private static void parsingLog(List<String> log) {
-       
-               if (null == log || 0 > log.size()) {
-                       return;
-               }
-       
-               /* API check */
-               // int fdApiType = 0
-               long time = 0;
-               int statusValue = 0;
-       
-               if (log.get(LogCenterConstants.DEVICE_WIFI_INDEX).isEmpty()) {
-                       return;
-               }
-       
-               try {
-                       time = Long
-                                       .parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX))
-                                       / TimelineConstants.TIME_US_TO_MS;
-                       statusValue = Integer.parseInt(log
-                                       .get(LogCenterConstants.DEVICE_WIFI_INDEX));
-               } catch (NumberFormatException ne) {
-                       ne.printStackTrace();
-               } catch (NullPointerException ne) {
-                       ne.printStackTrace();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       
-               addNewSeriesWifiData(time, statusValue);
-       
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-
-               if (null == chart || null == xyplot) {
-                       return;
-               }
-
-               /* Rendering */
-
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer(2);
-
-               renderer.setDefaultEntityRadius(6);
-
-               renderer.setSeriesPaint(0, Color.LIGHT_GRAY);
-               renderer.setSeriesPaint(1, Color.GREEN.darker());
-               renderer.setSeriesPaint(2, Color.RED);
-
-               /* Range attribute */
-               xyplot.getRangeAxis().setUpperMargin(0.35F);
-               xyplot.getRangeAxis().setRange(new Range(0, 1), true, true);
-               xyplot.getRangeAxis().setStandardTickUnits(
-                               NumberAxis.createIntegerTickUnits());
-
-               renderer.setShapesVisible(false);
-
-               xyplot.getRangeAxis().setTickLabelsVisible(false);
-
-               renderer.setBaseItemLabelsVisible(false);
-
-               xyplot.setRenderer(renderer);
-
-       }
-
-       private TimeSeriesCollection createWIFIDataset() {
-
-               TimeSeriesCollection timeDataSet = new TimeSeriesCollection(
-                               unconnectedInfo.baseSeries);
-               timeDataSet.addSeries(connectedInfo.baseSeries);
-               timeDataSet.addSeries(transferInfo.baseSeries);
-
-               return timeDataSet;
-       }
-
-       private static void addNewSeriesWifiData(long time, int status) {
-
-               double setValue = 1;
-               double clearValue = 0;
-
-               SeriesDataSet unconnectedInfo = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_ENABLED);
-
-               SeriesDataSet connectedInfo = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_CONNECTED);
-
-               SeriesDataSet transferInfo = ChartDataSetCenter.getSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_TRANSFER);
-
-               FixedMillisecond fmSec = TimelineUtils.convertToFixedMs(time);
-
-               switch (status) {
-               case DeviceConstants.DEVICE_WIFI_VALUE_DISABLED:
-                       unconnectedInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       connectedInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       transferInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_WIFI_VALUE_ENABLED:
-                       unconnectedInfo.getNewSeries().addOrUpdate(fmSec, setValue);
-                       connectedInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       transferInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_WIFI_VALUE_CONNECTED:
-                       unconnectedInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       connectedInfo.getNewSeries().addOrUpdate(fmSec, setValue);
-                       transferInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       break;
-               case DeviceConstants.DEVICE_WIFI_VALUE_TRANSFER:
-                       unconnectedInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       connectedInfo.getNewSeries().addOrUpdate(fmSec, clearValue);
-                       transferInfo.getNewSeries().addOrUpdate(fmSec, setValue);
-                       break;
-               default:
-                       break;
-               }
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_ENABLED,
-                               unconnectedInfo);
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_CONNECTED, connectedInfo);
-
-               ChartDataSetCenter.setNewSeriesDataSet(
-                               TimelineConstants.CHART_TYPE_WIFI,
-                               DeviceConstants.DEVICE_WIFI_STATUS_TRANSFER, transferInfo);
-
-               return;
-       }
-
-       @Override
-       public void setRenderingBySize() {
-               // TODO Auto-generated method stub
-               
-       }
-}