#1394 enable implementing Focusable components outside the com.vaadin.ui package

svn changeset:12274/svn branch:6.3

1 files changed, 4 insertions, 17 deletions

diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index fb436b8ca0..b2b38ffc65 100644
--- a/src/com/vaadin/ui/AbstractField.java
+++ b/src/com/vaadin/ui/AbstractField.java
@@ -13,7 +13,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.vaadin.Application;
 import com.vaadin.data.Buffered;
 import com.vaadin.data.Property;
 import com.vaadin.data.Validatable;
@@ -59,8 +58,6 @@ public abstract class AbstractField extends AbstractComponent implements Field,
 
     /* Private members */
 
-    private boolean delayedFocus;
-
     /**
      * Value of the abstract field.
      */
@@ -978,19 +975,12 @@ public abstract class AbstractField extends AbstractComponent implements Field,
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.ui.Component.Focusable#focus()
+    /**
+     * {@inheritDoc}
      */
+    @Override
     public void focus() {
-        final Application app = getApplication();
-        if (app != null) {
-            getWindow().setFocusedComponent(this);
-            delayedFocus = false;
-        } else {
-            delayedFocus = true;
-        }
+        super.focus();
     }
 
     /**
@@ -1069,9 +1059,6 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     @Override
     public void attach() {
         super.attach();
-        if (delayedFocus) {
-            focus();
-        }
         if (actionManager != null) {
             actionManager.setViewer(getWindow());
         }