Author: gseitz
Date: Mon May 19 10:08:52 2008
New Revision: 657864
URL: http://svn.apache.org/viewvc?rev=657864&view=rev
Log:
undo generification of ITab<T>
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java
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/TabbedPanel.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java?rev=657864&r1=657863&r2=657864&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.java
Mon May 19 10:08:52 2008
@@ -39,8 +39,8 @@
public TabbedPanelPage()
{
// create a list of ITab objects used to feed the tabbed panel
- List<ITab<?>> tabs = new ArrayList<ITab<?>>();
- tabs.add(new AbstractTab<Void>(new Model<String>("first tab"))
+ List<ITab> tabs = new ArrayList<ITab>();
+ tabs.add(new AbstractTab(new Model<String>("first tab"))
{
@Override
public Panel<Void> getPanel(String panelId)
@@ -49,7 +49,7 @@
}
});
- tabs.add(new AbstractTab<Void>(new Model<String>("second tab"))
+ tabs.add(new AbstractTab(new Model<String>("second tab"))
{
@Override
public Panel<Void> getPanel(String panelId)
@@ -58,7 +58,7 @@
}
});
- tabs.add(new AbstractTab<Void>(new Model<String>("third tab"))
+ tabs.add(new AbstractTab(new Model<String>("third tab"))
{
@Override
public Panel<Void> getPanel(String panelId)
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java?rev=657864&r1=657863&r2=657864&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
Mon May 19 10:08:52 2008
@@ -50,8 +50,8 @@
addCssSwitchingLinks();
// create a list of ITab objects used to feed the tabbed panel
- List<ITab<?>> tabs = new ArrayList<ITab<?>>();
- tabs.add(new AbstractTab<Void>(new Model<String>("first tab"))
+ List<ITab> tabs = new ArrayList<ITab>();
+ tabs.add(new AbstractTab(new Model<String>("first tab"))
{
@Override
@@ -62,7 +62,7 @@
});
- tabs.add(new AbstractTab<Void>(new Model<String>("second tab"))
+ tabs.add(new AbstractTab(new Model<String>("second tab"))
{
@Override
@@ -73,7 +73,7 @@
});
- tabs.add(new AbstractTab<Void>(new Model<String>("third tab"))
+ tabs.add(new AbstractTab(new Model<String>("third tab"))
{
@Override
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java?rev=657864&r1=657863&r2=657864&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java
Mon May 19 10:08:52 2008
@@ -42,7 +42,7 @@
* @param id
* @param tabs
*/
- public AjaxTabbedPanel(String id, List<ITab<?>> tabs)
+ public AjaxTabbedPanel(String id, List<ITab> tabs)
{
super(id, tabs);
setOutputMarkupId(true);
@@ -82,7 +82,7 @@
* the fallback mode is used. See [EMAIL PROTECTED] AjaxFallbackLink}
for details.
*
* @param target
- * ajax target used to update this component
+ * ajax target used to update this component
*/
protected void onAjaxUpdate(AjaxRequestTarget target)
{
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java?rev=657864&r1=657863&r2=657864&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java
Mon May 19 10:08:52 2008
@@ -25,11 +25,9 @@
* @see ITab
*
* @author Igor Vaynberg (ivaynberg)
- * @param <T>
- * the panel's model object type
*
*/
-public abstract class AbstractTab<T> implements ITab<T>
+public abstract class AbstractTab implements ITab
{
/**
*
@@ -59,5 +57,5 @@
/**
* @see
org.apache.wicket.extensions.markup.html.tabs.ITab#getPanel(java.lang.String)
*/
- public abstract Panel<T> getPanel(final String panelId);
+ public abstract Panel<?> getPanel(final String panelId);
}
\ No newline at end of file
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=657864&r1=657863&r2=657864&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 May 19 10:08:52 2008
@@ -26,12 +26,10 @@
* @see org.apache.wicket.extensions.markup.html.tabs.TabbedPanel
* @see org.apache.wicket.extensions.markup.html.tabs.AbstractTab
*
- * @param <T>
- * the panel's model object type
* @author Igor Vaynberg (ivaynberg)
*
*/
-public interface ITab<T> extends IClusterable
+public interface ITab extends IClusterable
{
/**
* @return IModel used to represent the title of the tab. Must contain
a string.
@@ -43,5 +41,5 @@
* returned panel MUST have this id
* @return a Panel object that will be placed as the content panel
*/
- Panel<T> getPanel(final String panelId);
+ Panel<?> getPanel(final String panelId);
}
\ No newline at end of file
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=657864&r1=657863&r2=657864&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 May 19 10:08:52 2008
@@ -37,8 +37,8 @@
* content panels inside the TabbedPanel panel.
*
* <p>
- * <b>Note:</b> When the currently selected tab is replaced by changing the
underlying list of tabs,
- * the change is not picked up unless a call is made to [EMAIL PROTECTED]
#setSelectedTab(int)}.
+ * <b>Note:</b> When the currently selected tab is replaced by changing the
underlying list of
+ * tabs, the change is not picked up unless a call is made to [EMAIL
PROTECTED] #setSelectedTab(int)}.
* <p>
*
* Example:
@@ -94,17 +94,17 @@
public static final String TAB_PANEL_ID = "panel";
- private final List<ITab<?>> tabs;
+ private final List<ITab> tabs;
/**
* Constructor
*
* @param id
- * component id
+ * component id
* @param tabs
- * list of ITab objects used to represent tabs
+ * list of ITab objects used to represent tabs
*/
- public TabbedPanel(String id, List<ITab<?>> tabs)
+ public TabbedPanel(String id, List<ITab> tabs)
{
super(id, new Model<Integer>(new Integer(-1)));
@@ -148,7 +148,7 @@
protected void populateItem(LoopItem item)
{
final int index = item.getIteration();
- final ITab<?> tab =
(TabbedPanel.this.tabs.get(index));
+ final ITab tab =
(TabbedPanel.this.tabs.get(index));
final WebMarkupContainer<?> titleLink =
newLink("link", index);
@@ -218,7 +218,7 @@
/**
* @return the value of css class attribute that will be added to a div
containing the tabs. The
- * default value is <code>tab-row</code>
+ * default value is <code>tab-row</code>
*/
protected String getTabContainerCssClass()
{
@@ -228,7 +228,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<ITab> getTabs()
{
return tabs;
}
@@ -237,15 +237,14 @@
* Factory method for tab titles. Returned component can be anything
that can attach to span
* tags such as a fragment, panel, or a label
*
- * @param <
- * S> the returned component's model object type
- *
* @param titleId
- * id of title component
+ * id of title component
* @param titleModel
- * model containing tab title
+ * model containing tab title
* @param index
- * index of tab
+ * index of tab
+ * @param <S>
+ * the returned component's model object type
* @return title component
*/
protected <S> Component<S> newTitle(String titleId, IModel<S>
titleModel, int index)
@@ -282,10 +281,11 @@
* </pre>
*
* @param linkId
- * component id with which the link should be created
+ * component id with which the link should be created
* @param index
- * index of the tab that should be activated when this
link is clicked. See [EMAIL PROTECTED]
- * #setSelectedTab(int)}.
+ * index of the tab that should be activated when this link
is clicked. See [EMAIL PROTECTED]
+ * #setSelectedTab(int)}.
+ * @param <S>
* @return created link component
*/
protected <S> WebMarkupContainer<S> newLink(String linkId, final int
index)
@@ -306,7 +306,7 @@
* sets the selected tab
*
* @param index
- * index of the tab to select
+ * index of the tab to select
*
*/
public void setSelectedTab(int index)
@@ -318,7 +318,7 @@
setModelObject(new Integer(index));
- ITab<?> tab = tabs.get(index);
+ ITab tab = tabs.get(index);
Panel<?> panel = tab.getPanel(TAB_PANEL_ID);
