IOptionGroupBase protected vars -> getter/setter.

svn changeset:2810/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java
index af376824322e4aa678049e058333fd4e63723462..72a0b9608d88b3d1e087d50f725758ee491481e5 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java
@@ -27,10 +27,10 @@ public class IListSelect extends IOptionGroupBase {
     }
 
     protected void buildOptions(UIDL uidl) {
-        select.setMultipleSelect(multiselect);
-        select.setEnabled(!disabled && !readonly);
+        select.setMultipleSelect(isMultiselect());
+        select.setEnabled(!isDisabled() && !isReadonly());
         select.clear();
-        if (!multiselect && isNullSelectionAllowed()) {
+        if (!isMultiselect() && isNullSelectionAllowed()) {
             // can't unselect last item in singleselect mode
             select.addItem("", null);
         }
@@ -60,12 +60,12 @@ public class IListSelect extends IOptionGroupBase {
             select.setSelectedIndex(lastSelectedIndex);
         } else {
             lastSelectedIndex = si;
-            if (select.isMultipleSelect()) {
+            if (isMultiselect()) {
                 client.updateVariable(id, "selected", getSelectedItems(),
-                        immediate);
+                        isImmediate());
             } else {
                 client.updateVariable(id, "selected", new String[] { ""
-                        + getSelectedItem() }, immediate);
+                        + getSelectedItem() }, isImmediate());
             }
         }
     }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java
index e7e8e9289705a267f7f6d83c154f9f3b5830c82c..b10ff673c9c5a3a5afad9833d98278c507a7bd86 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java
@@ -12,62 +12,63 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL;
 \r
 public class IOptionGroup extends IOptionGroupBase {\r
 \r
-       public static final String CLASSNAME = "i-select-optiongroup";\r
+    public static final String CLASSNAME = "i-select-optiongroup";\r
 \r
-       private Panel panel;\r
+    private Panel panel;\r
 \r
-       private Map optionsToKeys;\r
+    private Map optionsToKeys;\r
 \r
-       public IOptionGroup() {\r
-               super(CLASSNAME);\r
-               panel = (Panel) optionsContainer;\r
-               optionsToKeys = new HashMap();\r
-       }\r
+    public IOptionGroup() {\r
+        super(CLASSNAME);\r
+        panel = (Panel) optionsContainer;\r
+        optionsToKeys = new HashMap();\r
+    }\r
 \r
-       /*\r
-        * Return true if no elements were changed, false otherwise.\r
-        */\r
-       protected void buildOptions(UIDL uidl) {\r
-               panel.clear();\r
-               for (Iterator it = uidl.getChildIterator(); it.hasNext();) {\r
-                       UIDL opUidl = (UIDL) it.next();\r
-                       CheckBox op;\r
-                       if (multiselect) {\r
-                               op = new ICheckBox();\r
-                               op.setText(opUidl.getStringAttribute("caption"));\r
-                       } else {\r
-                               op = new RadioButton(id, opUidl.getStringAttribute("caption"));\r
-                               op.setStyleName("i-radiobutton");\r
-                       }\r
-                       op.addStyleName(CLASSNAME_OPTION);\r
-                       op.setChecked(opUidl.getBooleanAttribute("selected"));\r
-                       op.setEnabled(!opUidl.getBooleanAttribute("disabled") && !readonly\r
-                                       && !disabled);\r
-                       op.addClickListener(this);\r
-                       optionsToKeys.put(op, opUidl.getStringAttribute("key"));\r
-                       panel.add(op);\r
-               }\r
-       }\r
+    /*\r
+     * Return true if no elements were changed, false otherwise.\r
+     */\r
+    protected void buildOptions(UIDL uidl) {\r
+        panel.clear();\r
+        for (Iterator it = uidl.getChildIterator(); it.hasNext();) {\r
+            UIDL opUidl = (UIDL) it.next();\r
+            CheckBox op;\r
+            if (isMultiselect()) {\r
+                op = new ICheckBox();\r
+                op.setText(opUidl.getStringAttribute("caption"));\r
+            } else {\r
+                op = new RadioButton(id, opUidl.getStringAttribute("caption"));\r
+                op.setStyleName("i-radiobutton");\r
+            }\r
+            op.addStyleName(CLASSNAME_OPTION);\r
+            op.setChecked(opUidl.getBooleanAttribute("selected"));\r
+            op.setEnabled(!opUidl.getBooleanAttribute("disabled")\r
+                    && !isReadonly() && !isDisabled());\r
+            op.addClickListener(this);\r
+            optionsToKeys.put(op, opUidl.getStringAttribute("key"));\r
+            panel.add(op);\r
+        }\r
+    }\r
 \r
-       protected Object[] getSelectedItems() {\r
-               return selectedKeys.toArray();\r
-       }\r
+    protected Object[] getSelectedItems() {\r
+        return selectedKeys.toArray();\r
+    }\r
 \r
-       public void onClick(Widget sender) {\r
-               super.onClick(sender);\r
-               if (sender instanceof CheckBox) {\r
-                       boolean selected = ((CheckBox) sender).isChecked();\r
-                       String key = (String) optionsToKeys.get(sender);\r
-                       if (!multiselect)\r
-                               selectedKeys.clear();\r
-                       if (selected)\r
-                               selectedKeys.add(key);\r
-                       else\r
-                               selectedKeys.remove(key);\r
-                       client\r
-                                       .updateVariable(id, "selected", getSelectedItems(),\r
-                                                       immediate);\r
-               }\r
-       }\r
+    public void onClick(Widget sender) {\r
+        super.onClick(sender);\r
+        if (sender instanceof CheckBox) {\r
+            boolean selected = ((CheckBox) sender).isChecked();\r
+            String key = (String) optionsToKeys.get(sender);\r
+            if (!isMultiselect()) {\r
+                selectedKeys.clear();\r
+            }\r
+            if (selected) {\r
+                selectedKeys.add(key);\r
+            } else {\r
+                selectedKeys.remove(key);\r
+            }\r
+            client.updateVariable(id, "selected", getSelectedItems(),\r
+                    isImmediate());\r
+        }\r
+    }\r
 \r
 }\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java
index 3306338ae26ad8630b2a761b67bfca934d3616d5..53ad398e98909d1d25f58726b2540972ec8cca54 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java
@@ -22,17 +22,17 @@ abstract class IOptionGroupBase extends Composite implements Paintable,
 \r
     String id;\r
 \r
-    protected boolean immediate;\r
-\r
     protected Set selectedKeys;\r
 \r
-    protected boolean multiselect;\r
+    private boolean immediate;\r
+\r
+    private boolean multiselect;\r
 \r
-    protected boolean disabled;\r
+    private boolean disabled;\r
 \r
-    protected boolean readonly;\r
+    private boolean readonly;\r
 \r
-    protected boolean nullSelectionAllowed = true;\r
+    private boolean nullSelectionAllowed = true;\r
 \r
     /**\r
      * Widget holding the different options (e.g. ListBox or Panel for radio\r
@@ -68,6 +68,38 @@ abstract class IOptionGroupBase extends Composite implements Paintable,
         container.add(optionsContainer);\r
     }\r
 \r
+    protected boolean isImmediate() {\r
+        return immediate;\r
+    }\r
+\r
+    protected void setImmediate(boolean immediate) {\r
+        this.immediate = immediate;\r
+    }\r
+\r
+    protected boolean isMultiselect() {\r
+        return multiselect;\r
+    }\r
+\r
+    protected void setMultiselect(boolean multiselect) {\r
+        this.multiselect = multiselect;\r
+    }\r
+\r
+    protected boolean isDisabled() {\r
+        return disabled;\r
+    }\r
+\r
+    protected void setDisabled(boolean disabled) {\r
+        this.disabled = disabled;\r
+    }\r
+\r
+    protected boolean isReadonly() {\r
+        return readonly;\r
+    }\r
+\r
+    protected void setReadonly(boolean readonly) {\r
+        this.readonly = readonly;\r
+    }\r
+\r
     protected void setNullSelectionAllowed(boolean nullSelectionAllowed) {\r
         this.nullSelectionAllowed = nullSelectionAllowed;\r
     }\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISelect.java
index 9dc218fa4f42c74fb270920fcc04e84240b73881..a062207fc84079c7bdf930fd83a28605e9c50b21 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISelect.java
@@ -23,13 +23,13 @@ public class ISelect extends IOptionGroupBase {
     }
 
     protected void buildOptions(UIDL uidl) {
-        select.setMultipleSelect(multiselect);
-        if (multiselect) {
+        select.setMultipleSelect(isMultiselect());
+        if (isMultiselect()) {
             select.setVisibleItemCount(VISIBLE_COUNT);
         } else {
             select.setVisibleItemCount(1);
         }
-        select.setEnabled(!disabled && !readonly);
+        select.setEnabled(!isDisabled() && !isReadonly());
         select.clear();
         for (Iterator i = uidl.getChildIterator(); i.hasNext();) {
             UIDL optionUidl = (UIDL) i.next();
@@ -53,12 +53,11 @@ public class ISelect extends IOptionGroupBase {
 
     public void onChange(Widget sender) {
         if (select.isMultipleSelect()) {
-            client
-                    .updateVariable(id, "selected", getSelectedItems(),
-                            immediate);
+            client.updateVariable(id, "selected", getSelectedItems(),
+                    isImmediate());
         } else {
             client.updateVariable(id, "selected", new String[] { ""
-                    + getSelectedItem() }, immediate);
+                    + getSelectedItem() }, isImmediate());
         }
     }
 }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
index be8763e2f26c566a5fc9c54ab0f996b707eeabdb..5ed9cea2e927098f2f34ccfcecf2ec44de8f48fb 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
@@ -12,133 +12,136 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL;
 \r
 public class ITwinColSelect extends IOptionGroupBase {\r
 \r
-       private static final String CLASSNAME = "i-select-twincol";\r
-\r
-       private static final int VISIBLE_COUNT = 10;\r
-\r
-       private ListBox options;\r
-\r
-       private ListBox selections;\r
-\r
-       private IButton add;\r
-\r
-       private IButton remove;\r
-\r
-       public ITwinColSelect() {\r
-               super(CLASSNAME);\r
-               options = new ListBox();\r
-               selections = new ListBox();\r
-               options.setVisibleItemCount(VISIBLE_COUNT);\r
-               selections.setVisibleItemCount(VISIBLE_COUNT);\r
-               options.setStyleName(CLASSNAME + "-options");\r
-               selections.setStyleName(CLASSNAME + "-selections");\r
-               Panel buttons = new FlowPanel();\r
-               buttons.setStyleName(CLASSNAME + "-buttons");\r
-               add = new IButton();\r
-               remove = new IButton();\r
-               add.setText(">>");\r
-               remove.setText("<<");\r
-               add.addClickListener(this);\r
-               remove.addClickListener(this);\r
-               Panel p = ((Panel) optionsContainer);\r
-               p.add(options);\r
-               buttons.add(add);\r
-               HTML br = new HTML("&nbsp;");\r
-               br.setStyleName(CLASSNAME + "-deco");\r
-               buttons.add(br);\r
-               buttons.add(remove);\r
-               p.add(buttons);\r
-               p.add(selections);\r
-       }\r
-\r
-       protected void buildOptions(UIDL uidl) {\r
-               boolean enabled = !disabled && !readonly;\r
-               options.setMultipleSelect(multiselect);\r
-               selections.setMultipleSelect(multiselect);\r
-               options.setEnabled(enabled);\r
-               selections.setEnabled(enabled);\r
-               add.setEnabled(enabled);\r
-               remove.setEnabled(enabled);\r
-               options.clear();\r
-               selections.clear();\r
-               for (Iterator i = uidl.getChildIterator(); i.hasNext();) {\r
-                       UIDL optionUidl = (UIDL) i.next();\r
-                       if (optionUidl.hasAttribute("selected")) {\r
-                               selections.addItem(optionUidl.getStringAttribute("caption"),\r
-                                               optionUidl.getStringAttribute("key"));\r
-                       } else\r
-                               options.addItem(optionUidl.getStringAttribute("caption"),\r
-                                               optionUidl.getStringAttribute("key"));\r
-               }\r
-       }\r
-\r
-       protected Object[] getSelectedItems() {\r
-               Vector selectedItemKeys = new Vector();\r
-               for (int i = 0; i < selections.getItemCount(); i++) {\r
-                       selectedItemKeys.add(selections.getValue(i));\r
-               }\r
-               return selectedItemKeys.toArray();\r
-       }\r
-\r
-       private boolean[] getItemsToAdd() {\r
-               boolean[] selectedIndexes = new boolean[options.getItemCount()];\r
-               for (int i = 0; i < options.getItemCount(); i++) {\r
-                       if (options.isItemSelected(i))\r
-                               selectedIndexes[i] = true;\r
-                       else\r
-                               selectedIndexes[i] = false;\r
-               }\r
-               return selectedIndexes;\r
-       }\r
-\r
-       private boolean[] getItemsToRemove() {\r
-               boolean[] selectedIndexes = new boolean[selections.getItemCount()];\r
-               for (int i = 0; i < selections.getItemCount(); i++) {\r
-                       if (selections.isItemSelected(i))\r
-                               selectedIndexes[i] = true;\r
-                       else\r
-                               selectedIndexes[i] = false;\r
-               }\r
-               return selectedIndexes;\r
-       }\r
-\r
-       public void onClick(Widget sender) {\r
-               super.onClick(sender);\r
-               if (sender == add) {\r
-                       boolean[] sel = getItemsToAdd();\r
-                       for (int i = 0; i < sel.length; i++) {\r
-                               if (sel[i]) {\r
-                                       int optionIndex = i - (sel.length - options.getItemCount());\r
-                                       selectedKeys.add(options.getValue(optionIndex));\r
-\r
-                                       // Move selection to another column\r
-                                       String text = options.getItemText(optionIndex);\r
-                                       String value = options.getValue(optionIndex);\r
-                                       selections.addItem(text, value);\r
-                                       options.removeItem(optionIndex);\r
-                               }\r
-                       }\r
-                       client.updateVariable(id, "selected", selectedKeys.toArray(),\r
-                                       immediate);\r
-\r
-               } else if (sender == remove) {\r
-                       boolean[] sel = getItemsToRemove();\r
-                       for (int i = 0; i < sel.length; i++) {\r
-                               if (sel[i]) {\r
-                                       int selectionIndex = i\r
-                                                       - (sel.length - selections.getItemCount());\r
-                                       selectedKeys.remove(selections.getValue(selectionIndex));\r
-\r
-                                       // Move selection to another column\r
-                                       String text = selections.getItemText(selectionIndex);\r
-                                       String value = selections.getValue(selectionIndex);\r
-                                       options.addItem(text, value);\r
-                                       selections.removeItem(selectionIndex);\r
-                               }\r
-                       }\r
-                       client.updateVariable(id, "selected", selectedKeys.toArray(),\r
-                                       immediate);\r
-               }\r
-       }\r
+    private static final String CLASSNAME = "i-select-twincol";\r
+\r
+    private static final int VISIBLE_COUNT = 10;\r
+\r
+    private ListBox options;\r
+\r
+    private ListBox selections;\r
+\r
+    private IButton add;\r
+\r
+    private IButton remove;\r
+\r
+    public ITwinColSelect() {\r
+        super(CLASSNAME);\r
+        options = new ListBox();\r
+        selections = new ListBox();\r
+        options.setVisibleItemCount(VISIBLE_COUNT);\r
+        selections.setVisibleItemCount(VISIBLE_COUNT);\r
+        options.setStyleName(CLASSNAME + "-options");\r
+        selections.setStyleName(CLASSNAME + "-selections");\r
+        Panel buttons = new FlowPanel();\r
+        buttons.setStyleName(CLASSNAME + "-buttons");\r
+        add = new IButton();\r
+        remove = new IButton();\r
+        add.setText(">>");\r
+        remove.setText("<<");\r
+        add.addClickListener(this);\r
+        remove.addClickListener(this);\r
+        Panel p = ((Panel) optionsContainer);\r
+        p.add(options);\r
+        buttons.add(add);\r
+        HTML br = new HTML("&nbsp;");\r
+        br.setStyleName(CLASSNAME + "-deco");\r
+        buttons.add(br);\r
+        buttons.add(remove);\r
+        p.add(buttons);\r
+        p.add(selections);\r
+    }\r
+\r
+    protected void buildOptions(UIDL uidl) {\r
+        boolean enabled = !isDisabled() && !isReadonly();\r
+        options.setMultipleSelect(isMultiselect());\r
+        selections.setMultipleSelect(isMultiselect());\r
+        options.setEnabled(enabled);\r
+        selections.setEnabled(enabled);\r
+        add.setEnabled(enabled);\r
+        remove.setEnabled(enabled);\r
+        options.clear();\r
+        selections.clear();\r
+        for (Iterator i = uidl.getChildIterator(); i.hasNext();) {\r
+            UIDL optionUidl = (UIDL) i.next();\r
+            if (optionUidl.hasAttribute("selected")) {\r
+                selections.addItem(optionUidl.getStringAttribute("caption"),\r
+                        optionUidl.getStringAttribute("key"));\r
+            } else {\r
+                options.addItem(optionUidl.getStringAttribute("caption"),\r
+                        optionUidl.getStringAttribute("key"));\r
+            }\r
+        }\r
+    }\r
+\r
+    protected Object[] getSelectedItems() {\r
+        Vector selectedItemKeys = new Vector();\r
+        for (int i = 0; i < selections.getItemCount(); i++) {\r
+            selectedItemKeys.add(selections.getValue(i));\r
+        }\r
+        return selectedItemKeys.toArray();\r
+    }\r
+\r
+    private boolean[] getItemsToAdd() {\r
+        boolean[] selectedIndexes = new boolean[options.getItemCount()];\r
+        for (int i = 0; i < options.getItemCount(); i++) {\r
+            if (options.isItemSelected(i)) {\r
+                selectedIndexes[i] = true;\r
+            } else {\r
+                selectedIndexes[i] = false;\r
+            }\r
+        }\r
+        return selectedIndexes;\r
+    }\r
+\r
+    private boolean[] getItemsToRemove() {\r
+        boolean[] selectedIndexes = new boolean[selections.getItemCount()];\r
+        for (int i = 0; i < selections.getItemCount(); i++) {\r
+            if (selections.isItemSelected(i)) {\r
+                selectedIndexes[i] = true;\r
+            } else {\r
+                selectedIndexes[i] = false;\r
+            }\r
+        }\r
+        return selectedIndexes;\r
+    }\r
+\r
+    public void onClick(Widget sender) {\r
+        super.onClick(sender);\r
+        if (sender == add) {\r
+            boolean[] sel = getItemsToAdd();\r
+            for (int i = 0; i < sel.length; i++) {\r
+                if (sel[i]) {\r
+                    int optionIndex = i - (sel.length - options.getItemCount());\r
+                    selectedKeys.add(options.getValue(optionIndex));\r
+\r
+                    // Move selection to another column\r
+                    String text = options.getItemText(optionIndex);\r
+                    String value = options.getValue(optionIndex);\r
+                    selections.addItem(text, value);\r
+                    options.removeItem(optionIndex);\r
+                }\r
+            }\r
+            client.updateVariable(id, "selected", selectedKeys.toArray(),\r
+                    isImmediate());\r
+\r
+        } else if (sender == remove) {\r
+            boolean[] sel = getItemsToRemove();\r
+            for (int i = 0; i < sel.length; i++) {\r
+                if (sel[i]) {\r
+                    int selectionIndex = i\r
+                            - (sel.length - selections.getItemCount());\r
+                    selectedKeys.remove(selections.getValue(selectionIndex));\r
+\r
+                    // Move selection to another column\r
+                    String text = selections.getItemText(selectionIndex);\r
+                    String value = selections.getValue(selectionIndex);\r
+                    options.addItem(text, value);\r
+                    selections.removeItem(selectionIndex);\r
+                }\r
+            }\r
+            client.updateVariable(id, "selected", selectedKeys.toArray(),\r
+                    isImmediate());\r
+        }\r
+    }\r
 \r
 }\r