Merge pull request #12 from GwtMaterialDesign/release_2.4.0

Release 2.4.0

Author: kevzlou7979

.travis.yml

@@ -8,12 +8,12 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery library
-- git clone -b release_2.3 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b release_2.4.0 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.3 https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b release_2.4.0 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.3" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.0" ]; 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

README.md

@@ -13,12 +13,12 @@ AmCharts V4 Official Documentation can be found [here](https://www.amcharts.com/
 
 
 ## Maven
-### Current Version 2.3.0
+### Current Version 2.4.0-rc1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-am4charts</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-rc1</version>
 </dependency>
 ```
 

gwt-material-am4charts.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="gwt" name="GWT">
       <configuration>
@@ -13,6 +13,15 @@
           <module name="gwt.material.design.amcore.GwtMaterialAmCore" enabled="false" />
           <module name="gwt.material.design.ammaps.GwtMaterialAmMaps" enabled="false" />
           <module name="gwt.material.design.ammaps.GwtMaterialAmMapsBase" enabled="false" />
+          <module name="gwt.material.design.amplugin.annotation.Annotation" enabled="false" />
+          <module name="gwt.material.design.amplugin.bullets.Bullets" enabled="false" />
+          <module name="gwt.material.design.amplugin.forcedirected.ForceDirected" enabled="false" />
+          <module name="gwt.material.design.amplugin.overlapbuster.OverlapBuster" enabled="false" />
+          <module name="gwt.material.design.amplugin.regression.Regression" enabled="false" />
+          <module name="gwt.material.design.amplugin.slicegrouper.SliceGrouper" enabled="false" />
+          <module name="gwt.material.design.amplugin.sunburst.Sunburst" enabled="false" />
+          <module name="gwt.material.design.amplugin.timeline.Timeline" enabled="false" />
+          <module name="gwt.material.design.amplugin.wordcloud.WordCloud" enabled="false" />
         </packaging>
       </configuration>
     </facet>
@@ -27,6 +36,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.github.gwtmaterialdesign:gwt-material-jquery:2.3.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.google.gwt:gwt-user:2.8.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:sources:1.0.2" level="project" />
@@ -82,7 +92,7 @@
     <orderEntry type="library" name="Maven: org.eclipse.jetty.toolchain:jetty-schemas:3.1.M0" level="project" />
     <orderEntry type="library" name="Maven: org.mortbay.jasper:apache-jsp:8.0.9.M3" level="project" />
     <orderEntry type="library" name="Maven: org.mortbay.jasper:apache-el:8.0.9.M3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.gwtmaterialdesign:gwt-material-jquery:2.3" level="project" />
+    <orderEntry type="module" module-name="gwt-material-jquery" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-am4charts</artifactId>
-    <version>2.3</version>
+    <version>2.4.0-rc1</version>
     <packaging>gwt-lib</packaging>
 
     <name>Gwt Material AmCharts V4</name>
@@ -28,8 +28,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.encoding>UTF-8</project.encoding>
-        <tbroyer.version>1.0-rc-9</tbroyer.version>
-        <gwt.version>2.8.2</gwt.version>
+        <tbroyer.version>1.0.0</tbroyer.version>
+        <gwt.version>2.9.0</gwt.version>
         <gmd.jquery.version>${project.version}</gmd.jquery.version>
         <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
     </properties>
@@ -38,7 +38,7 @@
         <connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</connection>
         <developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material</url>
-        <tag>v2.3</tag>
+        <tag>v2.4.0-rc1</tag>
     </scm>
 
     <licenses>

src/main/java/gwt/material/design/amcharts/client/XYChart.java

@@ -51,6 +51,9 @@ public static final XYChart create(Widget container) {
     @JsProperty
     public boolean maskBullets;
 
+    @JsProperty
+    public Container tooltipContainer;
+
     /**
      * @see MouseWheelBehavior
      */

src/main/java/gwt/material/design/amcharts/client/axis/Axis.java

@@ -24,9 +24,12 @@
 import gwt.material.design.amcharts.client.dataitem.AxisDataItem;
 import gwt.material.design.amcharts.client.renderer.AxisRenderer;
 import gwt.material.design.amcharts.client.series.XYSeries;
-import gwt.material.design.amcore.client.base.Sprite;
+import gwt.material.design.amcore.client.base.Component;
 import gwt.material.design.amcore.client.events.SpriteEventDispatcher;
-import gwt.material.design.amcore.client.list.*;
+import gwt.material.design.amcore.client.list.DictionaryTemplate;
+import gwt.material.design.amcore.client.list.List;
+import gwt.material.design.amcore.client.list.ListTemplate;
+import gwt.material.design.amcore.client.list.SortedListTemplate;
 import gwt.material.design.amcore.client.properties.OrientationPoint;
 import gwt.material.design.amcore.client.properties.Point;
 import gwt.material.design.amcore.client.state.SpriteState;
@@ -36,7 +39,7 @@
 import jsinterop.annotations.JsType;
 
 @JsType(isNative = true, namespace = "am4charts")
-public class Axis extends Sprite {
+public class Axis extends Component {
 
     @JsProperty
     public boolean autoDispose;

src/main/java/gwt/material/design/amcharts/client/axis/DateAxis.java

@@ -40,6 +40,14 @@ public class DateAxis extends ValueAxis {
     @JsProperty
     public int baseDuration;
 
+    /**
+     * A base interval (granularity) of data.
+     * Used to indicate what are the base units of your data.
+     * For example, if you have a data set that has a data point every 5 minutes, you may want to set this to { timeUnit: "minute", count: 5 }.
+     * If not set, the Axis will try to determine the setting by its own, looking at actual data.
+     * For best results, try to follow these values for count:
+     * When unit is "month", use 12 / count = round number When unit is "hour", use 24 / count = round number When unit is "second" and "minute", use 60 / count = round number
+     */
     @JsProperty
     public TimeInterval baseInterval;
 
@@ -58,6 +66,9 @@ public class DateAxis extends ValueAxis {
     @JsProperty
     public boolean skipEmptyPeriods;
 
+    @JsProperty
+    public JsDate tooltipDate;
+
     @JsProperty
     public String tooltipDateFormat;
 
@@ -142,4 +153,62 @@ public final void zoomToDates(Date startDate, Date endDate) {
     public final void zoomToDates(Date startDate, Date endDate, boolean skipRangeEvent, boolean instantly) {
         zoomToDates(JsDate.create(startDate.getTime()), JsDate.create(endDate.getTime()), skipRangeEvent, instantly);
     }
+
+    /**
+     * Type number
+     * Indicates threshold of data items in selected range at which to start aggregating data items if groupData = true.
+     */
+    @JsProperty
+    public int groupCount;
+
+    /**
+     * Type boolean
+     * Indicates if data should be aggregated to composide data items if there are more data items in selected range than groupCount.
+     * Grouping will occur automatically, based on current selection range, and will change dynamically when user zooms in/out the chart.
+     * NOTE: This works only if DateAxis is base axis of an XYSeries.
+     * The related XYSeries also needs to be set up to take advantage of, by setting its groupFields.
+     * The group intervals to aggregate data to is defined by groupIntervals property.
+     */
+    @JsProperty
+    public boolean groupData;
+
+    /**
+     * If data aggregation is enabled by setting Axis' groupData = true, the chart will try to aggregate data items into grouped data items.
+     * If there are more data items in selected period than groupCount, it will group data items into bigger period.
+     * For example seconds might be grouped into 10-second aggregate data items.
+     * This setting indicates what group intervals can the chart group to.
+     *
+     * Default intervals:
+     *
+     * [
+     *   { timeUnit: "millisecond", count: 1},
+     *   { timeUnit: "millisecond", count: 10 },
+     *   { timeUnit: "millisecond", count: 100 },
+     *   { timeUnit: "second", count: 1 },
+     *   { timeUnit: "second", count: 10 },
+     *   { timeUnit: "minute", count: 1 },
+     *   { timeUnit: "minute", count: 10 },
+     *   { timeUnit: "hour", count: 1 },
+     *   { timeUnit: "day", count: 1 },
+     *   { timeUnit: "week", count: 1 },
+     *   { timeUnit: "month", count: 1 },
+     *   { timeUnit: "year", count: 1 }
+     * ]
+     */
+    @JsProperty
+    public List<TimeInterval> groupIntervals;
+
+    /**
+     *A collection of start timestamps to use as axis' max timestamp for particular data item item periods.
+     @readonly
+     */
+    @JsProperty
+    public boolean groupMax;
+
+    /**
+     *A collection of start timestamps to use as axis' min timestamp for particular data item item periods.
+     @readonly
+     */
+    @JsProperty
+    public boolean groupMin;
 }

src/main/java/gwt/material/design/amcharts/client/axis/ValueAxis.java

@@ -21,6 +21,7 @@
 
 import gwt.material.design.amcharts.client.SerialChart;
 import gwt.material.design.amcharts.client.dataitem.ValueAxisDataItem;
+import gwt.material.design.amcharts.client.renderer.AxisRenderer;
 import gwt.material.design.amcore.client.list.List;
 import gwt.material.design.amcharts.client.datafield.axis.ValueAxisDataFields;
 import gwt.material.design.amcore.client.list.ListTemplate;

src/main/java/gwt/material/design/amcharts/client/base/TimeInterval.java

@@ -19,6 +19,7 @@
  */
 package gwt.material.design.amcharts.client.base;
 
+import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsPackage;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
@@ -34,4 +35,12 @@ public class TimeInterval {
      */
     @JsProperty
     public String timeUnit;
+
+    @JsOverlay
+    public static final TimeInterval create(int count, String timeUnit) {
+        TimeInterval timeInterval = new TimeInterval();
+        timeInterval.count = count;
+        timeInterval.timeUnit = timeUnit;
+        return timeInterval;
+    }
 }