[SRADA-938] Fix Range Analysis does not work.

* PopupRangeAnalysisMenuItemOnChartListener - new class to implement the range
analysis listener for charts.

The new range analysis listeners added to charts: FileChartBoard, MemoryChart,
MemoryChartBoard, NetworkChartBoard, GLChart, SyncChartBoard, ThreadChartBoard
and TimelineChart.

Change-Id: I5a4d0e9afe62d2be7a9941435c764a6c809ca32a
Signed-off-by: Maria Guseva <m.guseva@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/PopupRangeAnalysisMenuItemOnChartListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/PopupRangeAnalysisMenuItemOnChartListener.java
new file mode 100644 (file)
index 0000000..748a955
--- /dev/null
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/PopupRangeAnalysisMenuItemOnChartListener.java
@@ -0,0 +1,38 @@
+/**
+ *
+ */
+package org.tizen.dynamicanalyzer.ui.common;
+
+import java.util.Collections;
+
+import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
+import org.tizen.dynamicanalyzer.widgets.chart.DAChart;
+import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker;
+import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotMarker;
+import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard;
+import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem;
+
+public class PopupRangeAnalysisMenuItemOnChartListener extends PopupRangeAnalysisMenuItemListener {
+
+       DAChart chart;
+
+       public PopupRangeAnalysisMenuItemOnChartListener(DAPopupMenuItem menuItem, DAChartBoard chartBoard, DAChart chart) {
+               super(menuItem, chartBoard);
+               this.chart = chart;
+       }
+
+       @Override
+       public void widgetSelected(DAPopupMenuItem menuItem) {
+               double time = menuItem.getDoubleData();
+               Collections.sort(RangeDataManager.getInstance().getMarerTimeList());
+               RangeDataManager.getInstance().setRangeFromMarkerList((long) (time * TimelineConstants.MEGA_DOUBLE));
+
+               DAChartPlotMarker marker = chart.getPlot().getMarkers().get(0);
+               DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) marker;
+               double startVal = RangeDataManager.getInstance().getMarkerStartTime();
+               double endVal = RangeDataManager.getInstance().getMarkerEndTime();
+               intervalMarker.setInterval(startVal / TimelineConstants.MEGA_DOUBLE,
+                               endVal / TimelineConstants.MEGA_DOUBLE);
+       }
+}

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java
index 563aff4..133a829 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java
@@ -27,8 +27,6 @@
 package org.tizen.dynamicanalyzer.ui.file;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,11 +39,7 @@ import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
-import org.tizen.dynamicanalyzer.ui.common.PopupAnalysisMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupClearMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupEndMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupFromSelectionMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupStartMenuItemClickListener;
+import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemOnChartListener;
 import org.tizen.dynamicanalyzer.ui.common.TimeLineChartKeyListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter;
@@ -411,7 +405,7 @@ public class FileChartBoard extends DAChartBoard {
                return titleString;
        }
 
-       private void initFileChart(DAChart chart, boolean isParent) {
+       private void initFileChart(final DAChart chart, boolean isParent) {
                if (null == chart) {
                        return;
                }
@@ -448,34 +442,10 @@ public class FileChartBoard extends DAChartBoard {
 
                DAPopupMenu popupMenu = new DAPopupMenu(chart);
                popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT);
-               DAPopupMenuItem startItem = new DAPopupMenuItem(popupMenu,
-                               DAPopupMenuItem.NONE);
-               startItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_START);
-               startItem.addListener(new PopupStartMenuItemClickListener(startItem,
-                               this));
-
-               DAPopupMenuItem endItem = new DAPopupMenuItem(popupMenu,
-                               DAPopupMenuItem.NONE);
-               endItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_END);
-               endItem.addListener(new PopupEndMenuItemClickListener(endItem, this));
-
-               DAPopupMenuItem fromSelectionItem = new DAPopupMenuItem(popupMenu,
-                               DAPopupMenuItem.NONE);
-               fromSelectionItem
-                               .setText(TimelineChartLabels.RANGE_CONTEXT_SET_FROM_SELECTION);
-               fromSelectionItem
-                               .addListener(new PopupFromSelectionMenuItemClickListener(
-                                               fromSelectionItem, this));
-
-               DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu,
-                               DAPopupMenuItem.NONE);
+               
+               DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu);
                analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS);
-               analysisItem.addListener(new PopupAnalysisMenuItemClickListener());
-
-               DAPopupMenuItem clearItem = new DAPopupMenuItem(popupMenu,
-                               DAPopupMenuItem.NONE);
-               clearItem.setText(TimelineChartLabels.RANGE_CONTEXT_CLEAR);
-               clearItem.addListener(new PopupClearMenuItemClickListener());
+               analysisItem.addListener(new PopupRangeAnalysisMenuItemOnChartListener(analysisItem, this, chart));
 
                TimelineChartMouseEventListener timelineChartMouseEventListener =
                                new TimelineChartMouseEventListener(

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChart.java
index 2605018..29cdc7f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChart.java
@@ -25,21 +25,16 @@
 package org.tizen.dynamicanalyzer.ui.memory.chart;\r
 \r
 import java.util.ArrayList;\r
-import java.util.Collections;\r
 import java.util.List;\r
 \r
 import org.eclipse.swt.graphics.Image;\r
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;\r
 import org.tizen.dynamicanalyzer.resources.FontResources;\r
 import org.tizen.dynamicanalyzer.resources.ImageResources;\r
-import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemListener;\r
-import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;\r
-import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;\r
+import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemOnChartListener;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChart;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType;\r
-import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker;\r
-import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotMarker;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries;\r
 import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard;\r
@@ -48,7 +43,7 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu;
 import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem;\r
 \r
 public class MemoryChart {\r
-       protected DAChart chart;\r
+       public DAChart chart;\r
        protected DAChartBoardItem chartBoardItem;\r
        protected int chartType;\r
        protected int chartStyle = DAChart.CHART_STYLE_NORMAL;\r
@@ -153,21 +148,7 @@ public class MemoryChart {
                popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT);\r
                DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu);\r
                analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS);\r
-               analysisItem.addListener(new PopupRangeAnalysisMenuItemListener(analysisItem, chartBoard) {\r
-                       @Override\r
-                       public void widgetSelected(DAPopupMenuItem menuItem) {\r
-                               double time = menuItem.getDoubleData();\r
-                               Collections.sort(RangeDataManager.getInstance().getMarerTimeList());\r
-                               RangeDataManager.getInstance().setRangeFromMarkerList((long) (time * TimelineConstants.MEGA_DOUBLE));\r
-                               \r
-                               DAChartPlotMarker marker = chart.getPlot().getMarkers().get(0);\r
-                               DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) marker;\r
-                               double startVal = RangeDataManager.getInstance().getMarkerStartTime();\r
-                               double endVal = RangeDataManager.getInstance().getMarkerEndTime();\r
-                               intervalMarker.setInterval(startVal / TimelineConstants.MEGA_DOUBLE, \r
-                                               endVal / TimelineConstants.MEGA_DOUBLE);\r
-                       }\r
-               });\r
+               analysisItem.addListener(new PopupRangeAnalysisMenuItemOnChartListener(analysisItem, chartBoard, chart));\r
        }\r
        \r
        public void pushChild(MemoryChart child) {\r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChartBoard.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChartBoard.java
index 19a3cd8..8f25aad 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChartBoard.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChartBoard.java
@@ -25,7 +25,6 @@
 package org.tizen.dynamicanalyzer.ui.memory.chart;\r
 \r
 import java.util.ArrayList;\r
-import java.util.Collections;\r
 import java.util.Iterator;\r
 import java.util.List;\r
 import java.util.Map;\r
@@ -42,27 +41,19 @@ import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;\r
 import org.tizen.dynamicanalyzer.setting.SettingDataManager;\r
 import org.tizen.dynamicanalyzer.setting.TargetData;\r
-import org.tizen.dynamicanalyzer.ui.common.PopupAnalysisMenuItemClickListener;\r
-import org.tizen.dynamicanalyzer.ui.common.PopupClearMenuItemClickListener;\r
-import org.tizen.dynamicanalyzer.ui.common.PopupEndMenuItemClickListener;\r
-import org.tizen.dynamicanalyzer.ui.common.PopupFromSelectionMenuItemClickListener;\r
-import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemListener;\r
-import org.tizen.dynamicanalyzer.ui.common.PopupStartMenuItemClickListener;\r
+import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemOnChartListener;\r
 import org.tizen.dynamicanalyzer.ui.common.TimeLineChartKeyListener;\r
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener;\r
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter;\r
 import org.tizen.dynamicanalyzer.ui.memory.MemoryPage;\r
 import org.tizen.dynamicanalyzer.ui.memory.data.MemoryDataManager;\r
 import org.tizen.dynamicanalyzer.ui.memory.data.ProcessMemoryDBTable;\r
-import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;\r
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager;\r
-import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;\r
 import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;\r
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChart;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker;\r
-import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotMarker;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip;\r
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartRenderer;\r
 import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard;\r
@@ -389,21 +380,7 @@ public class MemoryChartBoard extends DAChartBoard {
                popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT);\r
                DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu);\r
                analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS);\r
-               analysisItem.addListener(new PopupRangeAnalysisMenuItemListener(analysisItem, this) {\r
-                       @Override\r
-                       public void widgetSelected(DAPopupMenuItem menuItem) {\r
-                               double time = menuItem.getDoubleData();\r
-                               Collections.sort(RangeDataManager.getInstance().getMarerTimeList());\r
-                               RangeDataManager.getInstance().setRangeFromMarkerList((long) (time * TimelineConstants.MEGA_DOUBLE));\r
-                               \r
-                               DAChartPlotMarker marker = tmp.getChart().getPlot().getMarkers().get(0);\r
-                               DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) marker;\r
-                               double startVal = RangeDataManager.getInstance().getMarkerStartTime();\r
-                               double endVal = RangeDataManager.getInstance().getMarkerEndTime();\r
-                               intervalMarker.setInterval(startVal / TimelineConstants.MEGA_DOUBLE, \r
-                                               endVal / TimelineConstants.MEGA_DOUBLE);\r
-                       }\r
-               });\r
+               analysisItem.addListener(new PopupRangeAnalysisMenuItemOnChartListener(analysisItem, this, tmp.getChart()));\r
                \r
                chart.popupMenu = popupMenu;\r
 \r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartBoard.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartBoard.java
index 3e4deae..0490988 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartBoard.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartBoard.java
@@ -39,11 +39,7 @@ import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
-import org.tizen.dynamicanalyzer.ui.common.PopupAnalysisMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupClearMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupEndMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupFromSelectionMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupStartMenuItemClickListener;
+import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemOnChartListener;
 import org.tizen.dynamicanalyzer.ui.common.TimeLineChartKeyListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter;
@@ -176,7 +172,7 @@ public class NetworkChartBoard extends DAChartBoard {
                addIntervalMarker(rangeMarker);
        }
 
-       private void initNetworkChart(DAChart chart, boolean isParent) {
+       private void initNetworkChart(final DAChart chart, boolean isParent) {
                if (null == chart) {
                        return;
                }
@@ -201,26 +197,10 @@ public class NetworkChartBoard extends DAChartBoard {
 
                DAPopupMenu popupMenu = new DAPopupMenu(chart);
                popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT);
-               DAPopupMenuItem startItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               startItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_START);
-               startItem.addListener(new PopupStartMenuItemClickListener(startItem, this));
-
-               DAPopupMenuItem endItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               endItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_END);
-               endItem.addListener(new PopupEndMenuItemClickListener(endItem, this));
-
-               DAPopupMenuItem fromSelectionItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               fromSelectionItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_FROM_SELECTION);
-               fromSelectionItem.addListener(new PopupFromSelectionMenuItemClickListener(
-                               fromSelectionItem, this));
-
-               DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
+               
+               DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu);
                analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS);
-               analysisItem.addListener(new PopupAnalysisMenuItemClickListener());
-
-               DAPopupMenuItem clearItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               clearItem.setText(TimelineChartLabels.RANGE_CONTEXT_CLEAR);
-               clearItem.addListener(new PopupClearMenuItemClickListener());
+               analysisItem.addListener(new PopupRangeAnalysisMenuItemOnChartListener(analysisItem, this, chart));
 
                TimelineChartMouseEventListener timelineChartMouseEventListener = new TimelineChartMouseEventListener(
                                popupMenu, getTimeline(), NetworkPage.pageID);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChart.java
index e819f58..986e5b7 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChart.java
@@ -34,11 +34,7 @@ import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.swap.logparser.LogPackage;
-import org.tizen.dynamicanalyzer.ui.common.PopupAnalysisMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupClearMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupEndMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupFromSelectionMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupStartMenuItemClickListener;
+import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemOnChartListener;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType;
@@ -75,30 +71,10 @@ public abstract class GLChart {
        
        protected void initPopupMenu(DAChartBoard chartBoard, DAPopupMenu popupMenu) {
                popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT);
-               DAPopupMenuItem startItem = new DAPopupMenuItem(popupMenu);
-               startItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_START);
-               startItem.addListener(new PopupStartMenuItemClickListener(startItem,
-                               chartBoard));
-
-               DAPopupMenuItem endItem = new DAPopupMenuItem(popupMenu);
-               endItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_END);
-               endItem.addListener(new PopupEndMenuItemClickListener(endItem,
-                               chartBoard));
-
-               DAPopupMenuItem fromSelectionItem = new DAPopupMenuItem(popupMenu);
-               fromSelectionItem
-                               .setText(TimelineChartLabels.RANGE_CONTEXT_SET_FROM_SELECTION);
-               fromSelectionItem
-                               .addListener(new PopupFromSelectionMenuItemClickListener(
-                                               fromSelectionItem, chartBoard));
-
+               
                DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu);
                analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS);
-               analysisItem.addListener(new PopupAnalysisMenuItemClickListener());
-
-               DAPopupMenuItem clearItem = new DAPopupMenuItem(popupMenu);
-               clearItem.setText(TimelineChartLabels.RANGE_CONTEXT_CLEAR);
-               clearItem.addListener(new PopupClearMenuItemClickListener());
+               analysisItem.addListener(new PopupRangeAnalysisMenuItemOnChartListener(analysisItem, chartBoard, chart));
        }
 
        public void clear() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLFrameRateMouseListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLFrameRateMouseListener.java
index d639824..73ab9e4 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLFrameRateMouseListener.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLFrameRateMouseListener.java
@@ -79,31 +79,8 @@ public class GLFrameRateMouseListener extends GLChartMouseListener {
 
                if (e.button == 3) {
                        List<DAPopupMenuItem> itemList = menu.getItems();
-                       DAPopupMenuItem startItem = itemList.get(0);
-                       DAPopupMenuItem endItem = itemList.get(1);
-                       DAPopupMenuItem fromSelectionItem = itemList.get(2);
-                       DAPopupMenuItem analysisItem = itemList.get(3);
-                       DAPopupMenuItem clearItem = itemList.get(4);
-
-                       if (eventTime * TimelineConstants.MEGA_DOUBLE <= Toolbar.INSTANCE.getTime()) {
-                               startItem.setEnabled(true);
-                               endItem.setEnabled(true);
-                               analysisItem.setEnabled(rangeDataManager.isAnalyzable());
-                               clearItem.setEnabled(rangeDataManager.isBeingAnalyzed());
-
-                               startItem.setDoubleData(eventTime);
-                               endItem.setDoubleData(eventTime);
-                       } else {
-                               startItem.setEnabled(false);
-                               endItem.setEnabled(false);
-                               analysisItem.setEnabled(rangeDataManager.isAnalyzable());
-                               clearItem.setEnabled(rangeDataManager.isBeingAnalyzed());
-                       }
-
-                       if (intervalMarker.getStartVal() != intervalMarker.getEndVal()) {
-                               fromSelectionItem.setEnabled(true);
-                       } else {
-                               fromSelectionItem.setEnabled(false);
+                       for(DAPopupMenuItem item : itemList) {
+                               item.setDoubleData(eventTime);
                        }
 
                        return;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/SyncChartBoard.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/SyncChartBoard.java
index 76ae0da..5198bd1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/SyncChartBoard.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/SyncChartBoard.java
@@ -40,11 +40,7 @@ import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
-import org.tizen.dynamicanalyzer.ui.common.PopupAnalysisMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupClearMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupEndMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupFromSelectionMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupStartMenuItemClickListener;
+import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemOnChartListener;
 import org.tizen.dynamicanalyzer.ui.common.TimeLineChartKeyListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter;
@@ -169,7 +165,7 @@ public class SyncChartBoard extends DAChartBoard {
 
        }
 
-       protected void initChart(DAChart chart, boolean isParent) {
+       protected void initChart(final DAChart chart, boolean isParent) {
                if (null == chart) {
                        return;
                }
@@ -193,26 +189,10 @@ public class SyncChartBoard extends DAChartBoard {
 
                DAPopupMenu popupMenu = new DAPopupMenu(chart);
                popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT);
-               DAPopupMenuItem startItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               startItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_START);
-               startItem.addListener(new PopupStartMenuItemClickListener(startItem, this));
-
-               DAPopupMenuItem endItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               endItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_END);
-               endItem.addListener(new PopupEndMenuItemClickListener(endItem, this));
-
-               DAPopupMenuItem fromSelectionItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               fromSelectionItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_FROM_SELECTION);
-               fromSelectionItem.addListener(new PopupFromSelectionMenuItemClickListener(
-                               fromSelectionItem, this));
-
-               DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
+               
+               DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu);
                analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS);
-               analysisItem.addListener(new PopupAnalysisMenuItemClickListener());
-
-               DAPopupMenuItem clearItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               clearItem.setText(TimelineChartLabels.RANGE_CONTEXT_CLEAR);
-               clearItem.addListener(new PopupClearMenuItemClickListener());
+               analysisItem.addListener(new PopupRangeAnalysisMenuItemOnChartListener(analysisItem, this, chart));
 
                TimelineChartMouseEventListener timelineChartMouseEventListener = new TimelineChartMouseEventListener(
                                popupMenu, getTimeline(), ThreadPage.pageID);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/ThreadChartBoard.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/ThreadChartBoard.java
index e6766ca..7188538 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/ThreadChartBoard.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/ThreadChartBoard.java
@@ -39,11 +39,7 @@ import org.tizen.dynamicanalyzer.nl.ThreadPageLabels;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
-import org.tizen.dynamicanalyzer.ui.common.PopupAnalysisMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupClearMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupEndMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupFromSelectionMenuItemClickListener;
-import org.tizen.dynamicanalyzer.ui.common.PopupStartMenuItemClickListener;
+import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemOnChartListener;
 import org.tizen.dynamicanalyzer.ui.common.TimeLineChartKeyListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter;
@@ -156,26 +152,10 @@ public class ThreadChartBoard extends SyncChartBoard {
                DAPopupMenu popupMenu = new DAPopupMenu(chart);
                plot.setBackgroundImage(ImageResources.BG_GRADIENT);
                popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT);
-               DAPopupMenuItem startItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               startItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_START);
-               startItem.addListener(new PopupStartMenuItemClickListener(startItem, this));
-
-               DAPopupMenuItem endItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               endItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_END);
-               endItem.addListener(new PopupEndMenuItemClickListener(endItem, this));
-
-               DAPopupMenuItem fromSelectionItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               fromSelectionItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_FROM_SELECTION);
-               fromSelectionItem.addListener(new PopupFromSelectionMenuItemClickListener(
-                               fromSelectionItem, this));
-
-               DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
+               
+               DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu);
                analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS);
-               analysisItem.addListener(new PopupAnalysisMenuItemClickListener());
-
-               DAPopupMenuItem clearItem = new DAPopupMenuItem(popupMenu, DAPopupMenuItem.NONE);
-               clearItem.setText(TimelineChartLabels.RANGE_CONTEXT_CLEAR);
-               clearItem.addListener(new PopupClearMenuItemClickListener());
+               analysisItem.addListener(new PopupRangeAnalysisMenuItemOnChartListener(analysisItem, this, chart));
                
                ///Add Keylistener 0215
                TimeLineChartKeyListener timelineKeyListener = new TimeLineChartKeyListener(this);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/TimelineChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/TimelineChart.java
index 5416f97..feba776 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/TimelineChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/TimelineChart.java
@@ -27,21 +27,16 @@
 
 package org.tizen.dynamicanalyzer.ui.timeline.chart;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.swt.graphics.Image;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
-import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemListener;
-import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
-import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
+import org.tizen.dynamicanalyzer.ui.common.PopupRangeAnalysisMenuItemOnChartListener;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType;
-import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker;
-import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotMarker;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries;
 import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard;
@@ -83,21 +78,7 @@ public abstract class TimelineChart {
                popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT);
                DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu);
                analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS);
-               analysisItem.addListener(new PopupRangeAnalysisMenuItemListener(analysisItem, chartBoard) {
-                       @Override
-                       public void widgetSelected(DAPopupMenuItem menuItem) {
-                               double time = menuItem.getDoubleData();
-                               Collections.sort(RangeDataManager.getInstance().getMarerTimeList());
-                               RangeDataManager.getInstance().setRangeFromMarkerList((long) (time * TimelineConstants.MEGA_DOUBLE));
-                               
-                               DAChartPlotMarker marker = chart.getPlot().getMarkers().get(0);
-                               DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) marker;
-                               double startVal = RangeDataManager.getInstance().getMarkerStartTime();
-                               double endVal = RangeDataManager.getInstance().getMarkerEndTime();
-                               intervalMarker.setInterval(startVal / TimelineConstants.MEGA_DOUBLE, 
-                                               endVal / TimelineConstants.MEGA_DOUBLE);
-                       }
-               });
+               analysisItem.addListener(new PopupRangeAnalysisMenuItemOnChartListener(analysisItem, chartBoard, chart));
        }
 
        public void clear() {