Changeset 5558

Timestamp:

09/30/08 11:13:49 (3 months ago)

Author:

matti.tahvonen@…

Message:

 

Location:

trunk/src/com/itmill/toolkit

Files:

• terminal/gwt/server/CommunicationManager.java (modified) (1 diff)
• ui/AbstractField.java (modified) (2 diffs)
• ui/Component.java (modified) (1 diff)
• ui/Upload.java (modified) (3 diffs)
• ui/Window.java (modified) (3 diffs)

trunk/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java

@@ -480 +480 @@
             }
 
-            // add meta instruction for client to set focus if it is set
-            final Paintable f = (Paintable) application.consumeFocus();
-            if (f != null) {
-                if (metaOpen) {
-                    outWriter.write(",");
-                }
-                outWriter.write("\"focus\":\"" + getPaintableId(f) + "\"");
-            }
-
             outWriter.print("}, \"resources\" : {");
 

trunk/src/com/itmill/toolkit/ui/AbstractField.java

@@ -926 +926 @@
     }
 
-    /**
-     * Asks the terminal to place the cursor to this field.
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.ui.Component.Focusable#focus()
      */
     public void focus() {
         final Application app = getApplication();
         if (app != null) {
-            app.setFocusedComponent(this);
+            getWindow().setFocusedComponent(this);
+            delayedFocus = false;
         } else {
             delayedFocus = true;
@@ -1014 +1017 @@
         super.attach();
         if (delayedFocus) {
-
-            delayedFocus = false;
             focus();
         }

trunk/src/com/itmill/toolkit/ui/Component.java

@@ -402 +402 @@
      * Interface implemented by components which can obtain input focus.
      */
-    public interface Focusable {
+    public interface Focusable extends Component {
 
         /**

trunk/src/com/itmill/toolkit/ui/Upload.java

@@ -846 +846 @@
     }
 
-    /**
-     * Sets the focus to this component.
+    /*
+     * (non-Javadoc)
      * 
      * @see com.itmill.toolkit.ui.Component.Focusable#focus()
@@ -854 +854 @@
         final Application app = getApplication();
         if (app != null) {
-            app.setFocusedComponent(this);
+            getWindow().setFocusedComponent(this);
+            delayedFocus = false;
         } else {
             delayedFocus = true;
@@ -999 +1000 @@
         super.attach();
         if (delayedFocus) {
-            delayedFocus = false;
             focus();
         }

trunk/src/com/itmill/toolkit/ui/Window.java

@@ -112 +112 @@
 
     private boolean centerRequested = false;
+
+    private Focusable pendingFocus;
 
     /* ********************************************************************* */
@@ -541 +543 @@
         }
 
+        if (pendingFocus != null) {
+            // ensure focused component is still attached to this main window
+            if (pendingFocus.getWindow() == this
+                    || (pendingFocus.getWindow() != null && pendingFocus
+                            .getWindow().getParent() == this)) {
+                target.paintReference(pendingFocus, "focused");
+            }
+            pendingFocus = null;
+        }
+
     }
 
@@ -1192 +1204 @@
         notifications.add(notification);
         requestRepaint();
+    }
+
+    /**
+     * This method is used by Component.Focusable objects to request focus to
+     * themselves. Focus renders must be handled at window level (instead of
+     * Component.Focusable) due we want the last focused component to be focused
+     * in client too. Not the one that is rendered last (the case we'd get if
+     * implemented in Focusable only).
+     * 
+     * To focus component from Toolkit application, use Focusable.focus(). See
+     * {@link Focusable}.
+     * 
+     * @param focusable
+     *            to be focused on next paint
+     */
+    void setFocusedComponent(Focusable focusable) {
+        if (getParent() != null) {
+            // focus is handled by main windows
+            ((Window) getParent()).setFocusedComponent(focusable);
+        } else {
+            pendingFocus = focusable;
+            requestRepaint();
+        }
     }