Fixes and updates

Author: kevzlou7979

src/main/java/gwt/material/design/amcharts/client/ui/maps/base/constants/MapLayer.java

@@ -23,10 +23,10 @@
 
 import javax.annotation.Generated;
 
-@Generated(value = "MapLayerGenerator", date = "2018-02-07T03:32:47Z")
+@Generated(value = "MapLayerGenerator", date = "2018-02-07T06:40:07Z")
 public enum MapLayer {
 
-
+    
     CANADA_LOW("canadaLow", MapLayerClientBundle.INSTANCE.canadaLowJs().getText()),
 
     FRANCE_LOW("franceLow", MapLayerClientBundle.INSTANCE.franceLowJs().getText()),

src/main/java/gwt/material/design/amcharts/client/ui/maps/resources/MapLayerClientBundle.java

@@ -25,37 +25,37 @@
 
 import javax.annotation.Generated;
 
-@Generated(value = "MapLayerClientBundleGenerator", date = "2018-02-07T03:32:47Z")
+@Generated(value = "MapLayerClientBundleGenerator", date = "2018-02-07T06:40:07Z")
 public interface MapLayerClientBundle extends ClientBundle {
 
     MapLayerClientBundle INSTANCE = GWT.create(MapLayerClientBundle.class);
 
 
-    @Source("maps/js/canadaLow.js")
+    @Source("layers/canadaLow.js") 
     TextResource canadaLowJs();
 
 
-    @Source("maps/js/franceLow.js")
+    @Source("layers/franceLow.js") 
     TextResource franceLowJs();
 
 
-    @Source("maps/js/philippinesLow.js")
+    @Source("layers/philippinesLow.js") 
     TextResource philippinesLowJs();
 
 
-    @Source("maps/js/usa2Low.js")
+    @Source("layers/usa2Low.js") 
     TextResource usa2LowJs();
 
 
-    @Source("maps/js/usaLow.js")
+    @Source("layers/usaLow.js") 
     TextResource usaLowJs();
 
 
-    @Source("maps/js/usaTerritoriesLow.js")
+    @Source("layers/usaTerritoriesLow.js") 
     TextResource usaTerritoriesLowJs();
 
 
-    @Source("maps/js/worldLow.js")
+    @Source("layers/worldLow.js") 
     TextResource worldLowJs();
 
 

src/main/java/gwt/material/design/amcharts/client/ui/stock/js/StockPanel.java

@@ -29,6 +29,7 @@
 
 import java.util.Date;
 
+// TODO Clean this up
 /**
  * AreasSettings is a class which defines the default settings for all MapArea objects.
  *
@@ -41,16 +42,22 @@ public class StockPanel {
 
     @JsProperty
     public double percentHeight;
+
     @JsProperty
     private boolean allowTurningOff;
+
     @JsProperty
     private boolean drawingIconsEnabled;
+
     @JsProperty
     private AmValueAxis drawOnAxis;
+
     @JsProperty
     private boolean eraseAll;
+
     @JsProperty
     private int iconSize;
+
     @JsProperty
     private Date recalculateFromDate;
 

src/main/java/gwt/material/design/amcharts/gen/MapLayerGenerator.java

@@ -105,7 +105,7 @@ protected static void generateMapClientBundle() throws IOException {
 
                 String fileName = listOfFiles[i].getName();
 
-                builder.append("\n    ").append("@Source(\"maps/js/" + fileName + "\") " +
+                builder.append("\n    ").append("@Source(\"layers/" + fileName + "\") " +
                         "\n    TextResource " + fileName.replace(".js", "Js") + "();\n\n");
             }
         }

src/main/java/gwt/material/design/amcharts/gen/TemplateClientBundle.txt

@@ -0,0 +1,14 @@
+package gwt.material.design.amcharts.client.ui.maps.resources;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.TextResource;
+import javax.annotation.Generated;
+
+@Generated(value = "MapLayerClientBundleGenerator", date = "${generationDate}")
+public interface MapLayerClientBundle extends ClientBundle {
+
+    MapLayerClientBundle INSTANCE = GWT.create(MapLayerClientBundle.class);
+
+    ${mapLayers}
+}

src/main/java/gwt/material/design/amcharts/gen/TemplateMapLayer.txt

@@ -0,0 +1,26 @@
+package gwt.material.design.amcharts.client.ui.maps.base.constants;
+
+import gwt.material.design.amcharts.client.ui.maps.resources.MapLayerClientBundle;
+import javax.annotation.Generated;
+
+@Generated(value = "MapLayerGenerator", date = "${generationDate}")
+public enum  MapLayer {
+
+    ${mapLayers}
+
+    String name;
+    String jsResource;
+
+    MapLayer(String name, String jsResource) {
+        this.name = name;
+        this.jsResource = jsResource;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getJsResource() {
+        return jsResource;
+    }
+}

src/main/resources/gwt/material/design/amcharts/GwtMaterialAmChartBasic.gwt.xml renamed to src/main/resources/gwt/material/design/amcharts/GwtMaterialAmCharts.gwt.xml

@@ -22,7 +22,8 @@
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
         "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
 <module rename-to='GwtMaterialAmChart'>
-    <inherits name="gwt.material.design.amcharts.GwtMaterialAmChartBase"/>
+    <inherits name="gwt.material.design.amcharts.GwtMaterialAmChartsBase"/>
+    <inherits name="com.google.gwt.dom.DOM"/>
 
     <!-- Specify the app entry point class -->
     <entry-point class='gwt.material.design.amcharts.client.ui.GwtMaterialAmChart'/>

src/main/resources/gwt/material/design/amcharts/GwtMaterialAmChartBase.gwt.xml renamed to src/main/resources/gwt/material/design/amcharts/GwtMaterialAmChartsBase.gwt.xml

@@ -22,7 +22,7 @@
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
         "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
 <module rename-to='GwtMaterialAmChart'>
-    <inherits name="gwt.material.design.amcharts.GwtMaterialAmChartBase"/>
+    <inherits name="gwt.material.design.amcharts.GwtMaterialAmChartsBase"/>
 
     <!-- Specify the app entry point class -->
     <entry-point class='gwt.material.design.amcharts.client.ui.GwtMaterialAmChart'/>

src/main/resources/gwt/material/design/amcharts/GwtMaterialAmChart.gwt.xml renamed to src/main/resources/gwt/material/design/amcharts/GwtMaterialAmChartsBasic.gwt.xml

@@ -26,7 +26,7 @@
         <when-type-is class="gwt.material.design.addins.client.StartupState"/>
     </replace-with>
 
-    <inherits name="gwt.material.design.amcharts.GwtMaterialAmChartBase"/>
+    <inherits name="gwt.material.design.amcharts.GwtMaterialAmChartsBase"/>
 
     <!-- Specify the app entry point class -->
     <entry-point class='gwt.material.design.amcharts.client.ui.GwtMaterialAmChart'/>