IDataSet generic

Use BaseEntry<Float> instead of FloatEntry

Author: hannesa2

chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt

@@ -52,7 +52,7 @@ abstract class ChartData<T : IDataSet<out EntryFloat>> : Serializable {
         protected set
 
     constructor() {
-        this.dataSets = ArrayList<T>()
+        this.dataSets = ArrayList()
     }
 
     constructor(vararg dataSets: T) {
@@ -446,7 +446,7 @@ abstract class ChartData<T : IDataSet<out EntryFloat>> : Serializable {
         }
 
         val dataSet: IDataSet<*> = dataSets[dataSetIndex]
-        val entryFloat: EntryFloat = dataSet.getEntryForXValue(xValue, Float.NaN) ?: return false
+        val entryFloat: EntryFloat = dataSet.getEntryForXValue(xValue, Float.NaN) as? EntryFloat ?: return false
 
         return removeEntry(entryFloat, dataSetIndex)
     }

chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt

@@ -122,12 +122,12 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider<*>>(prote
     ): MutableList<Highlight> {
         val highlights = ArrayList<Highlight>()
 
-        var entries = set.getEntriesForXValue(xVal)
+        var entries = set.getEntriesForXValue(xVal)?.map { it as EntryFloat }?.toMutableList()
         if (entries != null && entries.isEmpty()) {
             // Try to find closest x-value and take all entries for that x-value
-            val closest: EntryFloat? = set.getEntryForXValue(xVal, Float.NaN, rounding)
+            val closest: EntryFloat? = set.getEntryForXValue(xVal, Float.NaN, rounding) as? EntryFloat
             if (closest != null) {
-                entries = set.getEntriesForXValue(closest.x)
+                entries = set.getEntriesForXValue(closest.x)?.map { it as EntryFloat }?.toMutableList()
             }
         }
 

chartLib/src/main/kotlin/info/appdev/charting/highlight/HorizontalBarHighlighter.kt

@@ -35,12 +35,12 @@ class HorizontalBarHighlighter(dataProvider: BarDataProvider) : BarHighlighter(d
     override fun buildHighlights(set: IDataSet<*>, dataSetIndex: Int, xVal: Float, rounding: DataSet.Rounding?): MutableList<Highlight> {
         val highlights = ArrayList<Highlight>()
 
-        var entries = set.getEntriesForXValue(xVal)
+        var entries = set.getEntriesForXValue(xVal)?.map { it as EntryFloat }?.toMutableList()
         if (entries != null && entries.isEmpty()) {
             // Try to find closest x-value and take all entries for that x-value
-            val closestEntryFloat: EntryFloat? = set.getEntryForXValue(xVal, Float.NaN, rounding)
+            val closestEntryFloat: EntryFloat? = set.getEntryForXValue(xVal, Float.NaN, rounding) as? EntryFloat
             closestEntryFloat?.let { closestE ->
-                entries = set.getEntriesForXValue(closestE.x)
+                entries = set.getEntriesForXValue(closestE.x)?.map { it as EntryFloat }?.toMutableList()
             }
         }
 

chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.kt

@@ -1,8 +1,8 @@
 package info.appdev.charting.interfaces.datasets
 
-import info.appdev.charting.data.EntryFloat
+import info.appdev.charting.data.BaseEntry
 
-interface IBarLineScatterCandleBubbleDataSet<T : EntryFloat> : IDataSet<T> {
+interface IBarLineScatterCandleBubbleDataSet<T : BaseEntry<Float>> : IDataSet<T> {
 
     val highLightColor: Int
 }

chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/IDataSet.kt

@@ -5,11 +5,11 @@ import android.graphics.Typeface
 import info.appdev.charting.components.Legend
 import info.appdev.charting.components.YAxis
 import info.appdev.charting.data.DataSet
-import info.appdev.charting.data.EntryFloat
+import info.appdev.charting.data.BaseEntry
 import info.appdev.charting.formatter.IValueFormatter
 import info.appdev.charting.utils.PointF
 
-interface IDataSet<T : EntryFloat> {
+interface IDataSet<T : BaseEntry<Float>> {
     /**
      * returns the minimum y-value this DataSet holds
      */

chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineRadarDataSet.kt

@@ -1,9 +1,9 @@
 package info.appdev.charting.interfaces.datasets
 
 import android.graphics.drawable.Drawable
-import info.appdev.charting.data.EntryFloat
+import info.appdev.charting.data.BaseEntry
 
-interface ILineRadarDataSet<T : EntryFloat> : ILineScatterCandleRadarDataSet<T> {
+interface ILineRadarDataSet<T : BaseEntry<Float>> : ILineScatterCandleRadarDataSet<T> {
     /**
      * Returns the color that is used for filling the line surface area.
      */

chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt

@@ -1,9 +1,9 @@
 package info.appdev.charting.interfaces.datasets
 
 import android.graphics.DashPathEffect
-import info.appdev.charting.data.EntryFloat
+import info.appdev.charting.data.BaseEntry
 
-interface ILineScatterCandleRadarDataSet<T : EntryFloat> : IBarLineScatterCandleBubbleDataSet<T> {
+interface ILineScatterCandleRadarDataSet<T : BaseEntry<Float>> : IBarLineScatterCandleBubbleDataSet<T> {
     /**
      * Returns true if vertical highlight indicator lines are enabled (drawn)
      */

chartLib/src/main/kotlin/info/appdev/charting/renderer/BarLineScatterCandleBubbleRenderer.kt

@@ -2,7 +2,7 @@ package info.appdev.charting.renderer
 
 import info.appdev.charting.animation.ChartAnimator
 import info.appdev.charting.data.DataSet
-import info.appdev.charting.data.EntryFloat
+import info.appdev.charting.data.BaseEntry
 import info.appdev.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider
 import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet
 import info.appdev.charting.interfaces.datasets.IDataSet
@@ -29,7 +29,7 @@ abstract class BarLineScatterCandleBubbleRenderer(
     /**
      * Checks if the provided entry object is in bounds for drawing considering the current animation phase.
      */
-    protected fun <T : EntryFloat> isInBoundsX(entry: T, set: IBarLineScatterCandleBubbleDataSet<T>): Boolean {
+    protected fun <T : BaseEntry<Float>> isInBoundsX(entry: T, set: IBarLineScatterCandleBubbleDataSet<T>): Boolean {
         val entryIndex = set.getEntryIndex(entry).toFloat()
 
         return if (entryIndex >= set.entryCount * animator.phaseX) {
@@ -61,7 +61,7 @@ abstract class BarLineScatterCandleBubbleRenderer(
         /**
          * Calculates the minimum and maximum x values as well as the range between them.
          */
-        fun <T : EntryFloat> set(chart: BarLineScatterCandleBubbleDataProvider<*>, dataSet: IBarLineScatterCandleBubbleDataSet<T>) {
+        fun <T : BaseEntry<Float>> set(chart: BarLineScatterCandleBubbleDataProvider<*>, dataSet: IBarLineScatterCandleBubbleDataSet<T>) {
             val phaseX = max(0f, min(1f, animator.phaseX))
 
             val low = chart.lowestVisibleX