From 780c5d6be068cad400e39df6d6b3f5b533d0366c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Dahlstr=C3=B6m?= Date: Thu, 12 Apr 2012 15:22:21 +0000 Subject: [PATCH] Fixed #8653: addTab(index) should not throw if index is out of bounds svn changeset:23503/svn branch:6.8 --- src/com/vaadin/ui/TabSheet.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/com/vaadin/ui/TabSheet.java b/src/com/vaadin/ui/TabSheet.java index cb89c5e0c8..334c4c886b 100644 --- a/src/com/vaadin/ui/TabSheet.java +++ b/src/com/vaadin/ui/TabSheet.java @@ -569,14 +569,15 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * * @param position * the position of the tab - * @return + * @return The tab in the given position, or null if the position is out of + * bounds. */ public Tab getTab(int position) { - Component c = components.get(position); - if (c != null) { - return tabs.get(c); + if (position >= 0 && position < getComponentCount()) { + return getTab(components.get(position)); + } else { + return null; } - return null; } /** -- 2.39.5