From c8d6b30d462dad4e4cbd8b8ab556601d7fe634a7 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 8 Jan 2010 13:49:00 +0000 Subject: [PATCH] Fix for #3948 - Document that Container.Hierarchical.removeItem should not remove children svn changeset:10652/svn branch:6.2 --- src/com/vaadin/ui/AbstractSelect.java | 7 ++----- src/com/vaadin/ui/Tree.java | 7 +++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index b8ef6bc206..4b5ef4a0a8 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -793,12 +793,9 @@ public abstract class AbstractSelect extends AbstractField implements return retval; } - /** - * Removes the item identified by Id from the container. This functionality - * is optional. If the function is not implemented, the functions allways - * returns false. + /* + * (non-Javadoc) * - * @return True if the operation succeeded. * @see com.vaadin.data.Container#removeItem(java.lang.Object) */ public boolean removeItem(Object itemId) diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java index 509d83a153..28a410fa13 100644 --- a/src/com/vaadin/ui/Tree.java +++ b/src/com/vaadin/ui/Tree.java @@ -1068,4 +1068,11 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, public abstract String getStyle(Object itemId); } + // Overriden so javadoc comes from Container.Hierarchical + @Override + public boolean removeItem(Object itemId) + throws UnsupportedOperationException { + return super.removeItem(itemId); + } + } -- 2.39.5