Merge pull request #422 from GwtMaterialDesign/release_1.6.0

Release 1.6.0

Author: kevzlou7979

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.2" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.6.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

@@ -7,37 +7,37 @@
 
 
 ## Demo
-* [1.5.3 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
-* [1.6.0 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
+* [1.5.1 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
+* [1.5.2 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
 
 ## Documentation
 Support documentation can be found [here](https://github.com/GwtMaterialDesign/gwt-material/wiki) <br/>
 We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs" > Java Docs </a> for developers 
 
 
 ## Maven
-### Current Version 1.5.3
+### Current Version 1.5.1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.1</version>
 </dependency>
 ```
-### Snapshot Version 1.6.0-SNAPSHOT
+### Snapshot Version 1.5.2-SNAPSHOT
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.2-SNAPSHOT</version>
 </dependency>
 ```
 
 ## Changelog
 You can find lists of features by version <a href="https://github.com/GwtMaterialDesign/gwt-material/wiki/Changelog">here</a>.
 
 ## Current Snapshot
-1.6.0-SNAPSHOT
+1.5.2-SNAPSHOT
 
 ### Migration
 [Migrating from 1.3 to 1.4](https://github.com/GwtMaterialDesign/gwt-material/wiki/Migrating-from-1.3-to-1.4)

gwt-material/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gwt-material-parent</artifactId>
     <groupId>com.github.gwtmaterialdesign</groupId>
-    <version>1.5.3</version>
+    <version>1.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

gwt-material/src/main/java/gwt/material/design/client/base/AbstractButton.java

@@ -43,6 +43,7 @@
 import com.google.gwt.event.dom.client.MouseWheelHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.ui.HasText;
 import gwt.material.design.client.base.mixin.ActivatesMixin;
 import gwt.material.design.client.base.mixin.CssTypeMixin;
 import gwt.material.design.client.constants.ButtonSize;

gwt-material/src/main/java/gwt/material/design/client/base/HasError.java

@@ -31,6 +31,8 @@ public interface HasError {
     void setError(String error);
 
     void setSuccess(String success);
+    
+    void setHelperText(String helperText);
 
     void clearErrorOrSuccess();
 }

gwt-material/src/main/java/gwt/material/design/client/base/MaterialButtonCell.java

@@ -55,6 +55,7 @@ public void onBrowserEvent(Context context, Element parent, MaterialButton value
     @SuppressWarnings("deprecation")
     @Override
     public void render(Context context, MaterialButton value, SafeHtmlBuilder sb) {
+        value.getIcon().addStyleName("material-icons");
         sb.appendHtmlConstant(DOM.toString(value.getElement()));
     }
 

gwt-material/src/main/java/gwt/material/design/client/base/MaterialCheckBoxCell.java

@@ -76,7 +76,7 @@ public void onBrowserEvent(Context context, Element parent, Boolean value, Nativ
             || event.getType().equals(BrowserEvents.CLICK);
 
         if (BrowserEvents.CHANGE.equals(type) || enterPressed) {
-            InputElement input = parent.getFirstChild().cast();
+            InputElement input = parent.getFirstChild().getFirstChild().cast();
             Boolean isChecked = input.isChecked();
 
             /*

gwt-material/src/main/java/gwt/material/design/client/base/MaterialWidget.java

@@ -24,11 +24,7 @@
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Float;
 import com.google.gwt.dom.client.Style.FontWeight;
-import com.google.gwt.user.client.ui.ComplexPanel;
-import com.google.gwt.user.client.ui.Focusable;
-import com.google.gwt.user.client.ui.HasEnabled;
-import com.google.gwt.user.client.ui.HasWidgets;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.*;
 import gwt.material.design.client.base.helper.StyleHelper;
 import gwt.material.design.client.base.mixin.ColorsMixin;
 import gwt.material.design.client.base.mixin.CssNameMixin;
@@ -193,102 +189,102 @@ public void insert(final Widget child, final int beforeIndex) {
         insert(child, (Element) getElement(), beforeIndex, true);
     }
 
-    private IdMixin<MaterialWidget> getIdMixin() {
+    protected IdMixin<MaterialWidget> getIdMixin() {
         if(idMixin == null) { idMixin = new IdMixin<>(this); }
         return idMixin;
     }
 
-    private EnabledMixin<MaterialWidget> getEnabledMixin() {
+    protected EnabledMixin<MaterialWidget> getEnabledMixin() {
         if(enabledMixin == null) { enabledMixin = new EnabledMixin<>(this); }
         return enabledMixin;
     }
 
-    private CssNameMixin<MaterialWidget, TextAlign> getTextAlignMixin() {
+    protected CssNameMixin<MaterialWidget, TextAlign> getTextAlignMixin() {
         if(textAlignMixin == null) { textAlignMixin = new CssNameMixin<>(this); }
         return textAlignMixin;
     }
 
-    private ColorsMixin<MaterialWidget> getColorsMixin() {
+    protected ColorsMixin<MaterialWidget> getColorsMixin() {
         if(colorsMixin == null) { colorsMixin = new ColorsMixin<>(this); }
         return colorsMixin;
     }
 
-    private FocusableMixin<MaterialWidget> getFocusableMixin() {
+    protected FocusableMixin<MaterialWidget> getFocusableMixin() {
         if(focusableMixin == null) { focusableMixin = new FocusableMixin<>(this); }
         return focusableMixin;
     }
 
-    private GridMixin<MaterialWidget> getGridMixin() {
+    protected GridMixin<MaterialWidget> getGridMixin() {
         if(gridMixin == null) { gridMixin = new GridMixin<>(this); }
         return gridMixin;
     }
 
-    private ShadowMixin<MaterialWidget> getShadowMixin() {
+    protected ShadowMixin<MaterialWidget> getShadowMixin() {
         if(shadowMixin == null) { shadowMixin = new ShadowMixin<>(this); }
         return shadowMixin;
     }
 
-    private SeparatorMixin<MaterialWidget> getSeparatorMixin() {
+    protected SeparatorMixin<MaterialWidget> getSeparatorMixin() {
         if(separatorMixin == null) { separatorMixin = new SeparatorMixin<>(this); }
         return separatorMixin;
     }
 
-    private ScrollspyMixin<MaterialWidget> getScrollspyMixin() {
+    protected ScrollspyMixin<MaterialWidget> getScrollspyMixin() {
         if(scrollspyMixin == null) { scrollspyMixin = new ScrollspyMixin<>(this); }
         return scrollspyMixin;
     }
 
-    private CssNameMixin<MaterialWidget, HideOn> getHideOnMixin() {
+    protected CssNameMixin<MaterialWidget, HideOn> getHideOnMixin() {
         if(hideOnMixin == null) { hideOnMixin = new CssNameMixin<>(this); }
         return hideOnMixin;
     }
 
-    private CssNameMixin<MaterialWidget, ShowOn> getShowOnMixin() {
+    protected CssNameMixin<MaterialWidget, ShowOn> getShowOnMixin() {
         if(showOnMixin == null) { showOnMixin = new CssNameMixin<>(this); }
         return showOnMixin;
     }
 
-    private CssNameMixin<MaterialWidget, CenterOn> getCenterOnMixin() {
+    protected CssNameMixin<MaterialWidget, CenterOn> getCenterOnMixin() {
         if(centerOnMixin == null) { centerOnMixin = new CssNameMixin<>(this); }
         return centerOnMixin;
     }
 
-    private FontSizeMixin<MaterialWidget> getFontSizeMixin() {
+    protected FontSizeMixin<MaterialWidget> getFontSizeMixin() {
         if(fontSizeMixin == null) { fontSizeMixin = new FontSizeMixin<>(this); }
         return fontSizeMixin;
     }
 
-    private ToggleStyleMixin<MaterialWidget> getCircleMixin() {
+    protected ToggleStyleMixin<MaterialWidget> getCircleMixin() {
         if(circleMixin == null) { circleMixin = new ToggleStyleMixin<>(this, "circle"); }
         return circleMixin;
     }
 
-    private ToggleStyleMixin<MaterialWidget> getHoverableMixin() {
+    protected ToggleStyleMixin<MaterialWidget> getHoverableMixin() {
         if(hoverableMixin == null) { hoverableMixin = new ToggleStyleMixin<>(this, "hoverable"); }
         return hoverableMixin;
     }
 
-    private WavesMixin<MaterialWidget> getWavesMixin() {
+    protected WavesMixin<MaterialWidget> getWavesMixin() {
         if(wavesMixin == null) { wavesMixin = new WavesMixin<>(this); }
         return wavesMixin;
     }
 
-    private CssNameMixin<MaterialWidget, Float> getFloatMixin() {
+    protected CssNameMixin<MaterialWidget, Float> getFloatMixin() {
         if(floatMixin == null) { floatMixin = new CssNameMixin<>(this); }
         return floatMixin;
     }
 
-    private TooltipMixin<MaterialWidget> getTooltipMixin() {
+    protected TooltipMixin<MaterialWidget> getTooltipMixin() {
         if(tooltipMixin == null) { tooltipMixin = new TooltipMixin<>(this); }
         return tooltipMixin;
     }
 
-    private FlexboxMixin<MaterialWidget> getFlexboxMixin() {
+    protected FlexboxMixin<MaterialWidget> getFlexboxMixin() {
         if(flexboxMixin == null) { flexboxMixin = new FlexboxMixin<>(this); }
         return flexboxMixin;
     }
 
-    private CssNameMixin<MaterialWidget, FontWeight> getFontWeightMixin() {
+    protected CssNameMixin<MaterialWidget, FontWeight> getFontWeightMixin() {
         if(fontWeightMixin == null) { fontWeightMixin = new CssNameMixin<>(this); }
         return fontWeightMixin;
     }
@@ -713,17 +709,17 @@ public int getDepth() {
     }
 
     /** If true the label inside this component will be truncated by ellipsis **/
-    public void setTruncate(boolean truncate){
+    public void setTruncate(boolean truncate) {
         getTruncateMixin().setOn(truncate);
     }
 
-    public void stopTouchStartEvent(){
+    public void stopTouchStartEvent() {
         stopTouchStartEvent(getElement());
     }
 
     // Avoid touch events on mobile devices
-    private native void stopTouchStartEvent(Element e) /*-{
-        $wnd.jQuery(e).bind('touchstart', function(event){
+    protected native void stopTouchStartEvent(Element e) /*-{
+        $wnd.jQuery(e).bind('touchstart', function(event) {
             event.stopPropagation();
         });
     }-*/;
@@ -732,7 +728,7 @@ public int getWidth() {
         return getWidth(getElement());
     }
 
-    private native int getWidth(Element element) /*-{
+    protected native int getWidth(Element element) /*-{
         return $wnd.jQuery(element).outerWidth();
     }-*/;
 

gwt-material/src/main/java/gwt/material/design/client/base/ValueBoxBase.java

@@ -21,21 +21,33 @@
  */
 
 import com.google.gwt.dom.client.Element;
+import com.google.gwt.editor.client.EditorError;
+import com.google.gwt.editor.client.HasEditorErrors;
 import com.google.gwt.text.shared.Parser;
 import com.google.gwt.text.shared.Renderer;
 import com.google.gwt.user.client.ui.HasEnabled;
-import gwt.material.design.client.base.mixin.ColorsMixin;
-import gwt.material.design.client.base.mixin.EnabledMixin;
-import gwt.material.design.client.base.mixin.GridMixin;
-import gwt.material.design.client.base.mixin.IdMixin;
+import com.google.web.bindery.event.shared.HandlerRegistration;
+import gwt.material.design.client.base.error.ErrorHandler;
+import gwt.material.design.client.base.error.ErrorHandlerType;
+import gwt.material.design.client.base.error.HasErrorHandler;
+import gwt.material.design.client.base.mixin.*;
+import gwt.material.design.client.base.validator.HasBlankValidator;
+import gwt.material.design.client.base.validator.HasValidators;
+import gwt.material.design.client.base.validator.ValidationChangedEvent.ValidationChangedHandler;
+import gwt.material.design.client.base.validator.Validator;
+
+import java.util.List;
 
 public class ValueBoxBase<T> extends com.google.gwt.user.client.ui.ValueBoxBase<T> implements HasId, HasColors,
-        HasGrid, HasPlaceholder, HasEnabled {
+        HasGrid, HasPlaceholder, HasEnabled, HasEditorErrors<T>, HasErrorHandler, HasValidators<T>, HasBlankValidator {
 
     private final IdMixin<ValueBoxBase<T>> idMixin = new IdMixin<>(this);
     private final ColorsMixin<ValueBoxBase<T>> colorsMixin = new ColorsMixin<>(this);
     private final GridMixin<ValueBoxBase<T>> gridMixin = new GridMixin<>(this);
     private final EnabledMixin<ValueBoxBase<T>> enabledMixin = new EnabledMixin<>(this);
+    private final ErrorHandlerMixin<T> errorHandlerMixin = new ErrorHandlerMixin<>(this);
+    private final BlankValidatorMixin<ValueBoxBase<T>, T> validatorMixin = new BlankValidatorMixin<>(this,
+        errorHandlerMixin.getErrorHandler());
 
     public ValueBoxBase(Element elem, Renderer<T> renderer, Parser<T> parser) {
         super(elem, renderer, parser);
@@ -95,4 +107,84 @@ public String getPlaceholder() {
     public void setEnabled(boolean enabled) {
         enabledMixin.setEnabled(enabled);
     }
+
+    @Override
+    public boolean isAllowBlank() {
+        return validatorMixin.isAllowBlank();
+    }
+
+    @Override
+    public void setAllowBlank(boolean allowBlank) {
+        validatorMixin.setAllowBlank(allowBlank);
+    }
+
+    @Override
+    public void showErrors(List<EditorError> errors) {
+        errorHandlerMixin.showErrors(errors);
+    }
+
+    @Override
+    public ErrorHandler getErrorHandler() {
+        return errorHandlerMixin.getErrorHandler();
+    }
+
+    @Override
+    public void setErrorHandler(ErrorHandler errorHandler) {
+        errorHandlerMixin.setErrorHandler(errorHandler);
+    }
+
+    @Override
+    public ErrorHandlerType getErrorHandlerType() {
+        return errorHandlerMixin.getErrorHandlerType();
+    }
+
+    @Override
+    public void setErrorHandlerType(ErrorHandlerType errorHandlerType) {
+        errorHandlerMixin.setErrorHandlerType(errorHandlerType);
+    }
+
+    @Override
+    public void addValidator(Validator<T> validator) {
+        validatorMixin.addValidator(validator);
+    }
+
+    @Override
+    public boolean isValidateOnBlur() {
+        return validatorMixin.isValidateOnBlur();
+    }
+
+    @Override
+    public boolean removeValidator(Validator<T> validator) {
+        return validatorMixin.removeValidator(validator);
+    }
+
+    @Override
+    public void reset() {
+        validatorMixin.reset();
+    }
+
+    @Override
+    public void setValidateOnBlur(boolean validateOnBlur) {
+        validatorMixin.setValidateOnBlur(validateOnBlur);
+    }
+
+    @Override
+    public void setValidators(@SuppressWarnings("unchecked") Validator<T>... validators) {
+        validatorMixin.setValidators(validators);
+    }
+
+    @Override
+    public boolean validate() {
+        return validatorMixin.validate();
+    }
+
+    @Override
+    public boolean validate(boolean show) {
+        return validatorMixin.validate(show);
+    }
+
+    @Override
+    public HandlerRegistration addValidationChangedHandler(ValidationChangedHandler handler) {
+        return validatorMixin.addValidationChangedHandler(handler);
+    }
 }