Merge pull request #440 from GwtMaterialDesign/release_1.6.1

Emergency patch for the MaterialListValueBox.

Author: kevzlou7979

README.md

@@ -16,12 +16,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
 
 
 ## Maven
-### Current Version 1.6.0
+### Current Version 1.6.1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
 </dependency>
 ```
 ### Snapshot Version 2.0-SNAPSHOT

gwt-material/pom.xml

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

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

@@ -0,0 +1,32 @@
+package gwt.material.design.client.base;
+
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2016 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+
+public interface KeyFactory<T, R> {
+
+    /**
+     * Generate a unique key based on an object and given return type.
+     * @param object the object the key is representing.
+     * @return a unique key Object signifying the given object.
+     */
+    R generateKey(T object);
+}

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialListValueBox.java

@@ -49,7 +49,6 @@
 import gwt.material.design.client.base.validator.ValidationChangedEvent.ValidationChangedHandler;
 import gwt.material.design.client.base.validator.Validator;
 import gwt.material.design.client.ui.html.Label;
-import gwt.material.design.client.ui.html.Option;
 
 import java.util.*;
 
@@ -92,6 +91,14 @@ public class MaterialListValueBox<T> extends MaterialWidget implements HasId, Ha
 
     protected final List<T> values = new ArrayList<>();
 
+    // By default the key is generated using toString
+    private KeyFactory<T, String> keyFactory = new KeyFactory<T, String>() {
+        @Override
+        public String generateKey(T object) {
+            return object.toString();
+        }
+    };
+
     private ToggleStyleMixin<ListBox> toggleOldMixin;
     private final ErrorHandlerMixin<T> errorHandlerMixin = new ErrorHandlerMixin<>(this);
     private final BlankValidatorMixin<MaterialListValueBox<T>, T> validatorMixin = new BlankValidatorMixin<>(this,
@@ -234,7 +241,7 @@ public void setAcceptableValues(Collection<T> values) {
         clear();
 
         for(T value : values) {
-            addValue(value);
+            addItem(value);
         }
     }
 
@@ -261,18 +268,6 @@ public void setValue(T value, boolean fireEvents) {
         }
     }
 
-    public Option addValue(T value) {
-        if(!values.contains(value)) {
-            values.add(value);
-            Option opt = new Option(value.toString());
-            add(opt);
-            return opt;
-        } else {
-            GWT.log("Cannot add duplicate value: " + value);
-        }
-        return null;
-    }
-
     public boolean isOld() {
         return toggleOldMixin.isOn();
     }
@@ -301,8 +296,9 @@ public void setOld(boolean old) {
      * @param index
      *            the index at which to insert it
      */
-    public void insertItem(String item, Direction dir, String value, int index) {
-        listBox.insertItem(item, dir, value, index);
+    public void insertItem(String item, Direction dir, T value, int index) {
+        values.add(value);
+        listBox.insertItem(item, dir, keyFactory.generateKey(value), index);
         if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
@@ -351,8 +347,9 @@ public void setTitle(String title) {
      * @param dir
      *            the item's direction
      */
-    public void addItem(String item, Direction dir) {
-        listBox.addItem(item, dir);
+    public void addItem(T item, Direction dir) {
+        values.add(item);
+        listBox.addItem(keyFactory.generateKey(item), dir);
         if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
@@ -369,8 +366,9 @@ public void addItem(String item, Direction dir) {
      * @param item
      *            the text of the item to be added
      */
-    public void addItem(String item) {
-        listBox.addItem(item);
+    public void addItem(T item) {
+        values.add(item);
+        listBox.addItem(keyFactory.generateKey(item));
         if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
@@ -386,8 +384,9 @@ public void addItem(String item) {
      *            the item's value, to be submitted if it is part of a
      *            {@link FormPanel}; cannot be <code>null</code>
      */
-    public void addItem(String item, String value) {
-        listBox.addItem(item, value);
+    public void addItem(T item, String value) {
+        values.add(item);
+        listBox.addItem(keyFactory.generateKey(item), value);
         if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
@@ -406,8 +405,9 @@ public void addItem(String item, String value) {
      *            the item's value, to be submitted if it is part of a
      *            {@link FormPanel}; cannot be <code>null</code>
      */
-    public void addItem(String item, Direction dir, String value) {
-        listBox.addItem(item, dir, value);
+    public void addItem(T item, Direction dir, String value) {
+        values.add(item);
+        listBox.addItem(keyFactory.generateKey(item), dir, value);
         if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
@@ -426,8 +426,9 @@ public void addItem(String item, Direction dir, String value) {
      * @param index
      *            the index at which to insert it
      */
-    public void insertItem(String item, int index) {
-        listBox.insertItem(item, index);
+    public void insertItem(T item, int index) {
+        values.add(item);
+        listBox.insertItem(keyFactory.generateKey(item), index);
         if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
@@ -449,8 +450,9 @@ public void insertItem(String item, int index) {
      * @param index
      *            the index at which to insert it
      */
-    public void insertItem(String item, Direction dir, int index) {
-        listBox.insertItem(item, dir, index);
+    public void insertItem(T item, Direction dir, int index) {
+        values.add(item);
+        listBox.insertItem(keyFactory.generateKey(item), dir, index);
         if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
@@ -473,8 +475,9 @@ public void insertItem(String item, Direction dir, int index) {
      * @param index
      *            the index at which to insert it
      */
-    public void insertItem(String item, String value, int index) {
-        listBox.insertItem(item, value, index);
+    public void insertItem(T item, String value, int index) {
+        values.add(item);
+        listBox.insertItem(keyFactory.generateKey(item), value, index);
         if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
@@ -635,8 +638,8 @@ public int getSelectedIndex() {
      * @throws IndexOutOfBoundsException
      *             if the index is out of range
      */
-    public String getValue(int index) {
-        return listBox.getValue(index);
+    public T getValue(int index) {
+        return values.get(index);
     }
 
     /**
@@ -645,8 +648,12 @@ public String getValue(int index) {
      *
      * @return the value for selected item, or {@code null} if none is selected
      */
-    public String getSelectedValue() {
-        return listBox.getSelectedValue();
+    public T getSelectedValue() {
+        try {
+            return values.get(getSelectedIndex());
+        } catch (IndexOutOfBoundsException ex) {
+            return null;
+        }
     }
 
     /**
@@ -681,6 +688,7 @@ public boolean isItemSelected(int index) {
      *             if the index is out of range
      */
     public void removeItem(int index) {
+        values.remove(index);
         listBox.removeItem(index);
         if (initialized) {
             initializeMaterial(listBox.getElement());
@@ -732,7 +740,7 @@ public void setSelectedValue(String value) {
     public int getIndex(String value) {
         int count = getItemCount();
         for (int i = 0; i < count; i++) {
-            String v = getValue(i);
+            T v = getValue(i);
             if (v.equals(value)) {
                 return i;
             }
@@ -772,7 +780,7 @@ public void removeValue(String value) {
     @Override
     public void setEnabled(boolean enabled) {
         listBox.setEnabled(enabled);
-         if (initialized) {
+        if (initialized) {
             // reinitialize
             initializeMaterial(listBox.getElement());
         }
@@ -859,4 +867,11 @@ public void onBlur(BlurEvent event) {
             }
         }, BlurEvent.getType());
     }
+
+    /**
+     * Use your own key factory for value keys.
+     */
+    public void setKeyFactory(KeyFactory<T, String> keyFactory) {
+        this.keyFactory = keyFactory;
+    }
 }

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
 
     <modules>
         <module>gwt-material</module>
@@ -62,7 +62,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>v1.6.0</tag>
+        <tag>v1.6.1</tag>
     </scm>
 
     <licenses>