Restore unintended API changes (#17645)

This reverts commit 0ae745206a9ebc759a126606621f6cbd9f48b00d and
restores a removed public method.

Change-Id: I8eff9668d0a5c49fb63ecea7b0214e478b0aeee8

diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java
index 6a3f0e91005a01a5f058b7e1fd2d475c3831662a..35a3ded75fcbf512db226cfe3a8492315e9d7c4c 100644 (file)
--- a/client/src/com/vaadin/client/ui/VFilterSelect.java
+++ b/client/src/com/vaadin/client/ui/VFilterSelect.java
@@ -730,6 +730,16 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
             }
         }
 
+        /**
+         * This method became obsolete in fix for
+         * http://dev.vaadin.com/ticket/16981
+         * 
+         * @deprecated as of 7.4.4
+         */
+        @Deprecated
+        public void setKeyboardSelectedItem(MenuItem menuItem) {
+            // NO-OP
+        }
     }
 
     /**

diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java
index 3c5758c1ea626d6948218c69c02d12cfe88b4b7c..a86a9bd64b57c6b83af97b72b08d5051fe172af7 100644 (file)
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/com/vaadin/ui/Tree.java
@@ -1301,6 +1301,19 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         }
     }
 
+    /**
+     * Tree does not support lazy options loading mode. Setting this true will
+     * throw UnsupportedOperationException.
+     * 
+     * @see com.vaadin.ui.Select#setLazyLoading(boolean)
+     */
+    public void setLazyLoading(boolean useLazyLoading) {
+        if (useLazyLoading) {
+            throw new UnsupportedOperationException(
+                    "Lazy options loading is not supported by Tree.");
+        }
+    }
+
     private ItemStyleGenerator itemStyleGenerator;
 
     private DropHandler dropHandler;