Merge pull request #3 from GwtMaterialDesign/fixes/mk_022018

Updates / Fixes on AmChart core libraries.

Author: kevzlou7979

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

@@ -30,9 +30,9 @@
 import gwt.material.design.amcharts.client.ui.chart.events.object.CoordinateGraphItemData;
 import gwt.material.design.amcharts.client.ui.chart.js.AmCoordinateChart;
 import gwt.material.design.amcharts.client.ui.chart.js.AmGraph;
+import gwt.material.design.amcharts.client.ui.chart.js.options.Guide;
 import gwt.material.design.amcharts.client.ui.chart.js.options.AmValueAxis;
 import gwt.material.design.amcharts.client.ui.chart.options.Graph;
-import gwt.material.design.amcharts.client.ui.chart.options.Guide;
 import gwt.material.design.amcharts.client.ui.chart.options.ValueAxis;
 import gwt.material.design.client.base.helper.ColorHelper;
 import gwt.material.design.client.constants.Color;
@@ -133,9 +133,7 @@ public void setGridAboveGraphs(boolean gridAboveGraphs) {
      * specify a different valueAxis for the guide.
      */
     public void setGuides(Guide... guides) {
-        for (int i = 0; i < guides.length; i++) {
-            getChart().guides[i] = guides[i].getAmGuide();
-        }
+        getChart().guides = guides;
     }
 
     /**

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

@@ -21,8 +21,8 @@
 
 import gwt.material.design.amcharts.client.ui.chart.base.constants.ChartType;
 import gwt.material.design.amcharts.client.ui.chart.js.AmGanttChart;
-import gwt.material.design.amcharts.client.ui.chart.js.AmGraph;
-import gwt.material.design.amcharts.client.ui.chart.js.options.AmValueAxis;
+import gwt.material.design.amcharts.client.ui.chart.options.Graph;
+import gwt.material.design.amcharts.client.ui.chart.options.ValueAxis;
 
 //@formatter:off
 
@@ -36,6 +36,7 @@
 //@formatter:on
 public class GanttChart extends SerialChart {
 
+    private AmGanttChart amGanttChart;
 
     public GanttChart() {
         super(ChartType.GANTT);
@@ -83,8 +84,8 @@ public void setEndField(String endField) {
      * Graph of a Gantt chart. Gant chart actually creates multiple graphs (separate for each segment). Properties of
      * this graph are passed to each of the created graphs - this allows you to control the look of segments.
      */
-    public void setGraph(AmGraph graph) {
-        getChart().graph = graph;
+    public void setGraph(Graph graph) {
+        getChart().graph = graph.getAmGraph();
     }
 
     /**
@@ -94,6 +95,10 @@ public void setPeriod(String period) {
         getChart().period = period;
     }
 
+    public void setColorField(String colorField) {
+        getChart().colorField = colorField;
+    }
+
     /**
      * Segments field in your data provider.
      */
@@ -121,12 +126,16 @@ public void setStartField(String startField) {
     /**
      * Value axis of Gantt chart. Set it's type to "date" if your data is date or time based.
      */
-    public void setValueAxis(AmValueAxis valueAxis) {
-        getChart().valueAxis = valueAxis;
+    public void setValueAxis(ValueAxis valueAxis) {
+        getChart().valueAxis = valueAxis.getAmValueAxis();
+        valueAxis.load();
     }
 
     @Override
     public AmGanttChart getChart() {
-        return new AmGanttChart();
+        if (amGanttChart == null) {
+            amGanttChart = new AmGanttChart();
+        }
+        return amGanttChart;
     }
 }

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

@@ -21,6 +21,7 @@
 
 import gwt.material.design.amcharts.client.ui.chart.base.constants.ChartType;
 import gwt.material.design.amcharts.client.ui.chart.js.AmPieChart;
+import gwt.material.design.amcharts.client.ui.chart.js.options.GraphDataItem;
 import gwt.material.design.jquery.client.api.Functions;
 
 //@formatter:off
@@ -57,7 +58,7 @@ public void setAngle(int angle) {
 
     /**
      * If you set some function, the graph will call it and pass
-     * {@link gwt.material.design.amcharts.client.ui.chart.options.GraphDataItem} object to it. This function
+     * {@link GraphDataItem} object to it. This function
      * should return a string which will be displayed in a balloon.
      */
     public void setBalloonFunction(Functions.Func balloonFunction) {

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

@@ -26,6 +26,7 @@
 import gwt.material.design.amcharts.client.ui.chart.options.TrendLine;
 import gwt.material.design.client.base.helper.ColorHelper;
 import gwt.material.design.client.constants.Color;
+import gwt.material.design.client.ui.MaterialToast;
 
 //@formatter:off
 
@@ -87,43 +88,36 @@ public void setDepth3D(int depth3D) {
     }
 
     /**
-     * Number of pixels between the container's bottom border and plot area. This space can be used for bottom axis'
-     * values. If autoMargin is true and bottom side has axis, this property is ignored. Default to 20
+     * Flag which should be set to false if you need margins to be recalculated on next chart.validateNow() call.
+     * Default to false
      */
-    public void setMarginLeft(int marginLeft) {
-        getChart().marginLeft = marginLeft;
+    public void setMarginsUpdated(boolean marginsUpdated) {
+        getChart().marginsUpdated = marginsUpdated;
     }
 
-    /**
-     * Number of pixels between the container's bottom border and plot area. This space can be used for left axis' values.
-     * If autoMargin is true and left side has axis, this property is ignored. Default to 20
-     */
-    public void setMarginBottom(int marginBottom) {
-        getChart().marginBottom = marginBottom;
+    @Override
+    public void setMargin(double margin) {
+        super.setMargin(margin);
     }
 
-    /**
-     * Number of pixels between the container's right border and plot area. This space can be used for Right axis'
-     * values. If autoMargin is true and right side has axis, this property is ignored. Default to 20
-     */
-    public void setMarginRight(int marginRight) {
-        getChart().marginRight = marginRight;
+    @Override
+    public void setMarginTop(double marginTop) {
+        getChart().marginTop = (int) marginTop;
     }
 
-    /**
-     * Number of pixels between the container's top border and plot area. This space can be used for top axis' values.
-     * If autoMargin is true and top side has axis, this property is ignored. Default to 20
-     */
-    public void setMarginTop(int marginTop) {
-        getChart().marginTop = marginTop;
+    @Override
+    public void setMarginBottom(double marginBottom) {
+        getChart().marginBottom = (int) marginBottom;
     }
 
-    /**
-     * Flag which should be set to false if you need margins to be recalculated on next chart.validateNow() call.
-     * Default to false
-     */
-    public void setMarginsUpdated(boolean marginsUpdated) {
-        getChart().marginsUpdated = marginsUpdated;
+    @Override
+    public void setMarginLeft(double marginLeft) {
+        getChart().marginLeft = (int) marginLeft;
+    }
+
+    @Override
+    public void setMarginRight(double marginRight) {
+        getChart().marginRight = (int) marginRight;
     }
 
     /**

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

@@ -695,6 +695,14 @@ public void validateNow(Object validateData, boolean skipEvents) {
         getChart().validateNow(validateData, skipEvents);
     }
 
+    /**
+     * This method should be called after you changed one or more properties of any class. The chart will redraw after
+     * this method is called.Both attributes, validateData and skipEvents are optional (false by default).
+     */
+    public void validateNow() {
+        getChart().validateNow();
+    }
+
     /**
      * Adds chart to the specified DIV.
      *

src/main/java/gwt/material/design/amcharts/client/ui/chart/events/object/AxisGuideData.java

@@ -20,7 +20,7 @@
 package gwt.material.design.amcharts.client.ui.chart.events.object;
 
 import gwt.material.design.amcharts.client.ui.chart.js.AmRectangularChart;
-import gwt.material.design.amcharts.client.ui.chart.js.options.AmGuide;
+import gwt.material.design.amcharts.client.ui.chart.js.options.Guide;
 import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsPackage;
 import jsinterop.annotations.JsProperty;
@@ -33,7 +33,7 @@ public class AxisGuideData {
     private String type;
 
     @JsProperty
-    private AmGuide graph;
+    private Guide graph;
 
     @JsProperty
     private AmRectangularChart chart;
@@ -44,7 +44,7 @@ public final String getType() {
     }
 
     @JsOverlay
-    public final AmGuide getGraph() {
+    public final Guide getGraph() {
         return graph;
     }
 

src/main/java/gwt/material/design/amcharts/client/ui/chart/events/object/AxisItemData.java

@@ -21,7 +21,7 @@
 
 import gwt.material.design.amcharts.client.ui.chart.js.AmRectangularChart;
 import gwt.material.design.amcharts.client.ui.chart.js.options.AmAxisBase;
-import gwt.material.design.amcharts.client.ui.chart.js.options.AmSerialDataItem;
+import gwt.material.design.amcharts.client.ui.chart.js.options.SerialDataItem;
 import gwt.material.design.amcharts.client.ui.chart.js.options.Label;
 import gwt.material.design.jquery.client.api.MouseEvent;
 import jsinterop.annotations.JsOverlay;
@@ -51,7 +51,7 @@ public class AxisItemData {
     private Object value;
 
     @JsProperty
-    private AmSerialDataItem serialDataItem;
+    private SerialDataItem serialDataItem;
 
     @JsOverlay
     public final String getType() {
@@ -64,7 +64,7 @@ public final Object getValue() {
     }
 
     @JsOverlay
-    public final AmSerialDataItem getSerialDataItem() {
+    public final SerialDataItem getSerialDataItem() {
         return serialDataItem;
     }
 

src/main/java/gwt/material/design/amcharts/client/ui/chart/events/object/CoordinateGraphItemData.java

@@ -21,7 +21,7 @@
 
 import gwt.material.design.amcharts.client.ui.chart.js.AmChart;
 import gwt.material.design.amcharts.client.ui.chart.js.AmGraph;
-import gwt.material.design.amcharts.client.ui.chart.js.options.AmGraphDataItem;
+import gwt.material.design.amcharts.client.ui.chart.js.options.GraphDataItem;
 import gwt.material.design.jquery.client.api.MouseEvent;
 import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsPackage;
@@ -35,7 +35,7 @@ public class CoordinateGraphItemData {
     private AmGraph graph;
 
     @JsProperty
-    private AmGraphDataItem item;
+    private GraphDataItem item;
 
     @JsProperty
     private int index;
@@ -52,7 +52,7 @@ public final AmGraph getGraph() {
     }
 
     @JsOverlay
-    public final AmGraphDataItem getItem() {
+    public final GraphDataItem getItem() {
         return item;
     }
 

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

@@ -25,10 +25,7 @@
 import gwt.material.design.amcharts.client.ui.chart.js.options.Title;
 import gwt.material.design.amcharts.client.ui.chart.plugins.export.js.AmExportOption;
 import gwt.material.design.jquery.client.api.Functions;
-import jsinterop.annotations.JsMethod;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsProperty;
-import jsinterop.annotations.JsType;
+import jsinterop.annotations.*;
 
 //@formatter:off
 
@@ -533,6 +530,13 @@ public class AmChart {
     @JsMethod
     public native void validateNow(Object validateData, boolean skipEvents);
 
+    /**
+     * This method should be called after you changed one or more properties of any class. The chart will redraw after
+     * this method is called.Both attributes, validateData and skipEvents are optional (false by default).
+     */
+    @JsMethod
+    public native void validateNow();
+
     /**
      * Adds chart to the specified DIV.
      *

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

@@ -19,7 +19,7 @@
  */
 package gwt.material.design.amcharts.client.ui.chart.js;
 
-import gwt.material.design.amcharts.client.ui.chart.js.options.AmGuide;
+import gwt.material.design.amcharts.client.ui.chart.js.options.Guide;
 import gwt.material.design.amcharts.client.ui.chart.js.options.AmValueAxis;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsProperty;
@@ -69,7 +69,7 @@ public class AmCoordinateChart extends AmChart {
      * specify a different valueAxis for the guide.
      */
     @JsProperty
-    public AmGuide[] guides;
+    public Guide[] guides;
 
     /**
      * Specifies whether the animation should be sequenced or all objects should appear at once. Default to true