[Title] Timeline refactoring 0.0.1
authorsanghyunnim.lee <sanghyunnim.lee@samsung.com>
Fri, 17 Aug 2012 10:30:36 +0000 (19:30 +0900)
committersanghyunnim.lee <sanghyunnim.lee@samsung.com>
Fri, 17 Aug 2012 10:30:36 +0000 (19:30 +0900)
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

29 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/TimelineConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/CustomLogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineChartManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineComposite.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSelector.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSettingProvider.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemsProvider.java [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DACPUChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DACPUCoreChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DACPUFrequencyChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DAFileChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DAHeapChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DAProcessMemoryChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DASystemMemoryChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DATimelineChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/FileChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/HeapChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SystemMemoryChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/UserCustomChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/tables/StatsTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/TimelineUtils.java

index e4191d5..3e4014e 100644 (file)
@@ -169,15 +169,15 @@ public class ImageResources {
        public static final Image DYNANMIC_ANALYZER_ICON = getPngImage("64_DA_icon"); //$NON-NLS-1$ \r
 \r
        /* Timeline */\r
-       public static final Image CPU = getPngImage("time_line_icon_cpu"); //$NON-NLS-1$\r
-       public static final Image CPU_CORE = getPngImage("time_line_icon_cpu_core"); //$NON-NLS-1$\r
-       public static final Image CPU_FREQUENCY = getPngImage("time_line_icon_cpu_frequency"); //$NON-NLS-1$\r
+       public static final Image CHART_CPU = getPngImage("time_line_icon_cpu"); //$NON-NLS-1$\r
+       public static final Image CHART_CPU_CORE = getPngImage("time_line_icon_cpu_core"); //$NON-NLS-1$\r
+       public static final Image CHART_CPU_FREQUENCY = getPngImage("time_line_icon_cpu_frequency"); //$NON-NLS-1$\r
+       public static final Image CHART_HEAP = getPngImage("time_line_icon_memory_allocation"); //$NON-NLS-1$\r
+       public static final Image CHART_PROCESS_MEMORY = getPngImage("time_line_icon_memory_process"); //$NON-NLS-1$\r
+       public static final Image CHART_SYSTEM_MEMORY = getPngImage("time_line_icon_memory_system"); //$NON-NLS-1$\r
+       public static final Image CHART_FILE = getPngImage("time_line_icon_read_write"); //$NON-NLS-1$\r
        public static final Image FD_USAGE = getPngImage("time_line_icon_fd_usage"); //$NON-NLS-1$\r
        public static final Image MEMORY = getPngImage("time_line_icon_memory"); //$NON-NLS-1$\r
-       public static final Image PROCESS_MEMORY = getPngImage("time_line_icon_memory_process"); //$NON-NLS-1$\r
-       public static final Image SYSTEM_MEMORY = getPngImage("time_line_icon_memory_system"); //$NON-NLS-1$\r
-       public static final Image MEMORY_ALLOC = getPngImage("time_line_icon_memory_allocation"); //$NON-NLS-1$\r
-       public static final Image FILE = getPngImage("time_line_icon_read_write"); //$NON-NLS-1$\r
        public static final Image SNAPSHOT = getPngImage("time_line_icon_snapshot"); //$NON-NLS-1$\r
        public static final Image ADD_ITEMS_NORMAL = getPngImage("add_chart_nor"); //$NON-NLS-1$\r
        public static final Image ADD_ITEMS_PUSH = getPngImage("add_chart_push"); //$NON-NLS-1$\r
@@ -190,7 +190,7 @@ public class ImageResources {
        public static final Image TIMLINE_SIZE_MIN_HOVER = getPngImage("time_line_size_min_hover"); //$NON-NLS-1$\r
        public static final Image TIMLINE_SIZE_MIN_PUSH = getPngImage("time_line_size_min_push"); //$NON-NLS-1$\r
        public static final Image ENERGY = getPngImage("time_line_icon_electric_current"); //$NON-NLS-1$\r
-       public static final Image DEVICES = getPngImage("time_line_icon_devices"); //$NON-NLS-1$\r
+       public static final Image CHART_DEVICES = getPngImage("time_line_icon_devices"); //$NON-NLS-1$\r
        public static final Image UI_EVENT = getPngImage("time_line_icon_UI_events"); //$NON-NLS-1$\r
 \r
        /* Resource */\r
@@ -251,13 +251,12 @@ public class ImageResources {
        public static final Image ADD_CHART_ON = getPngImage("dialog_edit_chart_plus"); //$NON-NLS-1$\r
        public static final Image ADD_CHART_CPU = getPngImage("edit_chart_icon_cpu"); //$NON-NLS-1$\r
        public static final Image ADD_CHART_CPU_CORE = getPngImage("edit_chart_icon_cpu_core"); //$NON-NLS-1$\r
-       public static final Image ADD_CHART_MEMORY_HEAP = getPngImage("edit_chart_icon_memory_allocation (2)"); //$NON-NLS-1$\r
-       public static final Image ADD_CHART_MEMORY_PROCESS = getPngImage("edit_chart_icon_memory_process"); //$NON-NLS-1$       \r
-       public static final Image ADD_CHART_MEMORY_ALLOCATION = getPngImage("edit_chart_icon_memory_allocation"); //$NON-NLS-1$\r
+       public static final Image ADD_CHART_PROCESS_MEMORY = getPngImage("edit_chart_icon_memory_process"); //$NON-NLS-1$       \r
+       public static final Image ADD_CHART_HEAP = getPngImage("edit_chart_icon_memory_allocation"); //$NON-NLS-1$\r
        public static final Image ADD_CHART_UI_EVENT = getPngImage("edit_chart_icon_UI_events"); //$NON-NLS-1$\r
-       public static final Image ADD_CHART_READ_WRITE = getPngImage("edit_chart_icon_read_write"); //$NON-NLS-1$\r
+       public static final Image ADD_CHART_FILE = getPngImage("edit_chart_icon_read_write"); //$NON-NLS-1$\r
        public static final Image ADD_CHART_CPU_FREQUENCY = getPngImage("edit_chart_icon_cpu_frequency"); //$NON-NLS-1$\r
-       public static final Image ADD_CHART_MEMORY_SYSTEM = getPngImage("edit_chart_icon_memory_system"); //$NON-NLS-1$\r
+       public static final Image ADD_CHART_SYSTEM_MEMORY = getPngImage("edit_chart_icon_memory_system"); //$NON-NLS-1$\r
        public static final Image ADD_CHART_DEVICE = getPngImage("edit_chart_icon_devices"); //$NON-NLS-1$\r
        public static final Image ADD_CHART_ELECTRIC_CURRENT = getPngImage("edit_chart_icon_electric_current"); //$NON-NLS-1$\r
        public static final Image ADD_CHART_FD_USAGE = getPngImage("edit_chart_icon_fd_usage"); //$NON-NLS-1$\r
index 8967d55..14acdb7 100644 (file)
@@ -23,10 +23,6 @@ public class TimelineConstants {
        public static final int CHART_TYPE_SYSTEM_MEMORY = 22;
        public static final int CHART_TYPE_FILE = 3;
        
-       public static final int CHART_TYPE_DEVICE = 20;
-       public static final int CHART_TYPE_ENERGY = 21;
-       public static final int CHART_TYPE_SNAPSHOT = 19;
-
        public static final int FD_TYPE_FILE = 0;
        public static final int FD_TYPE_SOCKET = 1;
 
index b1f8dc2..c0af07c 100644 (file)
@@ -19,7 +19,6 @@
 
 package org.tizen.dynamicanalyzer.timeline;
 
-import java.util.HashMap;
 import java.util.List;
 
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
@@ -34,8 +33,7 @@ public class CustomLogParser {
        private static final String API_NAME_DA_MARK = "da_mark";  //$NON-NLS-1$
        private static final String API_NAME_TIMER_THREAD = "timerThread";  //$NON-NLS-1$
        
-       private static HashMap<Integer, UserCustomChart> chartMap;
-
+       private static TimelineChartManager chartManager = TimelineChartManager.getInstance();
        
        public static void parsingLogPackage(LogPackage logPack) {
                if(!isAbleToParse(logPack, LogCenterConstants.LOG_CUSTOM)) {
@@ -55,15 +53,9 @@ public class CustomLogParser {
                if(apiName.equals(API_NAME_CREATE_CHART)) {
                        int chartHandle = Integer.parseInt(log.get(LogCenterConstants.CUSTOM_HANDLE));
                        String chartName = log.get(LogCenterConstants.CUSTOM_TEXT);
-                       if(chartMap.containsKey(chartHandle)) {
-                               // ignore
-                       } else {
-                               UserCustomChart customChart = new UserCustomChart(chartHandle, chartName);
-                               chartMap.put(chartHandle, customChart);
-                               TimelineItemsProvider.getInstance().addCustomChart(customChart);
+                       chartManager.addCustomChart(new UserCustomChart(chartHandle, chartName));
                        }
                }
-       }
        
        private static boolean isAbleToParse(LogPackage logPack, int probeType) {
                Logs logList = logPack.getLogs(probeType);
index f87e520..224d4e8 100644 (file)
 package org.tizen.dynamicanalyzer.timeline;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.xy.XYSeries;
+import org.tizen.dynamicanalyzer.ConfigureManager;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUChart;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUCoreChart;
@@ -42,12 +44,15 @@ import org.tizen.dynamicanalyzer.timeline.chart.HeapChart;
 import org.tizen.dynamicanalyzer.timeline.chart.ProcessMemoryChart;
 import org.tizen.dynamicanalyzer.timeline.chart.SystemMemoryChart;
 import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
+import org.tizen.dynamicanalyzer.timeline.chart.UserCustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 
 
 public class TimelineChartManager {
        private static TimelineChartManager instance = null;
        private List<TimelineChart> chartList;
+       private List<TimelineChart> selectedChartList;
+       private HashMap<Integer, UserCustomChart> customChartMap;
 
        public static TimelineChartManager getInstance() {
                if(instance == null) {
@@ -58,11 +63,79 @@ public class TimelineChartManager {
        
        private TimelineChartManager() {
                chartList = new ArrayList<TimelineChart>();
+               selectedChartList = new ArrayList<TimelineChart>();
+               customChartMap = new HashMap<Integer, UserCustomChart>();
+               
+               loadSavedChartList();
+               TimelineItemSettingProvider.initTimelineItemsSetting(chartList);
+               loadSelectedChartList();
+       }
+       
+       private void loadSavedChartList() {
+               String savedChartNameList = ConfigureManager.getInstance().getValue(ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST);
+               String[] chartNameList = savedChartNameList.split(","); //$NON-NLS-1$
+               int size = chartNameList.length;
+
+               if (size > 1) {
+                       for (int i = 0; i < size; i++) {
+                               chartList.add(getChartInstance(chartNameList[i]));
+                       }
+               } else {
+                       if(TimelineItemManager.bCustomChart) {
+                               chartList.add(DACPUChart.getInstance());
+                               chartList.add(DACPUCoreChart.getInstance());
+                               chartList.add(DACPUFrequencyChart.getInstance());
+                               chartList.add(DAHeapChart.getInstance());
+                               chartList.add(DAProcessMemoryChart.getInstance());
+                               chartList.add(DASystemMemoryChart.getInstance());
+                               chartList.add(DAFileChart.getInstance());
+                       } else {
+                               chartList.add(CPUChart.getInstance());
+                               chartList.add(CPUCoreChart.getInstance());
+                               chartList.add(CPUFrequencyChart.getInstance());
+                               chartList.add(HeapChart.getInstance());
+                               chartList.add(ProcessMemoryChart.getInstance());
+                               chartList.add(SystemMemoryChart.getInstance());
+                               chartList.add(FileChart.getInstance());
+                       }
+               }
+       }
+       
+       private void loadSelectedChartList() {
+               String strSaveSelectedItems = ConfigureManager.getInstance().getValue(ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST);
+               if (strSaveSelectedItems.equalsIgnoreCase("")) {
+                       selectedChartList.addAll(chartList);
+               } else {
+                       String[] savedSelectedChartNameList = strSaveSelectedItems.split(","); //$NON-NLS-1$
+                       int size = savedSelectedChartNameList.length;
+                       if (size != 0) {
+                               for (int i = 0; i < size; i++) {
+                                       selectedChartList.add(getChartInstance(savedSelectedChartNameList[i]));
+                               }
+                       }
+               }
+       }
+       
+       public void setChartList(List<TimelineChart> chartList) {
+               this.chartList.clear();
+               this.chartList.addAll(chartList);
        }
 
+       public void setSelectedChartList(List<TimelineChart> chartList) {
+               this.selectedChartList.clear();
+               this.selectedChartList.addAll(chartList);
+       }
+       
+       public List<TimelineChart>  getChartList() {
+               return chartList;
+       }
+       
+       public List<TimelineChart>  getSelectedChartList() {
+               return selectedChartList;
+       }
+       
        public JFreeChart createTimelineChart(int chartType) {
                TimelineChart chart = getChartInstance(chartType);
-               chartList.add(chart);
                
                return chart.createChart();
        }
@@ -74,7 +147,6 @@ public class TimelineChartManager {
                if(timelineChart != null) {
                        chart = timelineChart.createDAChart(parent);
                }
-               chartList.add(timelineChart);
 
                return chart;
        }
@@ -106,7 +178,11 @@ public class TimelineChartManager {
        }
        
        public TimelineChart getChartInstance(String chartName) {
-               return getChartInstance(getChartType(chartName));
+               if(TimelineItemManager.bCustomChart) {
+                       return getDAChartInstance(getChartType(chartName));
+               } else {
+                       return getChartInstance(getChartType(chartName));
+               }
        }
        
        public TimelineChart getChartInstance(int chartType) {
@@ -125,6 +201,8 @@ public class TimelineChartManager {
                        return SystemMemoryChart.getInstance();
                case TimelineConstants.CHART_TYPE_FILE:
                        return FileChart.getInstance();
+               default:
+                       //FIXME custom
                }
                return null;
        }
@@ -145,10 +223,20 @@ public class TimelineChartManager {
                        return DASystemMemoryChart.getInstance();
                case TimelineConstants.CHART_TYPE_FILE:
                        return DAFileChart.getInstance();
+               default:
+                       //FIMXE coustom
                }       
                
                return null;
        }
+       
+       public void addCustomChart(UserCustomChart customChart) {
+               int chartType = customChart.getChartType();
+               if(!customChartMap.containsKey(chartType)) {
+                       customChartMap.put(chartType, customChart);
+                       chartList.add(customChart);
+               }
+       }
 
        public List<XYSeries> getChartSeriesList(int chartType) {
                return getChartInstance(chartType).getBaseSeriesList();
@@ -173,7 +261,12 @@ public class TimelineChartManager {
        public void setAllChartDoaminAxisRange(double start, double end) {
                int chartListSize = chartList.size();
                for (int i = 0; i < chartListSize; i++) {
-                       chartList.get(i).setDomainAxisRange(start, end);
+                       //FIXME 
+                       if(TimelineItemManager.bCustomChart) {
+                               chartList.get(i).setDomainAxisRange(start, end);
+                       } else {
+                               chartList.get(i).setDomainAxisRange(start, end);
+                       }
                }
        }
        
@@ -186,6 +279,12 @@ public class TimelineChartManager {
                for (int i = 0; i < listSize; i++) {
                        chartList.get(i).clear();
                }
+               
+               chartList.clear();
+               selectedChartList.clear();
+               loadSavedChartList();
+               loadSelectedChartList();
+               customChartMap.clear();
        }
        
        public void dispose() {
@@ -199,6 +298,10 @@ public class TimelineChartManager {
                        }
                }
                
-               chartList.clear();
+//             chartList.clear();
+//             selectedChartList.clear();
+//             loadSavedChartList();
+//             loadSelectedChartList();
+//             customChartMap.clear();
        }
 }
index 75fd381..87857dd 100644 (file)
@@ -37,7 +37,6 @@ import org.tizen.dynamicanalyzer.model.DAView;
 import org.tizen.dynamicanalyzer.model.LogPackage;
 import org.tizen.dynamicanalyzer.model.Logs;
 import org.tizen.dynamicanalyzer.model.SnapshotData;
-import org.tizen.dynamicanalyzer.timeline.chart.DACPUChart;
 import org.tizen.dynamicanalyzer.timeline.chart.DATimelineChart;
 import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
 import org.tizen.dynamicanalyzer.ui.views.CoolbarArea;
@@ -46,7 +45,6 @@ import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 
 public class TimelineComposite extends DAView {
        public static final String ID = TimelineComposite.class.getName();
-       private String activedItemName; // for resizing
 
        private TimelineComposite baseShellComp;
        private Composite timeAndMenuComp;
@@ -56,9 +54,9 @@ public class TimelineComposite extends DAView {
 
        private TimelineTick timelineTick;
        private TimelineRangeSelector timelineRangeSelector;
-       private TimelineItemManager timelineItemManager;
-       private TimelineItemsProvider timelineItemsProvider;
-
+       private TimelineItemManager timelineItemManager = TimelineItemManager.getInstance();
+       private TimelineChartManager chartManager = TimelineChartManager.getInstance();
+       
        private Listener compositeResizeListener = new Listener() {
                @Override
                public void handleEvent(Event event) {
@@ -66,7 +64,6 @@ public class TimelineComposite extends DAView {
                                return;
                        }
                        resizeBaseAreaHeight();
-                       setActivateItem(activedItemName);
                }
        };
 
@@ -74,8 +71,6 @@ public class TimelineComposite extends DAView {
                super(parent, style);
 
                timelineRangeSelector = new TimelineRangeSelector();
-               timelineItemManager = new TimelineItemManager();
-               timelineItemsProvider = TimelineItemsProvider.getInstance();
                timelineTick = new TimelineTick();
 
                baseShellComp = (TimelineComposite) createBaseComp(this);
@@ -102,13 +97,8 @@ public class TimelineComposite extends DAView {
 
        }
 
-       public void setActivateItem(String itemID) {
-               timelineItemManager.setActivateItem(itemID);
-               activedItemName = itemID;
-       }
-
-       public void resetItems(List<TimelineChart> selectedChartList) {
-               timelineItemManager.resetItems(selectedChartList);
+       public void resetItems() {
+               timelineItemManager.resetItems();
                ScrolledComposite sc = (ScrolledComposite) itemsAreaComp.getParent();
                sc.setContent(itemsAreaComp);
                sc.setExpandHorizontal(true);
@@ -207,7 +197,7 @@ public class TimelineComposite extends DAView {
                scrolledComp.setExpandVertical(true);
                scrolledComp.setAlwaysShowScrollBars(true);
 
-               resetItems(timelineItemsProvider.getSelectedChartList());
+               resetItems();
 
                return scrolledComp;
        }
@@ -217,20 +207,17 @@ public class TimelineComposite extends DAView {
                        return;
                }
 
-               List<Integer> zoomedItemTypeList = TimelineItemSettingProvider
-                               .getZoomedItemList();
+               List<Integer> zoomedItemTypeList = TimelineItemSettingProvider.getZoomedItemList();
 
                int zoomedItemNum = 0;
                if (null != zoomedItemTypeList) {
                        zoomedItemNum = zoomedItemTypeList.size();
                }
 
-               int defItemNum = timelineItemsProvider.getSelectedChartList().size() - zoomedItemNum;
+               int selectedChartSize = chartManager.getSelectedChartList().size() - zoomedItemNum;
 
-               int defItemsHeight = defItemNum
-                               * TimelineItemSettingProvider.getDefaultSizeMode();
-               int zoomedItemsHeight = zoomedItemNum
-                               * TimelineConstants.ITEM_HEIGHT_MAX;
+               int defItemsHeight = selectedChartSize * TimelineItemSettingProvider.getDefaultSizeMode();
+               int zoomedItemsHeight = zoomedItemNum * TimelineConstants.ITEM_HEIGHT_MAX;
 
                itemsAreaScrolledComp.setMinHeight(defItemsHeight + zoomedItemsHeight);
                timelineItemManager.resizeItems();
@@ -297,16 +284,8 @@ public class TimelineComposite extends DAView {
                                }
                        }
                }
-//             if (null != logList && null != logList.getLogs() && 0 <= logList.getLogs().size()) {
-//                     List<List<String>> deviceLogs = logList.getLogs();
-//                     for (List<String> deviceLog : deviceLogs) {
-//                             if (null == deviceLog || 0 > deviceLog.size()) {
-//                                     return;
-//                             }
-//                     }
-//             }
-
-               List<TimelineChart> chartList = timelineItemsProvider.getChartList();
+
+               List<TimelineChart> chartList = chartManager.getChartList();
                
                //FIXME chart manager
                for (int i = 0; i < chartList.size(); i++) {
@@ -330,7 +309,7 @@ public class TimelineComposite extends DAView {
        @Override
        public void clear() {
                TimelineMaster timelineMaster = TimelineMaster.getInstance();
-               timelineItemManager.clear();
+               chartManager.clear();
                timelineRangeSelector.clear();
                timelineTick.clear();
                timelineMaster.clearSelectionMarker();
index 1e725ff..fdbb403 100644 (file)
@@ -58,8 +58,8 @@ import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.ConfigureManager;
 import org.tizen.dynamicanalyzer.FontResources;
 import org.tizen.dynamicanalyzer.ImageResources;
-import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
+import org.tizen.dynamicanalyzer.timeline.chart.UserCustomChart;
 import org.tizen.dynamicanalyzer.ui.widgets.DAButton;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
@@ -68,11 +68,9 @@ import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener
 public class TimelineEditItemsDialog extends Dialog {
        private Shell parent = null;
        private Shell shell = null;
-       private List<TimelineChart> selectedChartList;
        private TableViewer chartTableViewer;
        private boolean chartChangeSatus = true;
        
-       private TimelineItemsProvider timelineItemsProvider = TimelineItemsProvider.getInstance();
        private TimelineChartManager chartManager = TimelineChartManager.getInstance();
 
        private int ItemIndexA = 0;
@@ -93,32 +91,31 @@ public class TimelineEditItemsDialog extends Dialog {
                        List<TimelineChart> chartList = new ArrayList<TimelineChart>();
                        List<TimelineChart> selectedChartList = new ArrayList<TimelineChart>();
 
-                       StringBuffer strSaveAvailableItems = new StringBuffer("");
-                       StringBuffer strSaveSelectedItems = new StringBuffer("");
+                       StringBuffer strSaveChartNameList = new StringBuffer(""); //$NON-NLS-1$
+                       StringBuffer strSaveSelectedChartNameList = new StringBuffer(""); //$NON-NLS-1$
 
                        for (int i = 0; i < tableitems.length; i++) {
                                chartList.add(chartManager.getChartInstance(tableitems[i].getText(2)));
 
-                               strSaveAvailableItems.append(tableitems[i].getText(2));
-                               strSaveAvailableItems.append(",");
+                               strSaveChartNameList.append(tableitems[i].getText(2));
+                               strSaveChartNameList.append(",");
 
-                               if (tableitems[i].getText(3).equals("selected enable")) {
+                               if (tableitems[i].getText(3).equals("selected enable")) { //$NON-NLS-1$
                                        selectedChartList.add(chartManager.getChartInstance((tableitems[i].getText(2))));
-                                       strSaveSelectedItems.append(tableitems[i].getText(2));
-                                       strSaveSelectedItems.append(",");
+                                       strSaveSelectedChartNameList.append(tableitems[i].getText(2));
+                                       strSaveSelectedChartNameList.append(","); //$NON-NLS-1$
                                }
                        }
 
-                       timelineItemsProvider.setChartList(chartList);
-                       timelineItemsProvider.setSelectedChartList(selectedChartList);
+                       chartManager.setChartList(chartList);
+                       chartManager.setSelectedChartList(selectedChartList);
                        TimelineComposite timelineComposite = AnalyzerUtil.getTimelineComposite();
-                       if (null != timelineComposite) {
-                               timelineComposite.resetItems(selectedChartList);
-                               TimelineMaster.getInstance().redrawTimeTickCanvas();
-                       }
+                       timelineComposite.resetItems();
+                       TimelineMaster.getInstance().redrawTimeTickCanvas();
 
-                       ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, strSaveAvailableItems.toString());
-                       ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, strSaveSelectedItems.toString());
+                       // FIXME remove custom chart informations
+                       ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, strSaveChartNameList.toString());
+                       ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, strSaveSelectedChartNameList.toString());
                        shell.dispose();
                }
        };
@@ -127,13 +124,14 @@ public class TimelineEditItemsDialog extends Dialog {
 
                @Override
                public void handleClickEvent(DACustomButton button) {
+                       // FIXME remove this
+                       chartManager.addCustomChart(new UserCustomChart(55, "custom"));
                        shell.dispose();
                }
        };
 
        @Override
        public int open() {
-
                shell = new Shell(parent, SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM);
                shell.setText("Edit Chart");
                shell.setFont(FontResources.EDIT_CHART_DLG_TITLE);
@@ -169,31 +167,23 @@ public class TimelineEditItemsDialog extends Dialog {
                                new TableColumn(chartTableViewer.getTable(), SWT.NONE).setWidth(0);
                }
 
-               List<TimelineChart> chartList = timelineItemsProvider.getChartList();
-               if (null == chartList || chartList.isEmpty()) {
-                       return -1;
-               }
+               final List<TimelineChart> chartList = chartManager.getChartList();
+               int chartListSize = chartList.size();
+               List<TimelineChart> selectedChartList = chartManager.getSelectedChartList();
 
-               int availableItemsListSize = chartList.size();
-               selectedChartList = timelineItemsProvider.getSelectedChartList();
-
-               if (null == selectedChartList) {
-                       return -1;
-               }
-
-               final TableItem[] items = new TableItem[availableItemsListSize];
-               for (int i = 0; i < availableItemsListSize; i++) {
+               final TableItem[] items = new TableItem[chartListSize];
+               for (int i = 0; i < chartListSize; i++) {
                        items[i] = new TableItem(chartTableViewer.getTable(), SWT.NONE, i);
-                       items[i].setText(0, " ");
+                       items[i].setText(0, String.valueOf(chartList.get(i).getChartType())); //$NON-NLS-1$
                        items[i].setFont(FontResources.EDIT_CHART_DLG_TITLE);
                        items[i].setImage(0, ImageResources.ADD_CHART_CPU);
-                       items[i].setText(1, " ");
+                       items[i].setText(1, " "); //$NON-NLS-1$
                        items[i].setText(2, chartList.get(i).getChartName());
-                       items[i].setText(3, "selected disable");
+                       items[i].setText(3, "selected disable"); //$NON-NLS-1$
 
                        for (int j = 0; j < selectedChartList.size(); j++) {
-                               if (chartList.get(i).equals(selectedChartList.get(j))) {
-                                       items[i].setText(3, "selected enable");
+                               if (chartList.get(i).getChartType() == selectedChartList.get(j).getChartType()) {
+                                       items[i].setText(3, "selected enable"); //$NON-NLS-1$
                                        break;
                                }
                        }
@@ -203,7 +193,6 @@ public class TimelineEditItemsDialog extends Dialog {
                        public void handleEvent(Event event) {
                                switch (event.type) {
                                case SWT.MeasureItem: {
-
                                        TableItem item = (TableItem) event.item;
                                        String text = item.getText(event.index + 1);
                                        Point size = event.gc.textExtent(text);
@@ -232,7 +221,7 @@ public class TimelineEditItemsDialog extends Dialog {
                                        Rectangle rect = event.getBounds();
                                        Color foreground = gc.getForeground();
                                        Color background = gc.getBackground();
-                                       if (strItemStatus_1.equals("selected enable")) {
+                                       if (strItemStatus_1.equals("selected enable")) { //$NON-NLS-1$
                                                event.gc.setForeground(ColorResources.ADD_CHART_ENABLE_COLOR_START);
                                                event.gc.setBackground(ColorResources.ADD_CHART_ENABLE_COLOR_END);
                                        } else {
@@ -245,33 +234,15 @@ public class TimelineEditItemsDialog extends Dialog {
                                        gc.setBackground(background);
                                        event.detail &= ~SWT.SELECTED;
 
-                                       if (strItemStatus_1.equals("selected enable") && event.index == 1) {
+                                       if (strItemStatus_1.equals("selected enable") && event.index == 1) { //$NON-NLS-1$
                                                event.gc.drawImage(ImageResources.ADD_CHART_ON, 370, event.y + 15);
                                        } else {
                                                event.gc.drawImage(ImageResources.ADD_CHART_OFF, 370, event.y + 15);
                                        }
 
-                                       String strItemName = item.getText(2);
-                                       Image itemImage = ImageResources.ADD_CHART_CPU;
-                                       if (strItemName.equalsIgnoreCase("cpu")) {
-                                               itemImage = ImageResources.ADD_CHART_CPU;
-                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.CPU_CORE_CHART_TITLE)) {
-                                               itemImage = ImageResources.ADD_CHART_CPU_CORE;
-                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.HEAP_CHART_TITLE)) {
-                                               itemImage = ImageResources.ADD_CHART_MEMORY_HEAP;
-                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.PROCESS_MEMORY_CHART_TITLE)) {
-                                               itemImage = ImageResources.ADD_CHART_MEMORY_PROCESS;
-                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.SYSTEM_MEMORY_CHART_TITLE)) {
-                                               itemImage = ImageResources.ADD_CHART_MEMORY_ALLOCATION;
-                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.SNAPSHOT_CHART_TITLE)) {
-                                               itemImage = ImageResources.ADD_CHART_UI_EVENT;
-                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.FILE_CHART_TITLE)) {
-                                               itemImage = ImageResources.ADD_CHART_READ_WRITE;
-                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE)) {
-                                               itemImage = ImageResources.ADD_CHART_CPU_FREQUENCY;
-                                       }
                                        if (event.index == 0) {
-                                               event.gc.drawImage(itemImage, 3, event.y);
+                                               Image addIcon = chartManager.getChartInstance(Integer.parseInt(item.getText(0))).getAddIcon();
+                                               event.gc.drawImage(addIcon, 3, event.y);
                                        } else if (event.index == 1) {
                                                event.gc.drawText(itemName, event.x + 20, event.y + offset2 + 15, true);
                                                event.gc.setForeground(ColorResources.BLACK);
@@ -346,18 +317,30 @@ public class TimelineEditItemsDialog extends Dialog {
                                        String strIndexA = null;
                                        String strIndexB = null;
 
+                                       
+                                       strIndexA = chartTableItems[ItemIndexA].getText(0);
+                                       strIndexB = chartTableItems[ItemIndexB].getText(0);
+
+                                       chartTableItems[ItemIndexB].setText(0, strIndexA);
+                                       chartTableItems[ItemIndexA].setText(0, strIndexB);
+                                       
+                                       
                                        strIndexA = chartTableItems[ItemIndexA].getText(2);
                                        strIndexB = chartTableItems[ItemIndexB].getText(2);
 
                                        chartTableItems[ItemIndexB].setText(2, strIndexA);
                                        chartTableItems[ItemIndexA].setText(2, strIndexB);
 
+                                       
+                                       
                                        strIndexA = chartTableItems[ItemIndexB].getText(3);
                                        strIndexB = chartTableItems[ItemIndexA].getText(3);
 
                                        chartTableItems[ItemIndexA].setText(3, strIndexA);
                                        chartTableItems[ItemIndexB].setText(3, strIndexB);
 
+                                       
+                                       
                                        chartTableViewer.getTable().setDragDetect(true);
                                        chartTableViewer.getTable().redraw();
 
@@ -365,6 +348,10 @@ public class TimelineEditItemsDialog extends Dialog {
                                        tempIndex = ItemIndexA;
                                        ItemIndexA = ItemIndexB;
                                        ItemIndexB = tempIndex;
+                                       
+                                       
+                                       
+                                       
                                }
                                ItemDragOverIndex = ItemIndexB;
                        }
@@ -427,10 +414,10 @@ public class TimelineEditItemsDialog extends Dialog {
                                Table table = chartTableViewer.getTable();
                                int selectItemIndex = table.getSelectionIndex();
                                TableItem[] chartTableItems = chartTableViewer.getTable().getItems();
-                               if (chartTableItems[selectItemIndex].getText(3).equals("selected enable")) {
-                                       chartTableItems[selectItemIndex].setText(3, "selected disable");
-                               } else if (chartTableItems[selectItemIndex].getText(3).equals("selected disable")) {
-                                       chartTableItems[selectItemIndex].setText(3, "selected enable");
+                               if (chartTableItems[selectItemIndex].getText(3).equals("selected enable")) { //$NON-NLS-1$
+                                       chartTableItems[selectItemIndex].setText(3, "selected disable"); //$NON-NLS-1$
+                               } else if (chartTableItems[selectItemIndex].getText(3).equals("selected disable")) { //$NON-NLS-1$
+                                       chartTableItems[selectItemIndex].setText(3, "selected enable"); //$NON-NLS-1$
                                }
                                chartTableViewer.getTable().redraw();
                        }
index ec7bd41..50cb5c3 100755 (executable)
@@ -71,7 +71,6 @@ import org.tizen.dynamicanalyzer.model.SnapshotData;
 import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
 import org.tizen.dynamicanalyzer.ui.views.CoolbarArea;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartPlot;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartPlotIntervalMarker;
@@ -79,19 +78,21 @@ import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartPlotTooltip;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 
 public class TimelineItemManager {
-       private static final int ITEM_INFO_ZOOM_HEIGHT = 16;
-       private static final int ITEM_INFO_ICON_HEIGHT = 50;
-       private static final int ITEM_INFO_LABEL_HEIGHT = 20;
+       private static TimelineItemManager instance = null;
+       
+       private final int ITEM_INFO_ZOOM_HEIGHT = 16;
+       private final int ITEM_INFO_ICON_HEIGHT = 50;
+       private final int ITEM_INFO_LABEL_HEIGHT = 20;
 
-       private static final int MARGIN = 5;
-       private static final int SPACING = 0;
+       private final int MARGIN = 5;
+       private final int SPACING = 0;
 
-       private static final int TOOLTIP_MARGIN = 20;
+       private final int TOOLTIP_MARGIN = 20;
 
        private Composite itemsAreaComp; // same with TimelineView's
        private TimelineChartManager chartManager = TimelineChartManager.getInstance();
 
-       List<ItemInfo> realTimeItemList;
+       List<ItemInfo> itemInfoList;
        List<ItemInfo> seletedItemList;
        List<Label> indexInfoLabelList;
 
@@ -107,43 +108,41 @@ public class TimelineItemManager {
        private double tempDownTime = TempConstants.NOT_INITED;
        private double tempUpTime = TempConstants.NOT_INITED;
 
-       public static boolean bCustomChart = false; // FIXME
+       public static boolean bCustomChart = true; // FIXME
 
-       class ItemInfo {
+       private class ItemInfo {
                public int itemType;
                public String itemName;
                public ItemInfoComposite infoComp;
                public ChartComposite chartComp;
-               public Composite DAChartComp;
                public Composite itemComp;
-               public boolean isSelected;
        }
 
-       public class ItemInfoComposite extends Composite {
+       private class ItemInfoComposite extends Composite {
                public String itemName;
                private Label infoZoomLabel;
                private Label infoIconLabel;
                private Label infoTextLabel;
 
-               public ItemInfoComposite(Composite parent, int style) {
+               private ItemInfoComposite(Composite parent, int style) {
                        super(parent, style);
                }
 
-               public Label getIconLabel() {
+               private Label getIconLabel() {
                        return infoIconLabel;
                }
+       }
 
-               public Label getInfoTextLabel() {
-                       return infoTextLabel;
-               }
-
-               public Label getInfoZoomLabel() {
-                       return infoZoomLabel;
+       public static TimelineItemManager getInstance() {
+               if(instance == null) {
+                       instance = new TimelineItemManager();
                }
+               
+               return instance;
        }
-
-       public TimelineItemManager() {
-               realTimeItemList = new ArrayList<ItemInfo>();
+       
+       private TimelineItemManager() {
+               itemInfoList = new ArrayList<ItemInfo>();
                seletedItemList = new ArrayList<ItemInfo>();
                indexInfoLabelList = new ArrayList<Label>(4);
 
@@ -179,7 +178,6 @@ public class TimelineItemManager {
                        TimelineComposite timelineComposite = AnalyzerUtil.getTimelineComposite();
                        if (null != timelineComposite) {
                                timelineComposite.resizeItemArea();
-                               setActivateItem(itemInfoComp.itemName);
 
                                if (TimelineConstants.ITEM_SIZE_MODE_MAX == TimelineItemSettingProvider.getItemSetting(itemID).getSizeMode()) {
                                        focusItem(itemID);
@@ -188,37 +186,6 @@ public class TimelineItemManager {
                }
        };
 
-       private MouseListener itemCompMouseListener = new MouseAdapter() {
-               @Override
-               public void mouseDown(MouseEvent e) {
-                       ItemInfoComposite itemInfoComp = (ItemInfoComposite) e.getSource();
-
-                       if (null == itemInfoComp) {
-                               return;
-                       }
-
-                       setActivateItem(itemInfoComp.itemName);
-               }
-       };
-
-       private MouseListener itemLableMouseListener = new MouseAdapter() {
-               @Override
-               public void mouseDown(MouseEvent e) {
-                       Label label = (Label) (e.getSource());
-                       if (null == label) {
-                               return;
-                       }
-
-                       ItemInfoComposite itemInfoComp = (ItemInfoComposite) label.getParent();
-
-                       if (null == itemInfoComp) {
-                               return;
-                       }
-
-                       setActivateItem(itemInfoComp.itemName);
-               }
-       };
-
        private Listener resizeListenerBG = new Listener() {
                @Override
                public void handleEvent(Event event) {
@@ -512,11 +479,7 @@ public class TimelineItemManager {
                SnapshotData.getInstance().querySnapshotInfo(runTimeMs * TimelineConstants.TIME_US_TO_MS);
        }
 
-       public void clear() {
-               chartManager.clear();
-       }
-
-       public void dispose() {
+       private void dispose() {
                if (null != itemImage) {
                        itemImage.dispose();
                        itemImage = null;
@@ -529,8 +492,8 @@ public class TimelineItemManager {
                        chartManager.dispose();
                }
 
-               if (null != realTimeItemList) {
-                       clearItemList(realTimeItemList);
+               if (null != itemInfoList) {
+                       clearItemList(itemInfoList);
                }
 
                Control[] controls = itemsAreaComp.getChildren();
@@ -541,38 +504,13 @@ public class TimelineItemManager {
                selectionMarker = null;
        }
 
-       public void setActivateItem(String itemID) {
-               ItemInfo selItem = null;
-
-               for (int i = 0; i < realTimeItemList.size(); i++) {
-
-                       String itemName = realTimeItemList.get(i).itemName;
-
-                       if (itemName.equals(itemID)) {
-                               realTimeItemList.get(i).isSelected = true;
-                               selItem = realTimeItemList.get(i);
-                       } else {
-                               realTimeItemList.get(i).isSelected = false;
-                       }
-               }
-
-               if (null == selItem) {
-                       return;
-               }
-
-               return;
-       }
-
-       public void resetItems(List<TimelineChart> selectedChartList) {
-               if (null == selectedChartList) {
-                       return;
-               }
-
+       public void resetItems() {
+               List<TimelineChart> selectedChartList = chartManager.getSelectedChartList();
                dispose();
 
                for (int i = 0; i < selectedChartList.size(); i++) {
-                       ItemInfo info = createItemInfo(itemsAreaComp, selectedChartList.get(i).getChartType());
-                       realTimeItemList.add(info);
+                       ItemInfo info = createItemInfo(itemsAreaComp, selectedChartList.get(i));
+                       itemInfoList.add(info);
                }
        }
 
@@ -645,59 +583,54 @@ public class TimelineItemManager {
        }
 
        private Composite createItemArea(Composite itemAreaComp) {
-               realTimeItemList.add(createItemInfo(itemAreaComp, TimelineConstants.CHART_TYPE_CPU));
-               realTimeItemList.add(createItemInfo(itemAreaComp, TimelineConstants.CHART_TYPE_CPU_CORE));
-               realTimeItemList.add(createItemInfo(itemAreaComp, TimelineConstants.CHART_TYPE_CPU_FREQUENCY));
-               realTimeItemList.add(createItemInfo(itemAreaComp, TimelineConstants.CHART_TYPE_HEAP));
-               realTimeItemList.add(createItemInfo(itemAreaComp, TimelineConstants.CHART_TYPE_PROCESS_MEMORY));
-               realTimeItemList.add(createItemInfo(itemAreaComp, TimelineConstants.CHART_TYPE_SYSTEM_MEMORY));
-               realTimeItemList.add(createItemInfo(itemAreaComp, TimelineConstants.CHART_TYPE_FILE));
+               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU)));
+               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU_CORE)));
+               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU_FREQUENCY)));
+               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_HEAP)));
+               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_PROCESS_MEMORY)));
+               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_SYSTEM_MEMORY)));
+               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_FILE)));
 
                TimelineMaster.getInstance().redrawTimeTickCanvas();
 
                return itemAreaComp;
        }
 
-       private ItemInfo createItemInfo(Composite parent, int chartType) {
+       private ItemInfo createItemInfo(Composite parent, TimelineChart chart) {
                ItemInfo info;
                if (bCustomChart == true) {
-                       info = createDAItem(parent, chartType);
+                       info = createDAItem(parent, chart);
                } else {
-                       info = createItem(parent, chartType);
+                       info = createItem(parent, chart);
                }
 
                return info;
        }
 
-       private ItemInfoComposite createItemInfoComp(Composite parent, int chartType) {
-               String info = chartManager.getChartName(chartType);
+       private ItemInfoComposite createItemInfoComp(Composite parent, TimelineChart chart) {
+               String chartName = chart.getChartName();
 
                ItemInfoComposite infoComp = new ItemInfoComposite(parent, SWT.NONE);
-               infoComp.itemName = info;
-
-               infoComp.addMouseListener(itemCompMouseListener);
+               infoComp.itemName = chartName;
 
                FormLayout fLayout = new FormLayout();
                infoComp.setLayout(fLayout);
 
-               if (chartType != TimelineConstants.CHART_TYPE_SNAPSHOT && chartType != TimelineConstants.CHART_TYPE_DEVICE) {
-                       addZoomLabel(infoComp, chartType);
-               }
-               addIconInfoLabel(infoComp, chartType);
-               addTextInfoLabel(infoComp, chartType, false);
+               addZoomLabel(infoComp, chartName);
+               addIconInfoLabel(infoComp, chart);
+               addTextInfoLabel(infoComp, chartName, false);
 
                return infoComp;
        }
 
-       private void addZoomLabel(ItemInfoComposite infoComp, int chartType) {
+       private void addZoomLabel(ItemInfoComposite infoComp, String chartName) {
                if (null == infoComp || infoComp.isDisposed()) {
                        return;
                }
 
-               String info = chartManager.getChartName(chartType);
 
                infoComp.infoZoomLabel = new Label(infoComp, SWT.NONE);
-               infoComp.infoZoomLabel.setText(info);
+               infoComp.infoZoomLabel.setText(chartName);
                infoComp.infoZoomLabel.setImage(ImageResources.TIMLINE_FULL);
                infoComp.infoZoomLabel.setAlignment(SWT.RIGHT);
                FormData fData2 = new FormData(ITEM_INFO_ZOOM_HEIGHT, ITEM_INFO_ZOOM_HEIGHT);
@@ -709,23 +642,20 @@ public class TimelineItemManager {
                infoComp.infoZoomLabel.addMouseListener(itemZoomMouseListener);
        }
 
-       private void addIconInfoLabel(ItemInfoComposite infoComp, int chartType) {
+       private void addIconInfoLabel(ItemInfoComposite infoComp, TimelineChart chart) {
                if (null == infoComp || infoComp.isDisposed()) {
                        return;
                }
 
                infoComp.infoIconLabel = new Label(infoComp, SWT.NONE);
-               infoComp.infoIconLabel.setImage(TimelineUtils.getIconImage(chartType));
+               infoComp.infoIconLabel.setImage(chart.getChartIcon());
                infoComp.infoIconLabel.setAlignment(SWT.CENTER);
                FormData fData = new FormData(TimelineConstants.TIMELINE_ITEM_INFO_WIDTH, ITEM_INFO_ICON_HEIGHT);
                fData.top = new FormAttachment(8, 0);
                infoComp.infoIconLabel.setLayoutData(fData);
-               infoComp.infoIconLabel.addMouseListener(itemLableMouseListener);
        }
 
-       private boolean addTextInfoLabel(ItemInfoComposite infoComp, int chartType, boolean isAlone) {
-               String info = chartManager.getChartName(chartType);
-
+       private boolean addTextInfoLabel(ItemInfoComposite infoComp, String chartName, boolean isAlone) {
                if (null == infoComp || infoComp.isDisposed()) {
                        return false;
                }
@@ -733,7 +663,7 @@ public class TimelineItemManager {
                infoComp.infoTextLabel = new Label(infoComp, SWT.NONE);
                infoComp.infoTextLabel.setFont(FontResources.TIMELINE_FONT);
                infoComp.infoTextLabel.setForeground(ColorResources.WHITE);
-               infoComp.infoTextLabel.setText(info);
+               infoComp.infoTextLabel.setText(chartName);
                infoComp.infoTextLabel.setAlignment(SWT.CENTER);
                FormData fData2 = new FormData(TimelineConstants.TIMELINE_ITEM_INFO_WIDTH, ITEM_INFO_LABEL_HEIGHT);
                if (isAlone) {
@@ -744,12 +674,10 @@ public class TimelineItemManager {
                fData2.left = new FormAttachment(0, 0);
                infoComp.infoTextLabel.setLayoutData(fData2);
 
-               infoComp.infoTextLabel.addMouseListener(itemLableMouseListener);
-
                return true;
        }
 
-       private ItemInfo createItem(Composite parent, int chartType) {
+       private ItemInfo createItem(Composite parent, TimelineChart chart) {
                ItemInfo iteminfo = new ItemInfo();
 
                iteminfo.itemComp = new Composite(parent, SWT.NONE);
@@ -766,43 +694,30 @@ public class TimelineItemManager {
                iteminfo.itemComp.setBackground(ColorResources.GRAY_170);
 
                /* Item info composite */
-               final ItemInfoComposite itemInfoComp = createItemInfoComp(iteminfo.itemComp, chartType);
-               if (chartType == TimelineConstants.CHART_TYPE_SNAPSHOT) {
-                       TempConstants.isSnapshotChartDisposed = false;
-               }
+               final ItemInfoComposite itemInfoComp = createItemInfoComp(iteminfo.itemComp, chart);
                GridData gDataInfo = new GridData();
-               if (chartType == TimelineConstants.CHART_TYPE_SNAPSHOT || chartType == TimelineConstants.CHART_TYPE_DEVICE) {
-                       gDataInfo.heightHint = TimelineConstants.ITEM_HEIGHT_DEF;
-                       gDataInfo.verticalAlignment = GridData.BEGINNING;
-               } else {
-                       gDataInfo.verticalAlignment = GridData.FILL;
-                       gDataInfo.grabExcessVerticalSpace = true;
-               }
+               gDataInfo.verticalAlignment = GridData.FILL;
+               gDataInfo.grabExcessVerticalSpace = true;
                gDataInfo.widthHint = TimelineConstants.TIMELINE_ITEM_INFO_WIDTH;
                itemInfoComp.setLayoutData(gDataInfo);
 
                itemInfoComp.addListener(SWT.Resize, resizeListenerBG);
 
                /* Item Chart composite */
-               JFreeChart chart = chartManager.createTimelineChart(chartType);
-               final ChartComposite itemChartComposite = new ChartComposite(iteminfo.itemComp, SWT.NONE, chart, true) {
+               JFreeChart jfreeChart = chart.createChart();
+               final ChartComposite itemChartComposite = new ChartComposite(iteminfo.itemComp, SWT.NONE, jfreeChart, true) {
                        protected Menu createPopupMenu(boolean properties, boolean save, boolean print, boolean zoom) {
                                return null;
                        }
                };
-               itemChartComposite.setData(chartType);
+               itemChartComposite.setData(chart.getChartType());
 
                GridData gDataChart;
-               if (chartType == TimelineConstants.CHART_TYPE_SNAPSHOT || chartType == TimelineConstants.CHART_TYPE_DEVICE) {
-                       gDataChart = new GridData(GridData.FILL_HORIZONTAL);
-                       gDataChart.heightHint = TempConstants.JFREE_MIN_SIZE;
-               } else {
-                       gDataChart = new GridData();
-                       gDataChart.horizontalAlignment = GridData.FILL;
-                       gDataChart.grabExcessHorizontalSpace = true;
-                       gDataChart.verticalAlignment = GridData.FILL;
-                       gDataChart.grabExcessVerticalSpace = true;
-               }
+               gDataChart = new GridData();
+               gDataChart.horizontalAlignment = GridData.FILL;
+               gDataChart.grabExcessHorizontalSpace = true;
+               gDataChart.verticalAlignment = GridData.FILL;
+               gDataChart.grabExcessVerticalSpace = true;
                itemChartComposite.setLayoutData(gDataChart);
 
                itemChartComposite.setDomainZoomable(false);
@@ -819,13 +734,13 @@ public class TimelineItemManager {
                iteminfo.infoComp = itemInfoComp;
                iteminfo.chartComp = itemChartComposite;
 
-               iteminfo.itemType = chartType;
-               iteminfo.itemName = chartManager.getChartName(chartType);
+               iteminfo.itemType = chart.getChartType();
+               iteminfo.itemName = chart.getChartName();
 
                return iteminfo;
        }
 
-       private ItemInfo createDAItem(Composite parent, int chartType) {
+       private ItemInfo createDAItem(Composite parent, TimelineChart chart) {
                ItemInfo iteminfo = new ItemInfo();
 
                iteminfo.itemComp = new Composite(parent, SWT.NONE);
@@ -842,7 +757,7 @@ public class TimelineItemManager {
                iteminfo.itemComp.setBackground(ColorResources.GRAY_170);
 
                /* Item info composite */
-               final ItemInfoComposite itemInfoComp = createItemInfoComp(iteminfo.itemComp, chartType);
+               final ItemInfoComposite itemInfoComp = createItemInfoComp(iteminfo.itemComp, chart);
 
                GridData gDataInfo = new GridData();
 
@@ -861,9 +776,9 @@ public class TimelineItemManager {
                itemChartComposite.setLayout(layout);
                itemChartComposite.setBackground(ColorResources.WINDOW_BG_COLOR);
                
-               DACustomChart chart = chartManager.createDATimelineChart(itemChartComposite, chartType);
+               DACustomChart customChart = chartManager.createDATimelineChart(itemChartComposite, chart.getChartType());
 
-               itemChartComposite.setData(chartType);
+               itemChartComposite.setData(chart.getChartType());
 
                GridData gDataChart;
                gDataChart = new GridData();
@@ -873,11 +788,11 @@ public class TimelineItemManager {
                gDataChart.grabExcessVerticalSpace = true;
                itemChartComposite.setLayoutData(gDataChart);
 
-               chart.addListener(SWT.MouseMove, chartMouseListener);
-               chart.addListener(SWT.MouseDown, chartMouseListener);
-               chart.addListener(SWT.MouseUp, chartMouseListener);
-               chart.addListener(SWT.MouseEnter, chartMouseListener);
-               chart.addListener(SWT.MouseExit, chartMouseListener);
+               customChart.addListener(SWT.MouseMove, chartMouseListener);
+               customChart.addListener(SWT.MouseDown, chartMouseListener);
+               customChart.addListener(SWT.MouseUp, chartMouseListener);
+               customChart.addListener(SWT.MouseEnter, chartMouseListener);
+               customChart.addListener(SWT.MouseExit, chartMouseListener);
                // itemChartComposite.addMouseMoveListener(itemMouseMouveListener);
 
                // itemChartComposite.getChart().getXYPlot().addDomainMarker(selectionMarker,
@@ -887,13 +802,12 @@ public class TimelineItemManager {
                        initIntervalMarker();
                }
 
-               chart.getPlot().setIntervalMarker(intervalMarker);
+               customChart.getPlot().setIntervalMarker(intervalMarker);
 
                iteminfo.infoComp = itemInfoComp;
-               iteminfo.DAChartComp = itemChartComposite;
 
-               iteminfo.itemType = chartType;
-               iteminfo.itemName = chartManager.getChartName(chartType);
+               iteminfo.itemType = chart.getChartType();
+               iteminfo.itemName = chart.getChartName();
 
                return iteminfo;
        }
@@ -919,9 +833,9 @@ public class TimelineItemManager {
 
                int width = itemsAreaComp.getBounds().width;
 
-               for (int i = 0; i < realTimeItemList.size(); i++) {
-                       TimelineItemSetting itemSetting = TimelineItemSettingProvider.getItemSetting(realTimeItemList.get(i).itemType);
-                       setItemSize(realTimeItemList.get(i), width, itemSetting.getSizeMode());
+               for (int i = 0; i < itemInfoList.size(); i++) {
+                       TimelineItemSetting itemSetting = TimelineItemSettingProvider.getItemSetting(itemInfoList.get(i).itemType);
+                       setItemSize(itemInfoList.get(i), width, itemSetting.getSizeMode());
                }
 
                itemsAreaComp.layout();
@@ -1012,14 +926,14 @@ public class TimelineItemManager {
 
        private ItemInfo getItemInfo(int chartType) {
                ItemInfo itemInfo = null;
-               if (null == realTimeItemList) {
+               if (null == itemInfoList) {
                        return itemInfo;
                }
 
                String itemName = chartManager.getChartName(chartType);
-               for (int i = 0; i < realTimeItemList.size(); i++) {
-                       if (itemName.equals(realTimeItemList.get(i).itemName)) {
-                               return realTimeItemList.get(i);
+               for (int i = 0; i < itemInfoList.size(); i++) {
+                       if (itemName.equals(itemInfoList.get(i).itemName)) {
+                               return itemInfoList.get(i);
                        }
                }
 
@@ -1053,19 +967,19 @@ public class TimelineItemManager {
 
                if (isIconVisible) {
                        if (null == infoComp.getIconLabel() || infoComp.getIconLabel().isDisposed()) {
-                               addIconInfoLabel(infoComp, chartManager.getChartType(infoComp.itemName));
+                               addIconInfoLabel(infoComp, chartManager.getChartInstance(infoComp.itemName));
 
                                if (null != infoComp.infoTextLabel) {
                                        infoComp.infoTextLabel.dispose();
                                }
-                               addTextInfoLabel(infoComp, chartManager.getChartType(infoComp.itemName), false);
+                               addTextInfoLabel(infoComp, infoComp.itemName, false);
                        }
                } else {
                        if (null != infoComp.infoIconLabel) {
                                infoComp.infoIconLabel.dispose();
                                infoComp.infoTextLabel.dispose();
 
-                               boolean isSucced = addTextInfoLabel(infoComp, chartManager.getChartType(infoComp.itemName), true);
+                               boolean isSucced = addTextInfoLabel(infoComp, infoComp.itemName, true);
                                if (isSucced) {
                                        infoComp.layout();
                                }
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSelector.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSelector.java
deleted file mode 100644 (file)
index 0f7b1f2..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  Dynamic Analyzer
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: 
- * Sanghyun Lee <sanghyunnim.lee@samsung.com>
- * Juyoung Kim <j0.kim@samsung.com>
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * - S-Core Co., Ltd
- * 
- */
-
-package org.tizen.dynamicanalyzer.timeline;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.tizen.dynamicanalyzer.ColorResources;
-
-
-public class TimelineItemSelector {
-
-       class IconInfo {
-               String iconName;
-               // Label iconBtn;
-               Button iconBtn;
-               boolean isSelected = false;
-       }
-
-       // private int tabID;
-       private List<IconInfo> iconInfoList;
-       // private int AVAIL_CHART_NUM;
-       private int BTN_HEIGHT = 30; // TODO constants
-
-       private TimelineComposite timelineComposite = null;
-
-       /* TODO: remove , for Test */
-       private Image testIcon;
-
-       private Composite itemSelectorComp;
-
-       private SelectionListener toggleBtnListener = new SelectionListener() {
-
-               @Override
-               public void widgetSelected(SelectionEvent e) {
-                       Button btn = (Button) e.getSource();
-
-                       setBtnSeleted(btn.getToolTipText());
-               }
-
-               @Override
-               public void widgetDefaultSelected(SelectionEvent e) {
-               }
-       };
-
-       public TimelineItemSelector() {
-
-               // AVAIL_CHART_NUM = TimelineConstants.CHART_NUM_IN_VIEW_DEFAULT;
-               iconInfoList = new ArrayList<IconInfo>();
-               testIcon = PlatformUI.getWorkbench().getSharedImages()
-                               .getImage(ISharedImages.IMG_OBJ_FILE);
-       }
-
-       public Composite createItemSelector(Composite parent, int ID,
-                       List<String> idList) {
-
-               // tabID = ID;
-
-               itemSelectorComp = new Composite(parent, SWT.None);
-               FillLayout fLayout = new FillLayout();
-               fLayout.type = SWT.VERTICAL;
-               fLayout.marginWidth = 3;
-               itemSelectorComp.setLayout(fLayout);
-
-               addItemIcons(itemSelectorComp, idList);
-
-               itemSelectorComp.addListener(SWT.Resize, new Listener() {
-
-                       @Override
-                       public void handleEvent(Event event) {
-
-                               if (null == itemSelectorComp) {
-                                       return;
-                               }
-
-                               int height = itemSelectorComp.getBounds().height;
-                               int itemNum = iconInfoList.size();
-                               int marginHeight = height - (itemNum * BTN_HEIGHT);
-
-                               FillLayout fLayout = (FillLayout) itemSelectorComp.getLayout();
-
-                               if (0 >= marginHeight) {
-                                       fLayout.marginHeight = 0;
-                               } else {
-                                       fLayout.marginHeight = marginHeight / 2;
-                               }
-
-                               itemSelectorComp.setLayout(fLayout);
-
-                       }
-               });
-
-               itemSelectorComp.setBackground(ColorResources.WINDOW_BG_COLOR);
-
-               return itemSelectorComp;
-
-       }
-
-       public void setTimelineComposite(TimelineComposite timelineComposite) {
-               this.timelineComposite = timelineComposite;
-       }
-
-       private void addItemIcons(Composite parent, List<String> idList) {
-
-               if (null == idList || idList.isEmpty()) {
-                       return;
-               }
-
-               int idNum = idList.size();
-               for (int i = 0; i < idNum; i++) {
-                       IconInfo iconInfo = createIconInfo(parent, idList.get(i));
-                       iconInfoList.add(iconInfo);
-               }
-
-               initIconList(iconInfoList);
-
-       }
-
-       private void initIconList(List<IconInfo> iInfoList) {
-
-               // if (AnalyzerConstants.BATTERY_ANALYSIS_PAGE == tabID) {
-               // AVAIL_CHART_NUM = TimelineConstants.CHART_NUM_IN_BATVIEW_DEFAULT;
-               // }
-
-               iInfoList.get(0).isSelected = true;
-       }
-
-       private IconInfo createIconInfo(Composite parent, String iconName) {
-
-               IconInfo iconInfo = new IconInfo();
-               iconInfo.iconName = iconName;
-
-               iconInfo.iconBtn = new Button(parent, SWT.PUSH);
-
-               iconInfo.iconBtn.setToolTipText(iconName);
-
-               iconInfo.iconBtn.addSelectionListener(toggleBtnListener);
-
-               iconInfo.iconBtn.setBackground(ColorResources.WINDOW_BG_COLOR);
-               iconInfo.iconBtn.setForeground(ColorResources.PURPLE);
-
-               iconInfo.iconBtn.setImage(testIcon);
-
-               return iconInfo;
-       }
-
-       private void setBtnSeleted(String ID) {
-
-               /* get IconInfo */
-               IconInfo iconInfo = null;
-               int size = iconInfoList.size();
-
-               for (int i = 0; i < size; i++) {
-                       if (ID.equals(iconInfoList.get(i).iconName)) {
-                               iconInfoList.get(i).isSelected = true;
-                               iconInfo = iconInfoList.get(i);
-                       } else {
-                               iconInfoList.get(i).isSelected = false;
-                       }
-               }
-
-               if (null == iconInfo) {
-                       return;
-               }
-
-               if (null != timelineComposite) {
-                       timelineComposite.setActivateItem(iconInfo.iconName);
-               }
-       }
-}
index d9a8fff..4a2033b 100644 (file)
@@ -112,9 +112,7 @@ public class TimelineItemSettingProvider {
 
                for (int i = 0; i < itemSettingList.size(); i++) {
                        TimelineItemSetting itemSetting = itemSettingList.get(i);
-                       if (itemSetting.getItemType() != TimelineConstants.CHART_TYPE_DEVICE && itemSetting.getItemType() != TimelineConstants.CHART_TYPE_SNAPSHOT) {
-                               itemSetting.setSizeMode(BASE_SIZE_MODE);
-                       }
+                       itemSetting.setSizeMode(BASE_SIZE_MODE);
                }
        }
 
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemsProvider.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemsProvider.java
deleted file mode 100644 (file)
index 299c181..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  Dynamic Analyzer
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: 
- * Sanghyun Lee <sanghyunnim.lee@samsung.com>
- * Juyoung Kim <j0.kim@samsung.com>
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * - S-Core Co., Ltd
- * 
- */
-
-package org.tizen.dynamicanalyzer.timeline;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.tizen.dynamicanalyzer.ConfigureManager;
-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.FileChart;
-import org.tizen.dynamicanalyzer.timeline.chart.HeapChart;
-import org.tizen.dynamicanalyzer.timeline.chart.ProcessMemoryChart;
-import org.tizen.dynamicanalyzer.timeline.chart.SystemMemoryChart;
-import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
-import org.tizen.dynamicanalyzer.timeline.chart.UserCustomChart;
-
-public class TimelineItemsProvider {
-       private static TimelineItemsProvider timelineItemsProvider = null;
-       
-       private TimelineChartManager chartManager = TimelineChartManager.getInstance();
-       private List<TimelineChart> chartList;
-       private List<TimelineChart> selectedChartList;
-       
-       public static TimelineItemsProvider getInstance() {
-               if(timelineItemsProvider == null) {
-                       timelineItemsProvider = new TimelineItemsProvider();
-               }
-               
-               return timelineItemsProvider;
-       }
-       
-       private TimelineItemsProvider() {
-               // init chart list, selected chart list
-               chartList = new ArrayList<TimelineChart>();
-
-               String strSaveDefaultItems = ConfigureManager.getInstance().getValue(ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST);
-               String[] splitData = strSaveDefaultItems.split(","); //$NON-NLS-1$
-               int size = splitData.length;
-
-               if (size > 1) {
-                       for (int i = 0; i < size; i++) {
-                               chartList.add(chartManager.getChartInstance(splitData[i]));
-                       }
-               } else {
-                       chartList.add(CPUChart.getInstance());
-                       chartList.add(CPUCoreChart.getInstance());
-                       chartList.add(CPUFrequencyChart.getInstance());
-                       chartList.add(HeapChart.getInstance());
-                       chartList.add(ProcessMemoryChart.getInstance());
-                       chartList.add(SystemMemoryChart.getInstance());
-                       chartList.add(FileChart.getInstance());
-               }
-               TimelineItemSettingProvider.initTimelineItemsSetting(chartList);
-               initSelectedItemsList();
-       }
-       
-
-       private void initSelectedItemsList() {
-               selectedChartList = new ArrayList<TimelineChart>();
-               
-               String strSaveSelectedItems  = ConfigureManager.getInstance().getValue(ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST);
-               
-               if ( strSaveSelectedItems.equalsIgnoreCase("") ){
-                       selectedChartList.addAll(chartList);
-               }
-               else{
-                       String[] splitData = strSaveSelectedItems.split(","); //$NON-NLS-1$
-                       int size = splitData.length;
-                       if ( size != 0 ){
-                               for ( int i = 0 ; i < size ; i++ ){
-                                       selectedChartList.add(chartManager.getChartInstance(splitData[i]));
-                               }
-                       }       
-               }
-       }
-
-       public List<TimelineChart> getChartList() {
-               return chartList;
-       }
-       public void setChartList(List<TimelineChart> selectedList) {
-               chartList.clear();
-               chartList.addAll(selectedList);
-       }
-       public List<TimelineChart> getSelectedChartList() {
-               if (null == selectedChartList) {
-                       initSelectedItemsList();
-               }
-
-               return selectedChartList;
-       }
-
-       public void setSelectedChartList(List<TimelineChart> selectedList) {
-               if (null == selectedChartList) {
-                       initSelectedItemsList();
-               }
-               selectedChartList.clear();
-               selectedChartList.addAll(selectedList);
-       }
-       
-       public void addCustomChart(UserCustomChart customChart) {
-               chartList.add(customChart);
-       }
-}
index 151c9f7..579ae3e 100644 (file)
@@ -37,6 +37,7 @@ import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.experimental.swt.SWTUtils;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -63,6 +64,8 @@ public class CPUChart extends TimelineChart {
        private CPUChart() {
                chartType = TimelineConstants.CHART_TYPE_CPU;
                chartName = TimelineChartLabels.CPU_CHART_TITLE;
+               chartIcon = ImageResources.CHART_CPU;
+               addIcon = ImageResources.ADD_CHART_CPU;
                
                /* app load */
                if(appLoadSeriesDataSet == null) {
index 7a634f0..2056dd1 100644 (file)
@@ -36,6 +36,7 @@ import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.experimental.swt.SWTUtils;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -67,6 +68,8 @@ public class CPUCoreChart extends TimelineChart {
        private CPUCoreChart() {
                chartType = TimelineConstants.CHART_TYPE_CPU_CORE;
                chartName = TimelineChartLabels.CPU_CORE_CHART_TITLE;
+               chartIcon = ImageResources.CHART_CPU_CORE;
+               addIcon = ImageResources.ADD_CHART_CPU_CORE;
                
                /* core0 */
                if(core0ChartSeriesDataSet == null) {
index 5b22a3b..7bd66c9 100644 (file)
@@ -36,6 +36,7 @@ import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.experimental.swt.SWTUtils;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -65,6 +66,8 @@ public class CPUFrequencyChart extends TimelineChart {
        private CPUFrequencyChart() {
                chartType = TimelineConstants.CHART_TYPE_CPU_FREQUENCY;
                chartName = TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE;
+               chartIcon = ImageResources.CHART_CPU_FREQUENCY;
+               addIcon = ImageResources.ADD_CHART_CPU_FREQUENCY;
                
                if (freequencySeriesDataSet == null) {
                        freequencySeriesDataSet = new SeriesDataSet();
index 4baea41..279aa2f 100644 (file)
@@ -25,6 +25,7 @@ import java.util.List;
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.data.xy.XYSeries;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -52,6 +53,8 @@ public class DACPUChart extends DATimelineChart {
        private DACPUChart() {
                chartType = TimelineConstants.CHART_TYPE_CPU;
                chartName = TimelineChartLabels.CPU_CHART_TITLE;
+               chartIcon = ImageResources.CHART_CPU;
+               addIcon = ImageResources.ADD_CHART_CPU;
 
                appLoadSeries = new DACustomChartSeries(
                                TimelineChartLabels.CPU_CHART_SERIES_NAME_APP_LOAD,
index af11035..dc85da3 100644 (file)
@@ -7,6 +7,7 @@ import java.util.List;
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.data.xy.XYSeries;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -33,8 +34,12 @@ public class DACPUCoreChart extends DATimelineChart {
        }
 
        public DACPUCoreChart() {
+               chartType = TimelineConstants.CHART_TYPE_CPU_CORE;
                chartName = TimelineChartLabels.CPU_CORE_CHART_TITLE;
-               /* core 0 */
+               chartIcon = ImageResources.CHART_CPU_CORE;
+               addIcon = ImageResources.ADD_CHART_CPU_CORE;
+               
+               /*core 0*/
                coreChartSeriesList.add(new DACustomChartSeries(
                                TimelineChartLabels.CPU_CORE_CHART_SERIES_NAME_CORE0,
                                DACustomChartSeries.SERIES_STYLE_LINE,
index 1ba7aaa..2126a9b 100644 (file)
@@ -25,6 +25,7 @@ import java.util.List;
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.data.xy.XYSeries;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -50,6 +51,8 @@ public class DACPUFrequencyChart extends DATimelineChart {
        private DACPUFrequencyChart() {
                chartType = TimelineConstants.CHART_TYPE_CPU_FREQUENCY;
                chartName = TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE;
+               chartIcon = ImageResources.CHART_CPU_FREQUENCY;
+               addIcon = ImageResources.ADD_CHART_CPU_FREQUENCY;
 
                frequencySeries = new DACustomChartSeries(
                                TimelineChartLabels.CPU_FREQUENCY_CHART_FREQUENCY,
index 856e248..a7cf905 100644 (file)
@@ -25,6 +25,7 @@ import java.util.List;
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.data.xy.XYSeries;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
@@ -49,7 +50,9 @@ public class DAFileChart extends DATimelineChart {
        private DAFileChart() {
                chartType = TimelineConstants.CHART_TYPE_FILE;
                chartName = TimelineChartLabels.FILE_CHART_TITLE;
-
+               chartIcon = ImageResources.CHART_FILE;
+               addIcon = ImageResources.ADD_CHART_FILE;
+               
                readSeries = new DACustomChartSeries(
                                TimelineChartLabels.FILE_CHART_SERIES_NAME_READ,
                                DACustomChartSeries.SERIES_STYLE_BAR,
index 6868d2a..799f1c5 100644 (file)
@@ -26,6 +26,7 @@ import java.util.List;
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.data.xy.XYSeries;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -56,6 +57,8 @@ public class DAHeapChart extends DATimelineChart {
        private DAHeapChart() {
                chartType = TimelineConstants.CHART_TYPE_HEAP;
                chartName = TimelineChartLabels.HEAP_CHART_TITLE;
+               chartIcon = ImageResources.CHART_HEAP;
+               addIcon = ImageResources.ADD_CHART_HEAP;
 
                totalAllocationSeries = new DACustomChartSeries(
                                TimelineChartLabels.HEAP_CHART_SERIES_NAME_PLATFORM_ALLOCATION,
index 7643639..f30ab99 100644 (file)
@@ -25,6 +25,7 @@ import java.util.List;
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.data.xy.XYSeries;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -53,8 +54,10 @@ public class DAProcessMemoryChart extends DATimelineChart {
        private DAProcessMemoryChart() {
                chartType = TimelineConstants.CHART_TYPE_PROCESS_MEMORY;
                chartName = TimelineChartLabels.PROCESS_MEMORY_CHART_TITLE;
-
-               VSSMemorySeries = new DACustomChartSeries(
+               chartIcon = ImageResources.CHART_PROCESS_MEMORY;
+               addIcon = ImageResources.ADD_CHART_PROCESS_MEMORY;
+               
+               VSSMemorySeries  = new DACustomChartSeries(
                                TimelineChartLabels.PROCESS_MEMORY_CHART_VSS,
                                DACustomChartSeries.SERIES_STYLE_AREA,
                                ColorResources.SERIESE_COLOR_PROCESS_VSS);
index 1a3cfda..d29af03 100644 (file)
@@ -25,6 +25,7 @@ import java.util.List;
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.data.xy.XYSeries;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -54,7 +55,9 @@ public class DASystemMemoryChart extends DATimelineChart {
        private DASystemMemoryChart() {
                chartType = TimelineConstants.CHART_TYPE_SYSTEM_MEMORY;
                chartName = TimelineChartLabels.SYSTEM_MEMORY_CHART_TITLE;
-
+               chartIcon = ImageResources.CHART_SYSTEM_MEMORY;
+               addIcon = ImageResources.ADD_CHART_SYSTEM_MEMORY;
+               
                processSeries = new DACustomChartSeries(
                                TimelineChartLabels.SYSTEM_MEMORY_CHART_SERIES_NAME_PROC_RESIDENT,
                                DACustomChartSeries.SERIES_STYLE_AREA,
index 6250227..ef37ffd 100644 (file)
@@ -39,7 +39,9 @@ public abstract class DATimelineChart extends TimelineChart {
 
        public void setDomainAxisRange(double start, double end) {
                plot.setAxisRangeX(start, end);
-               chart.redraw();
+               if(!chart.isDisposed()) {
+                       chart.redraw();
+               }
        }
        
        public void setRangeSelection(int startSec, int rangeSec) {
index f542f8c..ba9aa3a 100644 (file)
@@ -39,6 +39,7 @@ import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.experimental.swt.SWTUtils;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -70,6 +71,8 @@ public class FileChart extends TimelineChart {
        private FileChart() {
                chartType = TimelineConstants.CHART_TYPE_FILE;
                chartName = TimelineChartLabels.FILE_CHART_TITLE;
+               chartIcon = ImageResources.CHART_FILE;
+               addIcon = ImageResources.ADD_CHART_FILE;
                
                if(readSeriesDataSet == null) {
                        readSeriesDataSet = new SeriesDataSet();
index 0152373..42d17ba 100644 (file)
@@ -37,6 +37,7 @@ import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.experimental.swt.SWTUtils;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -71,6 +72,8 @@ public class HeapChart extends TimelineChart {
        private HeapChart() {
                chartType = TimelineConstants.CHART_TYPE_HEAP;
                chartName = TimelineChartLabels.HEAP_CHART_TITLE;
+               chartIcon = ImageResources.CHART_HEAP;
+               addIcon = ImageResources.ADD_CHART_HEAP;
                
                /* user */
                if(userAllocationSeriesDataSet == null) {
index 5739693..3550f63 100644 (file)
@@ -36,6 +36,7 @@ import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.experimental.swt.SWTUtils;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -66,6 +67,8 @@ public class ProcessMemoryChart extends TimelineChart {
        private ProcessMemoryChart() {
                chartType = TimelineConstants.CHART_TYPE_PROCESS_MEMORY;
                chartName = TimelineChartLabels.PROCESS_MEMORY_CHART_TITLE;
+               chartIcon = ImageResources.CHART_PROCESS_MEMORY;
+               addIcon = ImageResources.ADD_CHART_PROCESS_MEMORY;
                
                /* VSS */
                if (VSSMemorySeriesDataSet == null) {
index c3e2825..6b202ac 100644 (file)
@@ -36,6 +36,7 @@ import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.experimental.swt.SWTUtils;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
@@ -66,6 +67,8 @@ public class SystemMemoryChart extends TimelineChart {
        private SystemMemoryChart() {
                chartType = TimelineConstants.CHART_TYPE_SYSTEM_MEMORY;
                chartName = TimelineChartLabels.SYSTEM_MEMORY_CHART_TITLE;
+               chartIcon = ImageResources.CHART_SYSTEM_MEMORY;
+               addIcon = ImageResources.ADD_CHART_SYSTEM_MEMORY;
                
                /* process */
                if (processSeriesDataSet == null) {
index c7b6c97..5f340b9 100644 (file)
 package org.tizen.dynamicanalyzer.timeline.chart;
 
 import java.awt.Color;
-import java.awt.Image;
 import java.util.List;
 import java.util.Vector;
 
+import org.eclipse.swt.graphics.Image;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.data.xy.XYDataItem;
@@ -51,6 +51,8 @@ public abstract class TimelineChart {
 
        protected int chartType;
        protected String chartName;
+       protected Image chartIcon;
+       protected Image addIcon;
 
        protected JFreeChart chart = null;
        private long CHART_RANGE;
@@ -95,6 +97,14 @@ public abstract class TimelineChart {
                return chartName;
        }
        
+       public Image getChartIcon() {
+               return chartIcon;
+       }
+       
+       public Image getAddIcon() {
+               return addIcon;
+       }
+       
        public void setRangeSelection(int startSec, int rangeSec) {
                CHART_RANGE = (long) (rangeSec * 1000);
 
@@ -139,7 +149,7 @@ public abstract class TimelineChart {
                xyplot.setBackgroundImageAlpha(1f);
 
                /* Background */
-               Image image = TimelineUtils.convertToAWT(ImageResources.BG_GRADIENT.getImageData());
+               java.awt.Image image = TimelineUtils.convertToAWT(ImageResources.BG_GRADIENT.getImageData());
                xyplot.setBackgroundImage(image);
 
                xyplot.setOutlineVisible(false);
index 21bf303..b6c5eef 100644 (file)
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.eclipse.swt.widgets.Composite;
 import org.jfree.data.xy.XYSeries;
+import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.model.LogPackage;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
@@ -39,6 +40,8 @@ public class UserCustomChart extends DATimelineChart {
        public UserCustomChart(int handle, String chartName) {
                this.handle = handle;
                this.chartName = chartName;
+               chartIcon = ImageResources.CHART_DEVICES;
+               addIcon = ImageResources.ADD_CHART_DEVICE;
                
        }
        
index 7af31c8..2be7074 100644 (file)
@@ -31,7 +31,6 @@ import org.tizen.dynamicanalyzer.nl.InformationViewLabels;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.timeline.TimelineChartManager;
 import org.tizen.dynamicanalyzer.timeline.TimelineItemManager;
-import org.tizen.dynamicanalyzer.timeline.TimelineItemsProvider;
 import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
 import org.tizen.dynamicanalyzer.ui.widgets.DATable.DATableComposite;
 import org.tizen.dynamicanalyzer.utils.Formatter;
@@ -112,7 +111,7 @@ public class StatsTable extends DATableComposite {
                case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
                case TimelineConstants.CHART_TYPE_HEAP:
                case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
-               case TimelineConstants.CHART_TYPE_ENERGY:
+//             case TimelineConstants.CHART_TYPE_ENERGY:
                case TimelineConstants.CHART_TYPE_FILE:
                        return true;
                default:
@@ -182,7 +181,7 @@ public class StatsTable extends DATableComposite {
 
                insertStartEndTime();
                if(false == TimelineItemManager.bCustomChart){
-                       List<TimelineChart> pItem = TimelineItemsProvider.getInstance().getSelectedChartList();
+                       List<TimelineChart> pItem = chartManager.getSelectedChartList();
                        List<XYSeries> xySeries = null;
                        List<XYDataItem> xyDataItem = null;
                        double xVal;
@@ -195,18 +194,18 @@ public class StatsTable extends DATableComposite {
                        double end = 0;
                        double val;
                        int itemID;
-
+       
                        for (int i = 0; i < pItem.size(); i++) {
-                               itemID = pItem.get(i).getChartType();
-                               //FIXME : chart
-                               switch(itemID){
-                               case TimelineConstants.CHART_TYPE_CPU:
-                                       continue;
-                               }
-                               xySeries = chartManager.getChartSeriesList(itemID);
+                       itemID = pItem.get(i).getChartType();
+                       //FIXME : chart
+                       switch(itemID){
+                       case TimelineConstants.CHART_TYPE_CPU:
+                               continue;
+                       }
+                       xySeries = chartManager.getChartSeriesList(itemID);
 
-                               if (null == xySeries)
-                                       continue;
+                       if (null == xySeries)
+                               continue;
 
                                for (int xySeriesCount = 0; xySeriesCount < xySeries.size(); xySeriesCount++) {
                                        XYSeries xys = xySeries.get(xySeriesCount);
@@ -256,64 +255,63 @@ public class StatsTable extends DATableComposite {
                                        if (count != 0)
                                                avr = (double) sum / (double) count;
 
-                                       String title = getTitleName(itemID, xys);
-                                       if (null != title) {
-                                               switch (itemID) {
-                                               case TimelineConstants.CHART_TYPE_CPU:
+                               String title = getTitleName(itemID, xys);
+                               if (null != title) {
+                                       switch (itemID) {
+                                       case TimelineConstants.CHART_TYPE_CPU:
+                                               insertRangeItem(title,
+                                                               Formatter.toPercentageFormat(start),
+                                                               Formatter.toPercentageFormat(end),
+                                                               Formatter.toPercentageFormat(avr),
+                                                               Formatter.toPercentageFormat(min),
+                                                               Formatter.toPercentageFormat(max));
+                                               break;
+                                       case TimelineConstants.CHART_TYPE_CPU_CORE:
+                                               insertRangeItem(title,
+                                                               Formatter.toPercentageFormat(start),
+                                                               Formatter.toPercentageFormat(end),
+                                                               Formatter.toPercentageFormat(avr),
+                                                               Formatter.toPercentageFormat(min),
+                                                               Formatter.toPercentageFormat(max));
+                                               break;
+                                       case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
+                                               insertRangeItem(title,
+                                                               Formatter.toHzFormat(start),
+                                                               Formatter.toHzFormat(end),
+                                                               Formatter.toHzFormat(avr),
+                                                               Formatter.toHzFormat(min),
+                                                               Formatter.toHzFormat(max));
+                                               break;
+                                       case TimelineConstants.CHART_TYPE_HEAP:
+                                               insertRangeItem(title, Formatter.toByteFormat(start),
+                                                               Formatter.toByteFormat(end),
+                                                               Formatter.toByteFormat(avr),
+                                                               Formatter.toByteFormat(min),
+                                                               Formatter.toByteFormat(max));
+                                               break;
+                                       case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
+                                               insertRangeItem(title, Formatter.toByteFormat(start),
+                                                               Formatter.toByteFormat(end),
+                                                               Formatter.toByteFormat((avr)),
+                                                               Formatter.toByteFormat(min),
+                                                               Formatter.toByteFormat(max));
+                                               break;
+//                                     case TimelineConstants.CHART_TYPE_ENERGY:
+//                                             insertRangeItem(title, Formatter.toNumberFormat(start),
+//                                                             Formatter.toNumberFormat(end),
+//                                                             Formatter.toNumberFormat(avr),
+//                                                             Formatter.toNumberFormat(min),
+//                                                             Formatter.toNumberFormat(max));
+//                                             break;
+                                       case TimelineConstants.CHART_TYPE_FILE:
+                                               // File Count
+                                               if (xys.getKey().equals(TimelineChartLabels.FILE_CHART_SERIES_NAME_FD_COUNT)) {
                                                        insertRangeItem(title,
                                                                        Formatter.toPercentageFormat(start),
                                                                        Formatter.toPercentageFormat(end),
                                                                        Formatter.toPercentageFormat(avr),
                                                                        Formatter.toPercentageFormat(min),
                                                                        Formatter.toPercentageFormat(max));
-                                                       break;
-                                               case TimelineConstants.CHART_TYPE_CPU_CORE:
-                                                       insertRangeItem(title,
-                                                                       Formatter.toPercentageFormat(start),
-                                                                       Formatter.toPercentageFormat(end),
-                                                                       Formatter.toPercentageFormat(avr),
-                                                                       Formatter.toPercentageFormat(min),
-                                                                       Formatter.toPercentageFormat(max));
-                                                       break;
-                                               case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
-                                                       insertRangeItem(title,
-                                                                       Formatter.toHzFormat(start),
-                                                                       Formatter.toHzFormat(end),
-                                                                       Formatter.toHzFormat(avr),
-                                                                       Formatter.toHzFormat(min),
-                                                                       Formatter.toHzFormat(max));
-                                                       break;
-                                               case TimelineConstants.CHART_TYPE_HEAP:
-                                                       insertRangeItem(title, Formatter.toByteFormat(start),
-                                                                       Formatter.toByteFormat(end),
-                                                                       Formatter.toByteFormat(avr),
-                                                                       Formatter.toByteFormat(min),
-                                                                       Formatter.toByteFormat(max));
-                                                       break;
-                                               case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
-                                                       insertRangeItem(title, Formatter.toByteFormat(start),
-                                                                       Formatter.toByteFormat(end),
-                                                                       Formatter.toByteFormat((avr)),
-                                                                       Formatter.toByteFormat(min),
-                                                                       Formatter.toByteFormat(max));
-                                                       break;
-                                               case TimelineConstants.CHART_TYPE_ENERGY:
-                                                       insertRangeItem(title, Formatter.toNumberFormat(start),
-                                                                       Formatter.toNumberFormat(end),
-                                                                       Formatter.toNumberFormat(avr),
-                                                                       Formatter.toNumberFormat(min),
-                                                                       Formatter.toNumberFormat(max));
-                                                       break;
-                                               case TimelineConstants.CHART_TYPE_FILE:
-                                                       // File Count
-                                                       if (xys.getKey().equals(TimelineChartLabels.FILE_CHART_SERIES_NAME_FD_COUNT)) {
-                                                               insertRangeItem(title,
-                                                                               Formatter.toNumberFormat(start),
-                                                                               Formatter.toNumberFormat(end),
-                                                                               Formatter.toDoubleFormat1(String
-                                                                                               .valueOf(avr)),
-                                                                                               Formatter.toNumberFormat(min),
-                                                                                               Formatter.toNumberFormat(max));
                                                        }
                                                        // File read, write
                                                        else {
index d6b40eb..1f72c4d 100644 (file)
@@ -25,7 +25,6 @@ import java.awt.image.DirectColorModel;
 import java.awt.image.IndexColorModel;
 import java.awt.image.WritableRaster;
 
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.PaletteData;
 import org.eclipse.swt.graphics.RGB;
@@ -34,7 +33,6 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.services.ISourceProviderService;
 import org.jfree.data.time.FixedMillisecond;
-import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.services.TimelineUpdateSourceProvider;
@@ -99,14 +97,9 @@ public class TimelineUtils {
                case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
                case TimelineConstants.CHART_TYPE_HEAP:
                case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
-               case TimelineConstants.CHART_TYPE_DEVICE:
-               case TimelineConstants.CHART_TYPE_ENERGY:
                case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
                        probeType = LogCenterConstants.LOG_DEVICE;
                        break;
-               case TimelineConstants.CHART_TYPE_SNAPSHOT:
-                       probeType = LogCenterConstants.LOG_RECODER;
-                       break;
                default:
                        break;
                }
@@ -120,48 +113,6 @@ public class TimelineUtils {
                return sec;
        }
 
-       public static Image getIconImage(int chartType) {
-               Image iconImage = null;
-
-               switch (chartType) {
-               case TimelineConstants.CHART_TYPE_FILE:
-                       iconImage = ImageResources.FILE;
-                       break;
-               case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
-                       iconImage = ImageResources.PROCESS_MEMORY;
-                       break;
-               case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
-                       iconImage = ImageResources.MEMORY;
-                       break;
-               case TimelineConstants.CHART_TYPE_HEAP:
-                       iconImage = ImageResources.MEMORY_ALLOC;
-                       break;
-               case TimelineConstants.CHART_TYPE_CPU:
-                       iconImage = ImageResources.CPU;
-                       break;
-               case TimelineConstants.CHART_TYPE_CPU_CORE:
-                       iconImage = ImageResources.CPU_CORE;
-                       break; 
-               case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
-                       iconImage = ImageResources.CPU_FREQUENCY;
-                       break; 
-               case TimelineConstants.CHART_TYPE_SNAPSHOT:
-                       iconImage = ImageResources.UI_EVENT;
-                       break;
-               case TimelineConstants.CHART_TYPE_ENERGY:
-                       iconImage = ImageResources.ENERGY;
-                       break;
-               case TimelineConstants.CHART_TYPE_DEVICE:
-                       iconImage = ImageResources.DEVICES;
-                       break;
-               default:
-                       iconImage = ImageResources.CPU;
-                       break;
-               }
-
-               return iconImage;
-       }
-
        public static BufferedImage convertToAWT(ImageData data) {
                ColorModel colorModel = null;
                PaletteData palette = data.palette;