WICKET-4537 Made AjaxTabbedPanel generic as well
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c572d4f1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c572d4f1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c572d4f1 Branch: refs/heads/wicket-1.5.x Commit: c572d4f1c9a0bf9ec0dc86e5a7ea939650abd696 Parents: 2cc12ee Author: Carl-Eric Menzel <[email protected]> Authored: Tue May 22 18:00:25 2012 +0200 Committer: Carl-Eric Menzel <[email protected]> Committed: Tue May 22 18:00:25 2012 +0200 ---------------------------------------------------------------------- .../ajax/markup/html/tabs/AjaxTabbedPanel.java | 4 +- .../markup/html/tabs/AjaxTabbedPanelTest.java | 30 +++++++++++++++ .../markup/html/tabs/TabbedPanelTest.java | 14 +++++-- 3 files changed, 42 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c572d4f1/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java index cafe225..de0f984 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java @@ -32,7 +32,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; * @author Igor Vaynberg (ivaynberg) * */ -public class AjaxTabbedPanel extends TabbedPanel +public class AjaxTabbedPanel<T extends ITab> extends TabbedPanel<T> { private static final long serialVersionUID = 1L; @@ -42,7 +42,7 @@ public class AjaxTabbedPanel extends TabbedPanel * @param id * @param tabs */ - public AjaxTabbedPanel(final String id, final List<ITab> tabs) + public AjaxTabbedPanel(final String id, final List<T> tabs) { super(id, tabs); setOutputMarkupId(true); http://git-wip-us.apache.org/repos/asf/wicket/blob/c572d4f1/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java new file mode 100644 index 0000000..b5df8b3 --- /dev/null +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/AjaxTabbedPanelTest.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.extensions.markup.html.tabs; + +import java.util.List; + +import org.apache.wicket.extensions.ajax.markup.html.tabs.AjaxTabbedPanel; + +public class AjaxTabbedPanelTest extends TabbedPanelTest +{ + @Override + TabbedPanel<ITab> newTabbedPanel(List<ITab> defaultTabs) + { + return new AjaxTabbedPanel<ITab>("tabpanel", defaultTabs); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/c572d4f1/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java index 2d22c0d..397de15 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanelTest.java @@ -29,7 +29,7 @@ import org.junit.Test; public class TabbedPanelTest extends WicketTestCase { - public static class TestPage extends WebPage + public class TestPage extends WebPage { public TabbedPanel<ITab> tabbedPanel; @@ -54,9 +54,15 @@ public class TabbedPanelTest extends WicketTestCase return new TestPanel(panelId, "default 2"); } }); - tabbedPanel = new TabbedPanel<ITab>("tabpanel", defaultTabs); + tabbedPanel = newTabbedPanel(defaultTabs); add(tabbedPanel); } + + } + + TabbedPanel<ITab> newTabbedPanel(List<ITab> defaultTabs) + { + return new TabbedPanel<ITab>("tabpanel", defaultTabs); } public static class TestPanel extends Panel @@ -71,7 +77,7 @@ public class TabbedPanelTest extends WicketTestCase @Test public void renderDefaultTabsOnly() throws Exception { - tester.startPage(TestPage.class); + tester.startPage(new TestPage()); tester.assertContains("<span wicket:id=\"title\">default 1</span></a>"); tester.assertContains("<span wicket:id=\"label\">default 1</span>"); tester.assertContains("<span wicket:id=\"title\">default 2</span></a>"); @@ -82,7 +88,7 @@ public class TabbedPanelTest extends WicketTestCase @Test public void renderAdditionalTabs() throws Exception { - TestPage page = tester.startPage(TestPage.class); + TestPage page = (TestPage)tester.startPage(new TestPage()); page.tabbedPanel.getTabs().add(new AbstractTab(Model.of("added 1")) { @Override
