Merge pull request #414 from GwtMaterialDesign/release_2.4.0

Release 2.4.0

Author: kevzlou7979

.travis.yml

@@ -8,15 +8,20 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery library before we build the demo
-- 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 before we build the demo
-- 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 ..
+# install the gwt-material-table library before we build the demo
+- git clone -b release_2.4.0 https://github.com/GwtMaterialDesign/gwt-material-table.git
+- cd gwt-material-table
+- mvn install -DskipTests=true -DdryRun=true
+- cd ..
 install: true
 before_script:
  - chmod +x .utility/*

.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 -DskipTests --settings ~/settings.xml
 fi

README.md

@@ -6,21 +6,21 @@
 
 Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gwt-material <br>
 
-## Current Version 2.3.0
+## Current Version 2.4.0-rc1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-rc1</version>
 </dependency>
 ```
 
-## Snapshot Version 2.3.1-SNAPSHOT
+## Snapshot Version 2.4.0-SNAPSHOT
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -112,4 +112,4 @@ We created [Java Docs](http://gwtmaterialdesign.github.io/gwt-material-demo/apid
   - Toggle
 
 ## Follow Us
-<a href="https://plus.google.com/u/0/communities/108005250093449814286"> Google Plus</a>
+<a href="https://plus.google.com/u/0/communities/108005250093449814286"> Google Plus</a> 

pom.xml

@@ -5,25 +5,26 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.3.0</version>
+        <version>2.4.0-rc1</version>
     </parent>
 
     <artifactId>gwt-material-addins</artifactId>
     <packaging>gwt-lib</packaging>
 
     <name>Gwt Material Addins</name>
-    <version>2.3.0</version>
+    <version>2.4.0-rc1</version>
     <description>Extra Components of GWT Material Framework</description>
 
     <properties>
-        <gwt-material.version>2.3.0</gwt-material.version>
+        <gwt-material.version>2.4.0-rc1</gwt-material.version>
+        <maven.failsafe.plugin>2.22.1</maven.failsafe.plugin>
     </properties>
 
     <scm>
         <connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</connection>
         <developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
-        <tag>v2.3.0</tag>
+        <tag>v2.4.0-rc1</tag>
     </scm>
 
     <licenses>
@@ -54,6 +55,13 @@
             <version>${gwt-material.version}</version>
         </dependency>
 
+        <!-- GwtMaterialTable -->
+        <dependency>
+            <groupId>com.github.gwtmaterialdesign</groupId>
+            <artifactId>gwt-material-table</artifactId>
+            <version>${gwt-material.version}</version>
+        </dependency>
+
         <!-- GwtMaterial Test Jar -->
         <dependency>
             <groupId>com.github.gwtmaterialdesign</groupId>
@@ -89,9 +97,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>${htmlunit.version}</version>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -113,22 +126,35 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
                 <configuration>
-                    <additionalClasspathElements>
-                        <additionalClasspathElement>${project.build.sourceDirectory}</additionalClasspathElement>
-                        <additionalClasspathElement>${project.build.testSourceDirectory}</additionalClasspathElement>
-                    </additionalClasspathElements>
-                    <useManifestOnlyJar>false</useManifestOnlyJar>
-                    <forkMode>always</forkMode>
-                    <argLine>-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog</argLine>
+                    <excludes>
+                        <exclude>**/**.java</exclude>
+                    </excludes>
                 </configuration>
                 <executions>
                     <execution>
+                        <phase>test</phase>
                         <goals>
                             <goal>test</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <!--
+				The integration-test phase runs after regular test phase (but before verify/install).
+				We use this to our advantage to peak at the compiled output from the GWTTestSuite
+				 -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven.failsafe.plugin}</version>
+                <configuration>
+                    <includes>
+                        <include>**/*.class</include>
+                    </includes>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>net.ltgt.gwt.maven</groupId>
                 <artifactId>gwt-maven-plugin</artifactId>
@@ -152,14 +178,39 @@
                     <skipModule>true</skipModule>
                     <classpathScope>compile+runtime</classpathScope>
                     <failOnError>true</failOnError>
-                    <skipModule>true</skipModule>
                 </configuration>
                 <executions>
                     <execution>
+                        <id>compile</id>
                         <goals>
                             <goal>compile</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>default-test</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <!--
+							Because we expressly disable asserts in tests to avoid a compiler bug, we also must run surefire manually
+							on the JRE tests
+							 -->
+                            <excludes>
+                                <exclude>**/ui/**.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/AddinsTestSuite.java</include>
+                                <include>**/IncubatorTestSuite.java</include>
+                            </includes>
+
+                            <!-- disable JVM asserts, but enable JS asserts for tests -->
+                            <enableAssertions>false</enableAssertions>
+                            <testArgs>
+                                <testArg>-checkAssertions</testArg>
+                            </testArgs>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

src/main/java/gwt/material/design/addins/client/autocomplete/MaterialAutoComplete.java

@@ -161,7 +161,7 @@
  */
 // @formatter:on
 public class MaterialAutoComplete extends AbstractValueWidget<List<? extends Suggestion>> implements HasPlaceholder,
-        HasProgress, HasType<AutocompleteType>, HasSelectionHandlers<Suggestion>, HasReadOnly, HasFieldTypes {
+    HasProgress, HasType<AutocompleteType>, HasSelectionHandlers<Suggestion>, HasReadOnly, HasFieldTypes, HasLabel {
 
     static {
         if (MaterialAddins.isDebug()) {
@@ -349,7 +349,7 @@ protected void setup(SuggestOracle suggestions) {
 
         panel.add(list);
         panel.getElement().setAttribute("onclick",
-                "document.getElementById('" + autocompleteId + "').focus()");
+            "document.getElementById('" + autocompleteId + "').focus()");
         panel.add(errorLabel);
         suggestBox.setFocus(true);
     }
@@ -487,7 +487,7 @@ public List<String> getItemValues() {
 
     /**
      * @param itemValues the itemsSelected to set
-     * @see #setValue(Object)
+     * @see #setValue(List, boolean)
      */
     public void setItemValues(List<String> itemValues) {
         setItemValues(itemValues, false);
@@ -496,7 +496,7 @@ public void setItemValues(List<String> itemValues) {
     /**
      * @param itemValues the itemsSelected to set
      * @param fireEvents will fire value change event if true
-     * @see #setValue(Object)
+     * @see #setValue(List, boolean)
      */
     public void setItemValues(List<String> itemValues, boolean fireEvents) {
         if (itemValues == null) {
@@ -585,17 +585,19 @@ public void setPlaceholder(String placeholder) {
         itemBox.getElement().setAttribute("placeholder", placeholder);
     }
 
-    /**
-     * @param label
-     * @see gwt.material.design.client.ui.MaterialValueBox#setLabel(String)
-     */
+    @Override
     public void setLabel(String label) {
         this.label.setText(label);
         if (!getPlaceholder().isEmpty()) {
             this.label.setStyleName(CssName.ACTIVE);
         }
     }
 
+    @Override
+    public String getLabel() {
+        return label.getText();
+    }
+
     /**
      * Gets the current {@link MaterialChipProvider}. By default, the class uses
      * an instance of {@link DefaultMaterialChipProvider}.
@@ -820,7 +822,7 @@ public void setEnabled(boolean enabled) {
         itemBox.setEnabled(enabled);
     }
 
-    public Label getLabel() {
+    public Label getLabelWidget() {
         return label;
     }
 
@@ -930,4 +932,4 @@ protected FieldTypeMixin<MaterialAutoComplete> getFieldTypeMixin() {
         }
         return fieldTypeMixin;
     }
-}
+}

src/main/java/gwt/material/design/addins/client/avatar/MaterialAvatar.java

@@ -88,16 +88,11 @@ protected void onLoad() {
     @Override
     public void load() {
         if (options != null) {
-            loadOption(options);
+            JsAvatar.config = options;
         }
-
         JsAvatar.jdenticon();
     }
 
-    protected static native void loadOption(AvatarOptions options) /*-{
-        $wnd.jdenticon_config = options;
-    }-*/;
-
     @Override
     public void unload() {
     }
@@ -124,9 +119,7 @@ public String getName() {
     }
 
     /**
-     * Replaced by {@link MaterialAvatar#setValue(Object)}
-     *
-     * @param name
+     * Replaced by {@link MaterialAvatar#setValue(String, boolean)} )}
      */
     @Deprecated
     public void setName(String name) {

src/main/java/gwt/material/design/addins/client/avatar/js/AvatarOptions.java

@@ -126,21 +126,21 @@ public final String getReplaceMode() {
      * Specifies when icons will be rendered. This option has no effect on Node.js.
      * <ul>
      *     <li>
-     *         "never" – icons are never rendered automatically. You need to call jdenticon.update() manually to render
+     *         {@link ReplaceMode#NEVER} – icons are never rendered automatically. You need to call jdenticon.update() manually to render
      *     identicons.
      *     </li>
      *     <li>
-     *         "once" – icons are rendered once the page has loaded. Any dynamically inserted or modified icons will
+     *         {@link ReplaceMode#ONCE} – icons are rendered once the page has loaded. Any dynamically inserted or modified icons will
      *         not be rendered unless jdenticon.update() is manually called.
      *     </li>
      *     <li>
-     *         "observe" – icons are rendered upon page load, and the DOM is monitored for new icons using a MutationObserver.
+     *         {@link ReplaceMode#OBSERVE} – icons are rendered upon page load, and the DOM is monitored for new icons using a MutationObserver.
      *         Use this if icons are inserted dynamically, e.g. by using Angular, React or VanillaJS. This option behaves as "once" in IE<11.
      *     </li>
      * </ul>
      */
     @JsOverlay
-    public final void setReplaceMode(String replaceMode) {
-        this.replaceMode = replaceMode;
+    public final void setReplaceMode(ReplaceMode replaceMode) {
+        this.replaceMode = replaceMode.getName();
     }
 }

src/main/java/gwt/material/design/addins/client/avatar/js/JsAvatar.java

@@ -22,16 +22,20 @@
 import gwt.material.design.jquery.client.api.JQueryElement;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
 
 /**
  * JSInterop utils for Avatar component
  *
  * @author kevzlou7979
  */
-@JsType(isNative = true)
+@JsType(isNative = true, name = "jdenticon", namespace = JsPackage.GLOBAL)
 public class JsAvatar extends JQueryElement {
 
+    @JsProperty
+    public static AvatarOptions config;
+
     @JsMethod(namespace = JsPackage.GLOBAL)
     public static native void jdenticon();