Minor fix in CombinedData.

PhilJay · PhilJay · commit d8cb907465eb · 2015-05-06T12:14:54.000+02:00
diff --git a/MPChartLib/AndroidManifest.xml b/MPChartLib/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="21" />
+        android:targetSdkVersion="22" />
 
  <!--  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/CombinedData.java b/MPChartLib/src/com/github/mikephil/charting/data/CombinedData.java
@@ -4,7 +4,7 @@
 import java.util.List;
 
 /**
- * Data object that allows the combination of Line-, Bar-, Scatter- and
+ * Data object that allows the combination of Line-, Bar-, Scatter-, Bubble- and
  * CandleData. Used in the CombinedChart class.
  * 
  * @author Philipp Jahoda
@@ -52,13 +52,13 @@ public void setData(CandleData data) {
         mDataSets.addAll(data.getDataSets());
         init(data.getDataSets());
     }
-    
+
     public void setData(BubbleData data) {
         mBubbleData = data;
         mDataSets.addAll(data.getDataSets());
         init(data.getDataSets());
     }
-    
+
     public BubbleData getBubbleData() {
         return mBubbleData;
     }
@@ -81,9 +81,15 @@ public CandleData getCandleData() {
 
     @Override
     public void notifyDataChanged() {
-        mLineData.notifyDataChanged();
-        mBarData.notifyDataChanged();
-        mCandleData.notifyDataChanged();
-        mScatterData.notifyDataChanged();
+        if (mLineData != null)
+            mLineData.notifyDataChanged();
+        if (mBarData != null)
+            mBarData.notifyDataChanged();
+        if (mCandleData != null)
+            mCandleData.notifyDataChanged();
+        if (mScatterData != null)
+            mScatterData.notifyDataChanged();
+        if (mBubbleData != null)
+            mBubbleData.notifyDataChanged();
     }
 }
