Make getBarBounds callable from Objective-C code (Fixes #570)

Changed method return value to nonnull, because CGRect in Objective-C doesn't allow nil since it's not an object. When the bar bounds cannot be calculated because the data set is nil now the method returns CGRectNull instead of nil.
ChartsOrg · Nov 25, 2015 · 8cf8d1a · 8cf8d1a
1 parent a942a4a
commit 8cf8d1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Charts/Classes/Charts/BarChartView.swift b/Charts/Classes/Charts/BarChartView.swift
@@ -73,13 +73,13 @@ public class BarChartView: BarLineChartViewBase, BarChartDataProvider
     }
 
     /// - returns: the bounding box of the specified Entry in the specified DataSet. Returns null if the Entry could not be found in the charts data.
-    public func getBarBounds(e: BarChartDataEntry) -> CGRect!
+    public func getBarBounds(e: BarChartDataEntry) -> CGRect
     {
         let set = _data.getDataSetForEntry(e) as! BarChartDataSet!
 
         if (set === nil)
         {
-            return nil
+            return CGRectNull
         }
 
         let barspace = set.barSpace

diff --git a/Charts/Classes/Charts/HorizontalBarChartView.swift b/Charts/Classes/Charts/HorizontalBarChartView.swift
@@ -138,13 +138,13 @@ public class HorizontalBarChartView: BarChartView
         }
     }
 
-    public override func getBarBounds(e: BarChartDataEntry) -> CGRect!
+    public override func getBarBounds(e: BarChartDataEntry) -> CGRect
     {
         let set = _data.getDataSetForEntry(e) as! BarChartDataSet!
 
         if (set === nil)
         {
-            return nil
+            return CGRectNull
         }
 
         let barspace = set.barSpace
@@ -205,4 +205,4 @@ public class HorizontalBarChartView: BarChartView
 
         return Int((pt.y >= CGFloat(chartXMax)) ? CGFloat(chartXMax) / div : (pt.y / div))
     }
-}
+}