barBuffers as MutaableList

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt

@@ -28,10 +28,11 @@ open class BarChartRenderer(
     protected var barRect: RectF = RectF()
 
     @JvmField
-    protected var barBuffers: Array<BarBuffer?>? = null
+    protected var barBuffers: MutableList<BarBuffer?> = mutableListOf()
 
     @JvmField
     protected var shadowPaint: Paint
+
     @JvmField
     protected var barBorderPaint: Paint
 
@@ -55,19 +56,20 @@ open class BarChartRenderer(
 
     override fun initBuffers() {
         val barData = chart.barData
-        barBuffers = arrayOfNulls(barData.dataSetCount)
-
-        for (i in barBuffers!!.indices) {
-            val set = barData.getDataSetByIndex(i)
-            barBuffers!![i] = BarBuffer(
-                set.entryCount * 4 * (if (set.isStacked) set.stackSize else 1),
-                barData.dataSetCount, set.isStacked
+        barBuffers = mutableListOf()
+
+        barData.dataSets.forEach {
+            barBuffers.add(
+                BarBuffer(
+                    it.entryCount * 4 * (if (it.isStacked) it.stackSize else 1),
+                    barData.dataSetCount, it.isStacked
+                )
             )
         }
     }
 
     override fun drawData(c: Canvas) {
-        if (barBuffers == null) {
+        if (barBuffers.size == 0) {
             initBuffers()
         }
 
@@ -154,7 +156,7 @@ open class BarChartRenderer(
         }
 
         // initialize the buffer
-        val buffer = barBuffers!![index]
+        val buffer = barBuffers[index]
         buffer!!.setPhases(phaseX, phaseY)
         buffer.setDataSet(index)
         buffer.setInverted(chart.isInverted(dataSet.axisDependency))
@@ -286,7 +288,7 @@ open class BarChartRenderer(
                 }
 
                 // get the buffer
-                val buffer = barBuffers!![i]
+                val buffer = barBuffers[i]
 
                 val phaseY = mAnimator.phaseY
 

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java

@@ -42,12 +42,12 @@ public HorizontalBarChartRenderer(BarDataProvider chart, ChartAnimator animator,
 	public void initBuffers() {
 
 		BarData barData = chart.getBarData();
-		barBuffers = new HorizontalBarBuffer[barData.getDataSetCount()];
+//		barBuffers = new HorizontalBarBuffer[barData.getDataSetCount()];
 
-		for (int i = 0; i < barBuffers.length; i++) {
+		for (int i = 0; i < barData.getDataSetCount(); i++) {
 			IBarDataSet set = barData.getDataSetByIndex(i);
-			barBuffers[i] = new HorizontalBarBuffer(set.getEntryCount() * 4 * (set.isStacked() ? set.getStackSize() : 1),
-					barData.getDataSetCount(), set.isStacked());
+			barBuffers.add(new HorizontalBarBuffer(set.getEntryCount() * 4 * (set.isStacked() ? set.getStackSize() : 1),
+					barData.getDataSetCount(), set.isStacked()));
 		}
 	}
 
@@ -105,7 +105,7 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
 		}
 
 		// initialize the buffer
-		BarBuffer buffer = barBuffers[index];
+		BarBuffer buffer = barBuffers.get(index);
 		buffer.setPhases(phaseX, phaseY);
 		buffer.setDataSet(index);
 		buffer.setInverted(chart.isInverted(dataSet.getAxisDependency()));
@@ -192,7 +192,7 @@ public void drawValues(Canvas c) {
 				IValueFormatter formatter = dataSet.getValueFormatter();
 
 				// get the buffer
-				BarBuffer buffer = barBuffers[i];
+				BarBuffer buffer = barBuffers.get(i);
 
 				final float phaseY = mAnimator.getPhaseY();
 

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.java

@@ -88,7 +88,7 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
 			}
 		}
 
-		BarBuffer buffer = barBuffers[index];
+		BarBuffer buffer = barBuffers.get(index);
 		buffer.setPhases(phaseX, phaseY);
 		buffer.setDataSet(index);
 		buffer.setInverted(chart.isInverted(dataSet.getAxisDependency()));

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.java

@@ -87,7 +87,7 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
 			}
 		}
 
-		BarBuffer buffer = barBuffers[index];
+		BarBuffer buffer = barBuffers.get(index);
 		buffer.setPhases(phaseX, phaseY);
 		buffer.setDataSet(index);
 		buffer.setInverted(chart.isInverted(dataSet.getAxisDependency()));