Bug fix - Linking invalid PopupMenu of child chart board (CPU, Energy chart)

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

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
index 2be60d0..92618a5 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
@@ -152,11 +152,12 @@ public class CPUChart extends TimelineChart {
                                        processChartPlot.setAxisUnit("%");
                                        processChartPlot.setShowAxis(true);
                                        processChartPlot.setMarkers(chartBoard.getMarkers());
-
-                                       initPopupMenu(chartBoard, new DAPopupMenu(processesChart));
+                                       
+                                       DAPopupMenu processChartPopupMenu = new DAPopupMenu(processesChart); 
+                                       initPopupMenu(chartBoard, processChartPopupMenu);
 
                                        TimelineChartMouseEventListener timelineChartMouseEventListener = new TimelineChartMouseEventListener(
-                                                       popupMenu, chartBoard.getTimeline());
+                                                       processChartPopupMenu, chartBoard.getTimeline());
                                        processesChart.addMouseListener(timelineChartMouseEventListener);
                                        processesChart.addMouseMoveListener(timelineChartMouseEventListener);
                                        processesChart.addMouseTrackListener(new TimelineChartMouseTrackAdapter(

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
index 3e183e7..84ed48a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
@@ -100,10 +100,11 @@ public class EnergyChart extends TimelineChart {
                appUsageChartPlot.setShowAxis(true);
                appUsageChartPlot.setMarkers(board.getMarkers());
 
-               initPopupMenu(board, new DAPopupMenu(appUsageChart));
+               DAPopupMenu appUsageChartPopupMenu = new DAPopupMenu(appUsageChart); 
+               initPopupMenu(board, appUsageChartPopupMenu);
 
                TimelineChartMouseEventListener timelineChartMouseEventListener = new TimelineChartMouseEventListener(
-                               popupMenu, board.getTimeline());
+                               appUsageChartPopupMenu, board.getTimeline());
                appUsageChart.addMouseListener(timelineChartMouseEventListener);
                appUsageChart.addMouseMoveListener(timelineChartMouseEventListener);
                appUsageChart