ISelect -> INativeSelect

svn changeset:2812/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java
index 2a5840b1c9d668ea655a8bf99b70618d6cc5824e..db6cd89e289a87b2c6f5a70a1a12841a4d2e4132 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java
@@ -15,6 +15,7 @@ import com.itmill.toolkit.terminal.gwt.client.ui.IGridLayout;
 import com.itmill.toolkit.terminal.gwt.client.ui.ILabel;
 import com.itmill.toolkit.terminal.gwt.client.ui.ILink;
 import com.itmill.toolkit.terminal.gwt.client.ui.IListSelect;
+import com.itmill.toolkit.terminal.gwt.client.ui.INativeSelect;
 import com.itmill.toolkit.terminal.gwt.client.ui.IOptionGroup;
 import com.itmill.toolkit.terminal.gwt.client.ui.IOrderedLayoutHorizontal;
 import com.itmill.toolkit.terminal.gwt.client.ui.IOrderedLayoutVertical;
@@ -23,7 +24,6 @@ import com.itmill.toolkit.terminal.gwt.client.ui.IPasswordField;
 import com.itmill.toolkit.terminal.gwt.client.ui.IPopupCalendar;
 import com.itmill.toolkit.terminal.gwt.client.ui.IProgressIndicator;
 import com.itmill.toolkit.terminal.gwt.client.ui.IScrollTable;
-import com.itmill.toolkit.terminal.gwt.client.ui.ISelect;
 import com.itmill.toolkit.terminal.gwt.client.ui.ISlider;
 import com.itmill.toolkit.terminal.gwt.client.ui.ISplitPanelHorizontal;
 import com.itmill.toolkit.terminal.gwt.client.ui.ISplitPanelVertical;
@@ -86,9 +86,9 @@ public class DefaultWidgetSet implements WidgetSet {
         } else if ("com.itmill.toolkit.terminal.gwt.client.ui.ITwinColSelect"
                 .equals(className)) {
             return new ITwinColSelect();
-        } else if ("com.itmill.toolkit.terminal.gwt.client.ui.ISelect"
+        } else if ("com.itmill.toolkit.terminal.gwt.client.ui.INativeSelect"
                 .equals(className)) {
-            return new ISelect();
+            return new INativeSelect();
         } else if ("com.itmill.toolkit.terminal.gwt.client.ui.IListSelect"
                 .equals(className)) {
             return new IListSelect();
@@ -203,7 +203,7 @@ public class DefaultWidgetSet implements WidgetSet {
                     return "com.itmill.toolkit.terminal.gwt.client.ui.IOptionGroup";
                 }
                 if (type.equals("native")) {
-                    return "com.itmill.toolkit.terminal.gwt.client.ui.ISelect";
+                    return "com.itmill.toolkit.terminal.gwt.client.ui.INativeSelect";
                 }
                 if (type.equals("list")) {
                     return "com.itmill.toolkit.terminal.gwt.client.ui.IListSelect";

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java
new file mode 100644 (file)
index 0000000..efd18d1
--- /dev/null
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java
@@ -0,0 +1,61 @@
+package com.itmill.toolkit.terminal.gwt.client.ui;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.Widget;
+import com.itmill.toolkit.terminal.gwt.client.UIDL;
+
+public class INativeSelect extends IOptionGroupBase {
+
+    public static final String CLASSNAME = "i-select";
+
+    protected ListBox select;
+
+    public INativeSelect() {
+        super(new ListBox(false), CLASSNAME);
+        select = (ListBox) optionsContainer;
+        select.setVisibleItemCount(1);
+        select.addChangeListener(this);
+        select.setStyleName(CLASSNAME + "-select");
+
+    }
+
+    protected void buildOptions(UIDL uidl) {
+        select.setEnabled(!isDisabled() && !isReadonly());
+        select.clear();
+        if (isNullSelectionAllowed() && !isNullSelectionItemAvailable()) {
+            // can't unselect last item in singleselect mode
+            select.addItem("", null);
+        }
+        for (Iterator i = uidl.getChildIterator(); i.hasNext();) {
+            UIDL optionUidl = (UIDL) i.next();
+            select.addItem(optionUidl.getStringAttribute("caption"), optionUidl
+                    .getStringAttribute("key"));
+            if (optionUidl.hasAttribute("selected")) {
+                select.setItemSelected(select.getItemCount() - 1, true);
+            }
+        }
+    }
+
+    protected Object[] getSelectedItems() {
+        Vector selectedItemKeys = new Vector();
+        for (int i = 0; i < select.getItemCount(); i++) {
+            if (select.isItemSelected(i)) {
+                selectedItemKeys.add(select.getValue(i));
+            }
+        }
+        return selectedItemKeys.toArray();
+    }
+
+    public void onChange(Widget sender) {
+        if (select.isMultipleSelect()) {
+            client.updateVariable(id, "selected", getSelectedItems(),
+                    isImmediate());
+        } else {
+            client.updateVariable(id, "selected", new String[] { ""
+                    + getSelectedItem() }, isImmediate());
+        }
+    }
+}

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISelect.java
deleted file mode 100644 (file)
index 6c86316..0000000
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISelect.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-
-public class ISelect extends IOptionGroupBase {
-
-    public static final String CLASSNAME = "i-select";
-
-    protected ListBox select;
-
-    public ISelect() {
-        super(new ListBox(false), CLASSNAME);
-        select = (ListBox) optionsContainer;
-        select.setVisibleItemCount(1);
-        select.addChangeListener(this);
-        select.setStyleName(CLASSNAME + "-select");
-
-    }
-
-    protected void buildOptions(UIDL uidl) {
-        select.setEnabled(!isDisabled() && !isReadonly());
-        select.clear();
-        if (isNullSelectionAllowed() && !isNullSelectionItemAvailable()) {
-            // can't unselect last item in singleselect mode
-            select.addItem("", null);
-        }
-        for (Iterator i = uidl.getChildIterator(); i.hasNext();) {
-            UIDL optionUidl = (UIDL) i.next();
-            select.addItem(optionUidl.getStringAttribute("caption"), optionUidl
-                    .getStringAttribute("key"));
-            if (optionUidl.hasAttribute("selected")) {
-                select.setItemSelected(select.getItemCount() - 1, true);
-            }
-        }
-    }
-
-    protected Object[] getSelectedItems() {
-        Vector selectedItemKeys = new Vector();
-        for (int i = 0; i < select.getItemCount(); i++) {
-            if (select.isItemSelected(i)) {
-                selectedItemKeys.add(select.getValue(i));
-            }
-        }
-        return selectedItemKeys.toArray();
-    }
-
-    public void onChange(Widget sender) {
-        if (select.isMultipleSelect()) {
-            client.updateVariable(id, "selected", getSelectedItems(),
-                    isImmediate());
-        } else {
-            client.updateVariable(id, "selected", new String[] { ""
-                    + getSelectedItem() }, isImmediate());
-        }
-    }
-}