Renamed `ShapeRenderer` -> `IShapeRenderer`

13 files changed, 36 insertions, 31 deletions

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterDataSet.java
index 01f2933d..446bce3b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterDataSet.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/ScatterDataSet.java
@@ -1,11 +1,9 @@
 
 package com.github.mikephil.charting.data;
 
-import android.graphics.drawable.shapes.Shape;
-
 import com.github.mikephil.charting.charts.ScatterChart;
 import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet;
-import com.github.mikephil.charting.renderer.scatter.ShapeRenderer;
+import com.github.mikephil.charting.renderer.scatter.IShapeRenderer;
 import com.github.mikephil.charting.renderer.scatter.SquareShapeRenderer;
 import com.github.mikephil.charting.utils.ColorTemplate;
 import com.github.mikephil.charting.utils.ShapeRendererHandler;
@@ -23,7 +21,7 @@ public class ScatterDataSet extends LineScatterCandleRadarDataSet<Entry> impleme
     /**
      * Renderer responsible for rendering this DataSet, default: square
      */
-    protected ShapeRenderer mShapeRenderer = new SquareShapeRenderer();
+    protected IShapeRenderer mShapeRenderer = new SquareShapeRenderer();
 
     /**
      * The radius of the hole in the shape (applies to Square, Circle and Triangle)
@@ -87,7 +85,7 @@ public class ScatterDataSet extends LineScatterCandleRadarDataSet<Entry> impleme
     }
 
     /**
-     * Sets the ScatterShape this DataSet should be drawn with. This will search for an available ShapeRenderer and set this
+     * Sets the ScatterShape this DataSet should be drawn with. This will search for an available IShapeRenderer and set this
      * renderer for the DataSet.
      *
      * @param shape
@@ -99,17 +97,17 @@ public class ScatterDataSet extends LineScatterCandleRadarDataSet<Entry> impleme
     }
 
     /**
-     * Sets a new ShapeRenderer responsible for drawing this DataSet.
-     * This can also be used to set a custom ShapeRenderer aside from the default ones.
+     * Sets a new IShapeRenderer responsible for drawing this DataSet.
+     * This can also be used to set a custom IShapeRenderer aside from the default ones.
      *
      * @param shapeRenderer
      */
-    public void setShapeRenderer(ShapeRenderer shapeRenderer) {
+    public void setShapeRenderer(IShapeRenderer shapeRenderer) {
         mShapeRenderer = shapeRenderer;
     }
 
     @Override
-    public ShapeRenderer getShapeRenderer() {
+    public IShapeRenderer getShapeRenderer() {
         return mShapeRenderer;
     }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.java
index e89110cd..b58d5af9 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.java
@@ -1,7 +1,6 @@
 package com.github.mikephil.charting.interfaces.dataprovider;
 
 import com.github.mikephil.charting.data.ScatterData;
-import com.github.mikephil.charting.renderer.scatter.ShapeRenderer;
 
 public interface ScatterDataProvider extends BarLineScatterCandleBubbleDataProvider {
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IScatterDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IScatterDataSet.java
index ac838a4d..ac612274 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IScatterDataSet.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IScatterDataSet.java
@@ -1,7 +1,7 @@
 package com.github.mikephil.charting.interfaces.datasets;
 
 import com.github.mikephil.charting.data.Entry;
-import com.github.mikephil.charting.renderer.scatter.ShapeRenderer;
+import com.github.mikephil.charting.renderer.scatter.IShapeRenderer;
 
 /**
  * Created by philipp on 21/10/15.
@@ -30,9 +30,9 @@ public interface IScatterDataSet extends ILineScatterCandleRadarDataSet<Entry> {
     int getScatterShapeHoleColor();
 
     /**
-     * Returns the ShapeRenderer responsible for rendering this DataSet.
+     * Returns the IShapeRenderer responsible for rendering this DataSet.
      *
      * @return
      */
-    ShapeRenderer getShapeRenderer();
+    IShapeRenderer getShapeRenderer();
 }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.java
index 484bcba5..417e553b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.java
@@ -10,7 +10,7 @@ import com.github.mikephil.charting.data.ScatterData;
 import com.github.mikephil.charting.highlight.Highlight;
 import com.github.mikephil.charting.interfaces.dataprovider.ScatterDataProvider;
 import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet;
-import com.github.mikephil.charting.renderer.scatter.ShapeRenderer;
+import com.github.mikephil.charting.renderer.scatter.IShapeRenderer;
 import com.github.mikephil.charting.utils.MPPointD;
 import com.github.mikephil.charting.utils.Transformer;
 import com.github.mikephil.charting.utils.Utils;
@@ -72,12 +72,12 @@ public class ScatterChartRenderer extends LineScatterCandleRadarRenderer {
 
         trans.pointValuesToPixel(buffer.buffer);
 
-        ShapeRenderer renderer = dataSet.getShapeRenderer();
+        IShapeRenderer renderer = dataSet.getShapeRenderer();
 
         if (renderer != null) {
             renderer.renderShape(c, dataSet, mViewPortHandler, buffer, mRenderPaint, shapeSize);
         } else {
-            throw new RuntimeException("No ShapeRenderer found for provided identifier. Please make sure to add a ShapeRenderer" +
+            throw new RuntimeException("No IShapeRenderer found for provided identifier. Please make sure to add a IShapeRenderer" +
                     " capable of rendering the provided shape.");
         }
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronDownShapeRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronDownShapeRenderer.java
index d293b284..cdc3f2af 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronDownShapeRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronDownShapeRenderer.java
@@ -12,7 +12,8 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
  * Created by wajdic on 15/06/2016.
  * Created at Time 09:08
  */
-public class ChevronDownShapeRenderer implements ShapeRenderer {
+public class ChevronDownShapeRenderer implements IShapeRenderer
+{
 
 
     @Override
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronUpShapeRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronUpShapeRenderer.java
index 4eb9db79..f4185bfd 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronUpShapeRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ChevronUpShapeRenderer.java
@@ -12,7 +12,8 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
  * Created by wajdic on 15/06/2016.
  * Created at Time 09:08
  */
-public class ChevronUpShapeRenderer implements ShapeRenderer {
+public class ChevronUpShapeRenderer implements IShapeRenderer
+{
 
 
     @Override
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CircleShapeRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CircleShapeRenderer.java
index 449bd9fe..98ed8c14 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CircleShapeRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CircleShapeRenderer.java
@@ -13,7 +13,8 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
  * Created by wajdic on 15/06/2016.
  * Created at Time 09:08
  */
-public class CircleShapeRenderer implements ShapeRenderer {
+public class CircleShapeRenderer implements IShapeRenderer
+{
 
     @Override
     public void renderShape(Canvas c, IScatterDataSet dataSet, ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CrossShapeRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CrossShapeRenderer.java
index 45db6566..3273490a 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CrossShapeRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CrossShapeRenderer.java
@@ -12,7 +12,8 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
  * Created by wajdic on 15/06/2016.
  * Created at Time 09:08
  */
-public class CrossShapeRenderer implements ShapeRenderer {
+public class CrossShapeRenderer implements IShapeRenderer
+{
 
 
     @Override
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ShapeRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/IShapeRenderer.java
index 3fb23f77..f89d6f6b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/ShapeRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/IShapeRenderer.java
@@ -12,7 +12,8 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
  * Created by wajdic on 15/06/2016.
  * Created at Time 09:07
  */
-public interface ShapeRenderer {
+public interface IShapeRenderer
+{
 
     /**
      * Renders the provided ScatterDataSet with a shape.
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/SquareShapeRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/SquareShapeRenderer.java
index 184e77a4..74670473 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/SquareShapeRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/SquareShapeRenderer.java
@@ -13,7 +13,8 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
  * Created by wajdic on 15/06/2016.
  * Created at Time 09:08
  */
-public class SquareShapeRenderer implements ShapeRenderer {
+public class SquareShapeRenderer implements IShapeRenderer
+{
 
 
     @Override
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/TriangleShapeRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/TriangleShapeRenderer.java
index 789297d1..f8e2f30b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/TriangleShapeRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/TriangleShapeRenderer.java
@@ -14,7 +14,8 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
  * Created by wajdic on 15/06/2016.
  * Created at Time 09:08
  */
-public class TriangleShapeRenderer implements ShapeRenderer {
+public class TriangleShapeRenderer implements IShapeRenderer
+{
 
     protected Path mTrianglePathBuffer = new Path();
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/XShapeRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/XShapeRenderer.java
index 2dbac6a9..3c37174e 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/XShapeRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/XShapeRenderer.java
@@ -12,7 +12,8 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
  * Created by wajdic on 15/06/2016.
  * Created at Time 09:08
  */
-public class XShapeRenderer implements ShapeRenderer {
+public class XShapeRenderer implements IShapeRenderer
+{
 
 
     @Override
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ShapeRendererHandler.java b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ShapeRendererHandler.java
index 0cef75f1..c2093e6e 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ShapeRendererHandler.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ShapeRendererHandler.java
@@ -5,7 +5,7 @@ import com.github.mikephil.charting.renderer.scatter.ChevronDownShapeRenderer;
 import com.github.mikephil.charting.renderer.scatter.ChevronUpShapeRenderer;
 import com.github.mikephil.charting.renderer.scatter.CircleShapeRenderer;
 import com.github.mikephil.charting.renderer.scatter.CrossShapeRenderer;
-import com.github.mikephil.charting.renderer.scatter.ShapeRenderer;
+import com.github.mikephil.charting.renderer.scatter.IShapeRenderer;
 import com.github.mikephil.charting.renderer.scatter.SquareShapeRenderer;
 import com.github.mikephil.charting.renderer.scatter.TriangleShapeRenderer;
 import com.github.mikephil.charting.renderer.scatter.XShapeRenderer;
@@ -14,16 +14,16 @@ import java.util.HashMap;
 
 /**
  * Created by Philipp Jahoda on 27/06/16.
- * Class allowing to determine the corresponding ShapeRenderer for a given ScatterShape.
+ * Class allowing to determine the corresponding IShapeRenderer for a given ScatterShape.
  */
 public final class ShapeRendererHandler {
 
     /**
-     * Dictionary of ShapeRenderer which are responsible for drawing custom shapes.
+     * Dictionary of IShapeRenderer which are responsible for drawing custom shapes.
      * Can add to it your custom shapes.
-     * CustomShapeRenderer Implements ShapeRenderer{}
+     * CustomShapeRenderer Implements IShapeRenderer{}
      */
-    protected HashMap<String, ShapeRenderer> shapeRendererList;
+    protected HashMap<String, IShapeRenderer> shapeRendererList;
 
     /**
      * Constructor
@@ -33,12 +33,12 @@ public final class ShapeRendererHandler {
     }
 
     /**
-     * Returns the corresponding ShapeRenderer for a given ScatterShape.
+     * Returns the corresponding IShapeRenderer for a given ScatterShape.
      *
      * @param shape
      * @return
      */
-    public ShapeRenderer getShapeRenderer(ScatterChart.ScatterShape shape) {
+    public IShapeRenderer getShapeRenderer(ScatterChart.ScatterShape shape) {
         return shapeRendererList.get(shape.toString());
     }