Merge pull request #281 from crevete/master

Added method "getSelectedItem(s)" for standard and multiple select.
gwtbootstrap3 · Feb 21, 2016 · 8bf6b2c · 8bf6b2c
2 parents 7c68fa5 + 1fc23f1
commit 8bf6b2c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/src/main/java/org/gwtbootstrap3/extras/select/client/ui/MultipleSelect.java b/src/main/java/org/gwtbootstrap3/extras/select/client/ui/MultipleSelect.java
@@ -54,7 +54,7 @@ public MultipleSelect() {
     public final boolean isMultiple() {
         return true;
     }
-    
+
     /**
      * When set to <code>true</code>, adds two buttons to the top of
      * the drop-down menu (<b>Select All</b> & <b>Deselect All</b>).<br>
@@ -148,10 +148,10 @@ public List<String> getValue() {
             }
             return result;
         }
-        return getAllSelectedValues();
+        return getSelectedValues();
     }
 
-    private List<String> getAllSelectedValues() {
+    private List<String> getSelectedValues() {
         final List<String> allSelected = new ArrayList<>(0);
         for (Entry<OptionElement, Option> entry : itemMap.entrySet()) {
             Option opt = entry.getValue();
@@ -178,6 +178,22 @@ protected void setSelectedValue(List<String> value) {
         }
     }
 
+    /**
+     * Returns the selected items list. If no item is selected, this method
+     * returns an empty list.
+     *
+     * @return the selected items list
+     */
+    public List<Option> getSelectedItems() {
+        final List<Option> items = new ArrayList<>(0);
+        for (Entry<OptionElement, Option> entry : itemMap.entrySet()) {
+            Option opt = entry.getValue();
+            if (opt.isSelected())
+                items.add(opt);
+        }
+        return items;
+    }
+
     /**
      * Select all items in a multi-select.
      */

diff --git a/src/main/java/org/gwtbootstrap3/extras/select/client/ui/Select.java b/src/main/java/org/gwtbootstrap3/extras/select/client/ui/Select.java
@@ -86,6 +86,20 @@ protected void setSelectedValue(String value) {
         }
     }
 
+    /**
+     * Returns the selected item or <code>null</code> if no item is selected.
+     *
+     * @return the selected items list
+     */
+    public Option getSelectedItem() {
+        for (Entry<OptionElement, Option> entry : itemMap.entrySet()) {
+            Option opt = entry.getValue();
+            if (opt.isSelected())
+                return opt;
+        }
+        return null;
+    }
+
     private native String getValue(Element e) /*-{
         return $wnd.jQuery(e).selectpicker('val');
     }-*/;

diff --git a/src/main/java/org/gwtbootstrap3/extras/select/client/ui/SelectBase.java b/src/main/java/org/gwtbootstrap3/extras/select/client/ui/SelectBase.java
@@ -557,10 +557,6 @@ public void setShowMenuArrow(final boolean showMenuArrow) {
         }
     }
 
-//    public boolean isShowMenuArrow() {
-//        return StyleHelper.containsStyle(getStyleName(), SelectStyles.SHOW_MENU_ARROW);
-//    }
-
     @Override
     public LeafValueEditor<T> asEditor() {
         if (editor == null) {
@@ -655,11 +651,11 @@ public int getItemCount() {
     }
 
     /**
-     * Returns the selected item list.
+     * Returns the item list.
      *
-     * @return the selected item list
+     * @return the item list
      */
-    public List<Option> getSelectedItems() {
+    public List<Option> getItems() {
         List<Option> selectedItems = new ArrayList<>(0);
         NodeList<OptionElement> items = selectElement.getOptions();
         for (int i = 0; i < items.getLength(); i++) {