From 2dee57a0dc64418d648dba9104ffecb5c8667eb3 Mon Sep 17 00:00:00 2001 From: Philipp Jahoda Date: Tue, 19 Jan 2016 00:00:52 +0100 Subject: [PATCH] Minor fixes --- .../gradle/org.springsource.ide.eclipse.gradle.core.prefs | 4 ++++ .../gradle/org.springsource.ide.eclipse.gradle.core.prefs | 3 +++ MPChartExample/project.properties | 2 +- .../xxmassdeveloper/mpchartexample/custom/RealmDemoData.java | 2 +- .../gradle/org.springsource.ide.eclipse.gradle.core.prefs | 4 ++++ MPChartLib/project.properties | 2 +- .../src/com/github/mikephil/charting/data/BaseDataSet.java | 2 +- 7 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 .settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs create mode 100644 MPChartExample/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs create mode 100644 MPChartLib/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 00000000..9383f623 --- /dev/null +++ b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs @@ -0,0 +1,4 @@ +#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences +#Mon Jan 18 23:02:46 CET 2016 +build.family.org.gradle.tooling.model.eclipse.HierarchicalEclipseProject=;MPChartExample;MPChartLib; +org.springsource.ide.eclipse.gradle.rootprojectloc= diff --git a/MPChartExample/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/MPChartExample/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 00000000..be975eb2 --- /dev/null +++ b/MPChartExample/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs @@ -0,0 +1,3 @@ +#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences +#Mon Jan 18 23:02:46 CET 2016 +org.springsource.ide.eclipse.gradle.rootprojectloc=.. diff --git a/MPChartExample/project.properties b/MPChartExample/project.properties index 07fc2a4c..b32d807b 100644 --- a/MPChartExample/project.properties +++ b/MPChartExample/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-22 +target=android-23 android.library.reference.1=../MPChartLib diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/RealmDemoData.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/RealmDemoData.java index 503acd9f..58767447 100644 --- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/RealmDemoData.java +++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/RealmDemoData.java @@ -46,7 +46,7 @@ public class RealmDemoData extends RealmObject { public RealmDemoData(float[] stackValues, int xIndex, String xValue) { this.xIndex = xIndex; this.xValue = xValue; - this.stackValues = new RealmList<>(); + this.stackValues = new RealmList(); for (float val : stackValues) { this.stackValues.add(new RealmFloat(val)); diff --git a/MPChartLib/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/MPChartLib/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 00000000..77dc3a2d --- /dev/null +++ b/MPChartLib/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs @@ -0,0 +1,4 @@ +#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences +#Mon Jan 18 23:02:46 CET 2016 +org.springsource.ide.eclipse.gradle.linkedresources= +org.springsource.ide.eclipse.gradle.rootprojectloc=.. diff --git a/MPChartLib/project.properties b/MPChartLib/project.properties index 362a0a30..b2ef7dcc 100644 --- a/MPChartLib/project.properties +++ b/MPChartLib/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-22 +target=android-23 android.library=true diff --git a/MPChartLib/src/com/github/mikephil/charting/data/BaseDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/BaseDataSet.java index 7e62a14f..74b4d478 100644 --- a/MPChartLib/src/com/github/mikephil/charting/data/BaseDataSet.java +++ b/MPChartLib/src/com/github/mikephil/charting/data/BaseDataSet.java @@ -75,7 +75,7 @@ public abstract class BaseDataSet implements IDataSet { * Default constructor. */ public BaseDataSet() { - mColors = new ArrayList<>(); + mColors = new ArrayList(); // default color mColors.add(Color.rgb(140, 234, 255));