From 8c9775a3676265e94e84056d7103a560cf6ac6f5 Mon Sep 17 00:00:00 2001 From: Maria Guseva Date: Fri, 29 Jul 2016 14:48:40 +0300 Subject: [PATCH] [SRADA-938] Fixed FindBugs warnings appeared after previous patches. Fixed warnings: GLChartMouseListener.java:55, URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD PopupRangeAnalysisMenuItemOnChartListener.java:32, BC_UNCONFIRMED_CAST_OF_RETURN_VALUE Change-Id: Ic37be9bf4b1d6b5c334d5c591426c834dafd6f07 Signed-off-by: Maria Guseva --- .../PopupRangeAnalysisMenuItemOnChartListener.java | 18 +++++++++++++----- .../ui/opengl/chart/listener/GLChartMouseListener.java | 3 --- 2 files changed, 13 insertions(+), 8 deletions(-) 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 index 748a955..37f0e30 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/PopupRangeAnalysisMenuItemOnChartListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/PopupRangeAnalysisMenuItemOnChartListener.java @@ -7,6 +7,7 @@ import java.util.Collections; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotMarker; @@ -29,10 +30,17 @@ public class PopupRangeAnalysisMenuItemOnChartListener extends PopupRangeAnalysi 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); + // Check type of marker before cast to prevent ClassCastException in runtime + if (marker instanceof DAChartPlotIntervalMarker) { + DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) marker; + double startVal = RangeDataManager.getInstance().getMarkerStartTime(); + double endVal = RangeDataManager.getInstance().getMarkerEndTime(); + intervalMarker.setInterval(startVal / TimelineConstants.MEGA_DOUBLE, + endVal / TimelineConstants.MEGA_DOUBLE); + } + else { + Logger.error( + "Chart plot marker is not of type DAChartPlotIntervalMarker but " + marker.getClass().getName()); + } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLChartMouseListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLChartMouseListener.java index 2fce292..4ac6f8f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLChartMouseListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLChartMouseListener.java @@ -35,7 +35,6 @@ import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseMoveListener; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar; @@ -51,8 +50,6 @@ import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class GLChartMouseListener extends MouseAdapter implements MouseMoveListener { - protected RangeDataManager rangeDataManager = RangeDataManager - .getInstance(); protected DAPopupMenu menu; protected DATimeline timeline; protected double baseTime = TimelineConstants.NOT_INITED; -- 2.7.4