Merge pull request #217 from GwtMaterialDesign/release_2.7.1

Release 2.7.1

Author: kevzlou7979

.travis.yml

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

@@ -11,20 +11,20 @@ A complex table component designed for the material design specifications!
 Support documentation can be found [here](https://github.com/GwtMaterialDesign/gwt-material-table/wiki)
 
 ## Maven
-Current Version 2.7.0
+Current Version 2.7.1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-table</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
 </dependency>
 ```
 
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-table</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>gwt-material-parent</artifactId>
     <groupId>com.github.gwtmaterialdesign</groupId>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
   </parent>
 
   <artifactId>gwt-material-table</artifactId>

src/main/java/gwt/material/design/client/data/component/CategoryComponent.java

@@ -19,12 +19,9 @@
  */
 package gwt.material.design.client.data.component;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
-import gwt.material.design.client.constants.Display;
 import gwt.material.design.client.data.HasCategories;
 import gwt.material.design.client.ui.MaterialLabel;
-import gwt.material.design.client.ui.MaterialToast;
 import gwt.material.design.client.ui.table.TableHeader;
 import gwt.material.design.client.ui.table.TableSubHeader;
 import gwt.material.design.client.ui.table.cell.CategoryColumn;
@@ -61,7 +58,6 @@ protected void render(TableSubHeader subheader, int columnCount) {
     private String height;
     private boolean openByDefault;
     private boolean hideName;
-
     private int currentIndex = -1;
     private int rowCount = 0;
 
@@ -236,6 +232,12 @@ public void buildColumns(List<Column<T, ?>> allColumns) {
                 }
             }
         }
+
+        renderRows(this, getData());
+    }
+
+    protected void renderRows(CategoryComponent<T> tCategoryComponent, List<T> data) {
+
     }
 
     public void recalculateColumns() {
@@ -275,6 +277,15 @@ public void addRow(RowComponent<T> rowComponent) {
         }
     }
 
+    public void reset() {
+        rows.clear();
+        for (Widget widget : getWidget()) {
+            if (widget.getElement().hasClassName("category-parent")) {
+                widget.removeFromParent();
+            }
+        }
+    }
+
     public List<RowComponent<T>> getRows() {
         return rows;
     }
@@ -288,6 +299,10 @@ public boolean equals(Object o) {
         return name.equals(that.name);
     }
 
+    public void setCustomWidget(Widget widget) {
+        getWidget().setWidget(widget);
+    }
+
     @Override
     public int hashCode() {
         return name.hashCode();

src/main/java/gwt/material/design/client/ui/table/TableSubHeader.java

@@ -48,7 +48,7 @@ public class TableSubHeader extends TableRow {
 
     private MaterialIcon icon;
     private Text nameLbl;
-
+    private Widget widget;
     private IconType openIcon = IconType.ADD;
     private IconType closeIcon = IconType.REMOVE;
 
@@ -239,4 +239,13 @@ public void removeFromParent() {
     public String toString() {
         return getElement().toString();
     }
+
+    public void setWidget(Widget widget) {
+        this.widget = widget;
+
+        nameTh.clear();
+        if (widget != null) {
+            nameTh.add(widget);
+        }
+    }
 }