From 4b913079bac3d688d3ef7419e84336522f45227f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Sun, 22 Feb 2009 09:40:01 +0000
Subject: [PATCH] Test case and fix for #2658 - Disabling a tabsheet should not
 change the selected tab

svn changeset:6928/svn branch:trunk
---
 .../tabsheet/TabSheetDisabling.java           | 61 +++++++++++++++++++
 src/com/itmill/toolkit/ui/TabSheet.java       |  7 ++-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/com/itmill/toolkit/tests/components/tabsheet/TabSheetDisabling.java

diff --git a/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetDisabling.java b/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetDisabling.java
new file mode 100644
index 0000000000..f934cb0689
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetDisabling.java
@@ -0,0 +1,61 @@
+package com.itmill.toolkit.tests.components.tabsheet;
+
+import com.itmill.toolkit.tests.components.TestBase;
+import com.itmill.toolkit.ui.Button;
+import com.itmill.toolkit.ui.TabSheet;
+import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.itmill.toolkit.ui.Button.ClickListener;
+
+public class TabSheetDisabling extends TestBase {
+
+    private static final int NR_BUTTONS = 10;
+    private Button buttons[] = new Button[NR_BUTTONS];
+    private TabSheet tabSheet;
+
+    @Override
+    public void setup() {
+        tabSheet = new TabSheet();
+        for (int i = 0; i < NR_BUTTONS; i++) {
+            if (i % 2 == 0) {
+                buttons[i] = new Button("Disable this tab",
+                        new ClickListener() {
+
+                            public void buttonClick(ClickEvent event) {
+                                event.getButton().setEnabled(false);
+
+                            }
+
+                        });
+            } else {
+                buttons[i] = new Button("Hide this tab", new ClickListener() {
+
+                    public void buttonClick(ClickEvent event) {
+                        event.getButton().setVisible(false);
+
+                    }
+
+                });
+            }
+            tabSheet.addTab(buttons[i]);
+        }
+
+        Button button = new Button("Enable/disable", new ClickListener() {
+            public void buttonClick(ClickEvent event) {
+                tabSheet.setEnabled(!tabSheet.isEnabled());
+            }
+        });
+        addComponent(tabSheet);
+        addComponent(button);
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Switching the tabsheet between disabled and enabled should not change which tab is selected. Disabling the open tab should select the first enabled tab.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 2658;
+    }
+
+}
diff --git a/src/com/itmill/toolkit/ui/TabSheet.java b/src/com/itmill/toolkit/ui/TabSheet.java
index 70ba228739..25a5c65455 100644
--- a/src/com/itmill/toolkit/ui/TabSheet.java
+++ b/src/com/itmill/toolkit/ui/TabSheet.java
@@ -197,8 +197,13 @@ public class TabSheet extends AbstractComponentContainer implements
         for (final Iterator i = getComponentIterator(); i.hasNext();) {
             final Component c = (Component) i.next();
 
+            /*
+             * If we have no selection, if the current selection is invisible or
+             * if the current selection is disabled (but the whole component is
+             * not) we select this tab instead
+             */
             if (selected == null || !selected.isVisible()
-                    || !selected.isEnabled()) {
+                    || (!selected.isEnabled() && this.isEnabled())) {
                 selected = c;
             }
             target.startTag("tab");
-- 
2.39.5