array variables now work properly

svn changeset:1659/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Client.java b/src/com/itmill/toolkit/terminal/gwt/client/Client.java
index 3eccc4932c8827033e037625e8c3ddae83221fd7..038d66e1dd320d507606d102b2f1c79461d36f6b 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/Client.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/Client.java
@@ -78,7 +78,7 @@ public class Client implements EntryPoint {
        }-*/;
 
        private void makeUidlRequest(String requestData) {
-               console.log("Making UIDL Request");
+               console.log("Making UIDL Request with params: " + requestData);
                rb = new RequestBuilder(RequestBuilder.GET, appUri
                                + "/UIDL/?requestId=" + (++requestCount) + "&" + requestData);
                try {
@@ -218,7 +218,7 @@ public class Client implements EntryPoint {
                                buf.append(",");
                        buf.append(escapeString(values[i].toString()));
                }
-               addVariableToQueue(paintableId, variableName, buf.toString(), immediate);
+               addVariableToQueue("array:" + paintableId, variableName, buf.toString(), immediate);
        }
 
 

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkSelect.java
index 95b9d7b03db35f052c4cd8f1fb71a8dcf6169113..e5f6d13a191bca72acb6d3e8c314f5743d2d7b3e 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkSelect.java
@@ -55,15 +55,18 @@ public class TkSelect extends Composite implements Paintable, ChangeListener {
 
        public void onChange(Widget sender) {
                if(select.isMultipleSelect()) {
-                       Vector selectedItemKeys = new Vector();
-                       for(int i = 0; i < select.getItemCount();i++) {
-                               if(select.isItemSelected(i))
-                                       selectedItemKeys.add(select.getValue(i));
-                       }
-                       Object[] values = selectedItemKeys.toArray();
-                       client.updateVariable(id, "selected", values, immediate);
+                       client.updateVariable(id, "selected", getSelectedKeys(), immediate);
                } else {
                        client.updateVariable(id, "selected", new String[] { "" + select.getValue(select.getSelectedIndex())}, immediate);
                }
        }
+       
+       private Object[] getSelectedKeys() {
+               Vector selectedItemKeys = new Vector();
+               for(int i = 0; i < select.getItemCount();i++) {
+                       if(select.isItemSelected(i))
+                               selectedItemKeys.add(select.getValue(i));
+               }
+               return selectedItemKeys.toArray();
+       }
 }