Kotlin DataSet

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt

@@ -11,7 +11,7 @@ import kotlin.Int
 import kotlin.String
 import kotlin.arrayOf
 
-open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineScatterCandleBubbleDataSet<BarEntry>(yVals, label), IBarDataSet {
+open class BarDataSet(yVals: MutableList<BarEntry?>, label: String = "") : BarLineScatterCandleBubbleDataSet<BarEntry>(yVals, label), IBarDataSet {
     /**
      * the maximum number of bars that are stacked upon each other, this value
      * is calculated from the Entries that are added to the DataSet
@@ -61,14 +61,16 @@ open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineSc
         calcEntryCountIncludingStacks(yVals)
     }
 
-    override fun copy(): BarDataSet {
+    override fun copy(): DataSet<BarEntry?>? {
         val entries: MutableList<BarEntry?> = ArrayList()
-        for (i in mEntries.indices) {
-            entries.add(mEntries[i]!!.copy())
+        mEntries?.let {
+            for (i in it.indices) {
+                entries.add(it[i]!!.copy())
+            }
         }
         val copied = BarDataSet(entries, label)
         copy(copied)
-        return copied
+        return copied as DataSet<BarEntry?>?
     }
 
     protected fun copy(barDataSet: BarDataSet) {
@@ -143,13 +145,13 @@ open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineSc
     override fun calcMinMax(e: BarEntry?) {
         if (e != null && !Float.isNaN(e.y)) {
             if (e.yVals == null) {
-                if (e.y < mYMin) mYMin = e.y
+                if (e.y < yMin) yMin = e.y
 
-                if (e.y > mYMax) mYMax = e.y
+                if (e.y > yMax) yMax = e.y
             } else {
-                if (-e.negativeSum < mYMin) mYMin = -e.negativeSum
+                if (-e.negativeSum < yMin) yMin = -e.negativeSum
 
-                if (e.positiveSum > mYMax) mYMax = e.positiveSum
+                if (e.positiveSum > yMax) yMax = e.positiveSum
             }
 
             calcMinMaxX(e)

MPChartLib/src/main/java/com/github/mikephil/charting/data/BarLineScatterCandleBubbleDataSet.kt

@@ -6,9 +6,8 @@ import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBub
 /**
  * Baseclass of all DataSets for Bar-, Line-, Scatter- and CandleStickChart.
  */
-
-abstract class BarLineScatterCandleBubbleDataSet<T : Entry>(yVals: MutableList<T?>?, label: String?) :
-    DataSet<T>(yVals, label), IBarLineScatterCandleBubbleDataSet<T> {
+abstract class BarLineScatterCandleBubbleDataSet<T : Entry?>(yVals: MutableList<T?>?, label: String = "") :
+    DataSet<T>(yVals, label), IBarLineScatterCandleBubbleDataSet<T?> {
     /**
      * Sets the color that is used for drawing the highlight indicators. Dont
      * forget to resolve the color using getResources().getColor(...) or

MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt

@@ -18,7 +18,7 @@ import com.github.mikephil.charting.utils.convertDpToPixel
  * This is the base dataset of all DataSets. It's purpose is to implement critical methods
  * provided by the IDataSet interface.
  */
-abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
+abstract class BaseDataSet<T : Entry?>() : IDataSet<T> {
     /**
      * List representing all colors that are used for this DataSet
      */
@@ -236,12 +236,10 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
         mColors.clear()
     }
 
-    override var label: String?
+    override var label: String
         get() = mLabel
         set(value) {
-            if (value != null) {
-                mLabel = value
-            }
+            mLabel = value
         }
     override var axisDependency: AxisDependency
         get() = mAxisDependency