Author: ivaynberg
Date: Mon Nov 2 19:07:54 2009
New Revision: 832061
URL: http://svn.apache.org/viewvc?rev=832061&view=rev
Log:
tabbed panel improvements
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java?rev=832061&r1=832060&r2=832061&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
Mon Nov 2 19:07:54 2009
@@ -17,7 +17,7 @@
package org.apache.wicket.extensions.markup.html.tabs;
import org.apache.wicket.IClusterable;
-import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.html.WebMarkupContainerWithAssociatedMarkup;
import org.apache.wicket.model.IModel;
/**
@@ -41,7 +41,7 @@
* returned panel MUST have this id
* @return a Panel object that will be placed as the content panel
*/
- Panel getPanel(final String panelId);
+ WebMarkupContainerWithAssociatedMarkup getPanel(final String panelId);
/**
* Returns whether this tab should be visible
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java?rev=832061&r1=832060&r2=832061&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java
Mon Nov 2 19:07:54 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.tabs;
-import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.html.WebMarkupContainerWithAssociatedMarkup;
import org.apache.wicket.model.IModel;
/**
@@ -32,7 +32,7 @@
{
private static final long serialVersionUID = 1L;
- private Panel panel;
+ private WebMarkupContainerWithAssociatedMarkup panel;
private final ITab delegate;
/**
@@ -57,7 +57,7 @@
/**
* @see
org.apache.wicket.extensions.markup.html.tabs.ITab#getPanel(java.lang.String)
*/
- public Panel getPanel(final String panelId)
+ public WebMarkupContainerWithAssociatedMarkup getPanel(final String
panelId)
{
if (panel == null)
{
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=832061&r1=832060&r2=832061&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
Mon Nov 2 19:07:54 2009
@@ -76,7 +76,7 @@
/** id used for child panels */
public static final String TAB_PANEL_ID = "panel";
- private final List<ITab> tabs;
+ private final List<? extends ITab> tabs;
private transient Boolean[] tabsVisibilityCache;
@@ -88,7 +88,7 @@
* @param tabs
* list of ITab objects used to represent tabs
*/
- public TabbedPanel(String id, List<ITab> tabs)
+ public TabbedPanel(String id, List<? extends ITab> tabs)
{
super(id, new Model<Integer>(new Integer(-1)));
@@ -251,7 +251,7 @@
/**
* @return list of tabs that can be used by the user to
add/remove/reorder tabs in the panel
*/
- public final List<ITab> getTabs()
+ public final List<? extends ITab> getTabs()
{
return tabs;
}
@@ -327,8 +327,10 @@
* @param index
* index of the tab to select
*
+ * @return this for chaining
+ *
*/
- public void setSelectedTab(int index)
+ public TabbedPanel setSelectedTab(int index)
{
if (index < 0 || (index >= tabs.size() && index > 0))
{
@@ -367,6 +369,8 @@
}
addOrReplace(component);
+
+ return this;
}
/**
