From 2d8f29f643fd04ed3a243ddd7c49545acf97236b Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Mon, 27 Apr 2015 11:04:40 +0300 Subject: Restore unintended API changes (#17645) This reverts commit 0ae745206a9ebc759a126606621f6cbd9f48b00d and restores a removed public method. Change-Id: I8eff9668d0a5c49fb63ecea7b0214e478b0aeee8 --- client/src/com/vaadin/client/ui/VFilterSelect.java | 10 ++++++++++ server/src/com/vaadin/ui/Tree.java | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java index 6a3f0e9100..35a3ded75f 100644 --- 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 3c5758c1ea..a86a9bd64b 100644 --- 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; -- cgit v1.2.3