Updated to work with the Accordion test

svn changeset:16737/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
index 3f525c5333ae8ef15b89e5d5d30abe17e12b2994..bbbe92f0698629a999fc52b90568fe9a0e27daf7 100644 (file)
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
+++ b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
@@ -11,32 +11,32 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 import com.vaadin.ui.TabSheet.SelectedTabChangeListener;\r
 import com.vaadin.ui.TabSheet.Tab;\r
 \r
-public class TabSheetTest extends AbstractComponentContainerTest<TabSheet>\r
-        implements SelectedTabChangeListener {\r
+public class TabSheetTest<T extends TabSheet> extends\r
+        AbstractComponentContainerTest<T> implements SelectedTabChangeListener {\r
 \r
-    private Command<TabSheet, Integer> setTabCaption = new Command<TabSheet, Integer>() {\r
+    private Command<T, Integer> setTabCaption = new Command<T, Integer>() {\r
 \r
-        public void execute(TabSheet c, Integer value, Object data) {\r
+        public void execute(T c, Integer value, Object data) {\r
             c.getTab(value).setCaption((String) data);\r
 \r
         }\r
     };\r
-    private Command<TabSheet, Integer> setTabIcon = new Command<TabSheet, Integer>() {\r
+    private Command<T, Integer> setTabIcon = new Command<T, Integer>() {\r
 \r
-        public void execute(TabSheet c, Integer value, Object data) {\r
+        public void execute(T c, Integer value, Object data) {\r
             c.getTab(value).setIcon((Resource) data);\r
 \r
         }\r
     };\r
-    private Command<TabSheet, Integer> setTabClosable = new Command<TabSheet, Integer>() {\r
+    private Command<T, Integer> setTabClosable = new Command<T, Integer>() {\r
 \r
-        public void execute(TabSheet c, Integer value, Object data) {\r
+        public void execute(T c, Integer value, Object data) {\r
             c.getTab(value).setClosable((Boolean) data);\r
         }\r
     };\r
-    private Command<TabSheet, Boolean> setCloseHandlerListener = new Command<TabSheet, Boolean>() {\r
+    private Command<T, Boolean> setCloseHandlerListener = new Command<T, Boolean>() {\r
 \r
-        public void execute(TabSheet c, Boolean value, Object data) {\r
+        public void execute(T c, Boolean value, Object data) {\r
             if (value) {\r
                 c.setCloseHandler(new CloseHandler() {\r
                     public void onTabClose(TabSheet tabsheet, Component c) {\r
@@ -55,9 +55,9 @@ public class TabSheetTest extends AbstractComponentContainerTest<TabSheet>
 \r
         }\r
     };\r
-    private Command<TabSheet, Boolean> setSelectedTabListener = new Command<TabSheet, Boolean>() {\r
+    private Command<T, Boolean> setSelectedTabListener = new Command<T, Boolean>() {\r
 \r
-        public void execute(TabSheet c, Boolean value, Object data) {\r
+        public void execute(T c, Boolean value, Object data) {\r
             if (value) {\r
                 c.addListener((SelectedTabChangeListener) TabSheetTest.this);\r
             } else {\r
@@ -67,22 +67,22 @@ public class TabSheetTest extends AbstractComponentContainerTest<TabSheet>
         }\r
     };\r
 \r
-    private Command<TabSheet, Integer> selectTab = new Command<TabSheet, Integer>() {\r
-        public void execute(TabSheet c, Integer index, Object data) {\r
+    private Command<T, Integer> selectTab = new Command<T, Integer>() {\r
+        public void execute(T c, Integer index, Object data) {\r
             c.setSelectedTab(c.getTab(index).getComponent());\r
         }\r
     };\r
-    private Command<TabSheet, Boolean> hideTabs = new Command<TabSheet, Boolean>() {\r
+    private Command<T, Boolean> hideTabs = new Command<T, Boolean>() {\r
 \r
-        public void execute(TabSheet c, Boolean value, Object data) {\r
+        public void execute(T c, Boolean value, Object data) {\r
             c.hideTabs(value);\r
 \r
         }\r
     };\r
 \r
     @Override\r
-    protected Class<TabSheet> getTestClass() {\r
-        return TabSheet.class;\r
+    protected Class<T> getTestClass() {\r
+        return (Class<T>) TabSheet.class;\r
     }\r
 \r
     @Override\r