Release 2.2

.travis.yml

@@ -7,12 +7,12 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery library
-- git clone -b release_2.1.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b release_2.2 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
 - cd gwt-material-jquery
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material library
-- git clone -b release_2.1.1 https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b release_2.2 https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.1.1" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.2" ]; then
   echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
   mvn deploy --settings ~/settings.xml
 fi

pom.xml

@@ -6,14 +6,14 @@
     <parent>
         <groupId>com.github.gwtmaterialdesign</groupId>
         <artifactId>gwt-material-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-amcharts</artifactId>
-    <version>2.1.1</version>
+    <version>2.2-SNAPSHOT</version>
     <packaging>gwt-lib</packaging>
 
     <name>gwt-material-amcharts</name>

src/main/java/gwt/material/design/amcharts/client/ui/chart/base/AbstractChart.java

@@ -319,6 +319,10 @@ public void setDataProvider(Object dataProvider) {
         getChart().dataProvider = dataProvider;
     }
 
+    public Object getDataProvider(){
+        return getChart().dataProvider;
+    }
+
     /**
      * Decimal separator.
      */

src/main/java/gwt/material/design/amcharts/client/ui/chart/js/AmCharts.java

@@ -149,6 +149,21 @@ public class AmCharts {
      */
     public static native void makeChart(String elementId, Object value);
 
-    @JsMethod
-    public static native Object parseJSON(String value);
+    /**
+     * Loads a file from url and calls function handler with the result
+     */
+    @JsMethod(namespace = "AmCharts")
+    public static native void loadFile(String dataSetUrl, Object options, Functions.Func1<Object> data);
+
+    /**
+     * Parses JSON string into an object
+     */
+    @JsMethod(namespace = "AmCharts")
+    public static native Object parseJSON(Object value);
+
+    /**
+     * Prases CSV string into an object
+     */
+    @JsMethod(namespace = "AmCharts")
+    public static native Object parseCSV(Object value, Object options);
 }

src/main/java/gwt/material/design/amcharts/client/ui/chart/js/options/AmDataLoader.java

@@ -1,86 +1,89 @@
-/*
- * #%L
- * GwtMaterial
- * %%
- * Copyright (C) 2015 - 2018 GwtMaterialDesign
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-package gwt.material.design.amcharts.client.ui.chart.js.options;
-
-import gwt.material.design.jquery.client.api.Functions;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsProperty;
-import jsinterop.annotations.JsType;
-
-//@formatter:off
-
-/**
- * JSInterop util for {@link gwt.material.design.amcharts.client.ui.chart.options.DataLoader}
- *
- * @author [email protected]
- * @see <a href="http://www.amcharts.com/kbase/using-data-loader-plugin/">Official Documentation</a>
- */
-//@formatter:on
-@JsType(isNative = true, name = "Object", namespace = JsPackage.GLOBAL)
-public class AmDataLoader {
-
-    @JsProperty
-    public boolean async;
-
-    @JsProperty
-    public Functions.Func complete;
-
-    @JsProperty
-    public String delimiter;
-
-    @JsProperty
-    public Functions.Func error;
-
-    @JsProperty
-    public String format;
-
-    @JsProperty
-    public Functions.Func load;
-
-    @JsProperty
-    public boolean noStyles;
-
-    @JsProperty
-    public Functions.Func postProcess;
-
-    @JsProperty
-    public boolean showErrors;
-
-    @JsProperty
-    public boolean showCurtain;
-
-    @JsProperty
-    public int reload;
-
-    @JsProperty
-    public String url;
-
-    @JsProperty
-    public boolean reverse;
-
-    @JsProperty
-    public int skip;
-
-    @JsProperty
-    public boolean timestamp;
-
-    @JsProperty
-    public boolean useColumnNames;
-}
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2018 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package gwt.material.design.amcharts.client.ui.chart.js.options;
+
+import gwt.material.design.jquery.client.api.Functions;
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
+
+//@formatter:off
+
+/**
+ * JSInterop util for {@link gwt.material.design.amcharts.client.ui.chart.options.DataLoader}
+ *
+ * @author [email protected]
+ * @see <a href="http://www.amcharts.com/kbase/using-data-loader-plugin/">Official Documentation</a>
+ */
+//@formatter:on
+@JsType(isNative = true, name = "Object", namespace = JsPackage.GLOBAL)
+public class AmDataLoader {
+
+    @JsProperty
+    public boolean async;
+
+    @JsProperty
+    public Functions.Func complete;
+
+    @JsProperty
+    public String delimiter;
+
+    @JsProperty
+    public Functions.Func error;
+
+    @JsProperty
+    public String format;
+
+    @JsProperty
+    public Functions.Func load;
+
+    @JsProperty
+    public boolean noStyles;
+
+    @JsProperty
+    public Functions.Func postProcess;
+
+    @JsProperty
+    public boolean showErrors;
+
+    @JsProperty
+    public boolean showCurtain;
+
+    @JsProperty
+    public int reload;
+
+    @JsProperty
+    public String url;
+
+    @JsProperty
+    public AmDataLoaderHeader[] headers;
+
+    @JsProperty
+    public boolean reverse;
+
+    @JsProperty
+    public int skip;
+
+    @JsProperty
+    public boolean timestamp;
+
+    @JsProperty
+    public boolean useColumnNames;
+}

src/main/java/gwt/material/design/amcharts/client/ui/chart/js/options/AmDataLoaderHeader.java

@@ -0,0 +1,35 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2018 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package gwt.material.design.amcharts.client.ui.chart.js.options;
+
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
+
+@JsType(isNative = true, name = "Object", namespace = JsPackage.GLOBAL)
+public class AmDataLoaderHeader {
+
+	@JsProperty
+	public String key;
+
+	@JsProperty
+	public String value;
+
+}

src/main/java/gwt/material/design/amcharts/client/ui/chart/js/options/AmGaugeAxis.java

@@ -49,7 +49,7 @@ public class AmGaugeAxis extends AmAxisBase {
     public double bandAlpha;
 
     @JsProperty
-    public int[] bandGradientRatio;
+    public double[] bandGradientRatio;
 
     @JsProperty
     public double bandOutlineAlpha;

src/main/java/gwt/material/design/amcharts/client/ui/chart/js/options/AmGaugeBand.java

@@ -49,7 +49,7 @@ public class AmGaugeBand {
     public int endValue;
 
     @JsProperty
-    public int[] gradientRatio;
+    public double[] gradientRatio;
 
     @JsProperty
     public String id;