You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2012/09/05 19:33:48 UTC
git commit: WICKET-4749 do not use model from parent
Updated Branches:
refs/heads/master 20be712c0 -> f0cc9cb81
WICKET-4749 do not use model from parent
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f0cc9cb8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f0cc9cb8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f0cc9cb8
Branch: refs/heads/master
Commit: f0cc9cb81e0a3057fffcbcad1212c0255692ea17
Parents: 20be712
Author: svenmeier <sv...@apache.org>
Authored: Wed Sep 5 19:33:25 2012 +0200
Committer: svenmeier <sv...@apache.org>
Committed: Wed Sep 5 19:33:25 2012 +0200
----------------------------------------------------------------------
.../extensions/markup/html/tabs/TabbedPanel.java | 21 +++++---------
1 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f0cc9cb8/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
index 92d302e..094cfbc 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
@@ -157,20 +157,15 @@ public class TabbedPanel<T extends ITab> extends Panel
}
/**
- * Initialize the component's model.
+ * Override of the default initModel behaviour. This component <strong>will not</strong> use any
+ * compound model of a parent.
*
- * @return a new model containing {@code -1} if the super implementation doesn't supply one
+ * @see org.apache.wicket.Component#initModel()
*/
@Override
protected IModel<?> initModel()
{
- IModel<?> model = super.initModel();
- if (model == null)
- {
- model = new Model<Integer>(-1);
- }
-
- return model;
+ return new Model<Integer>(-1);
}
/**
@@ -280,8 +275,8 @@ public class TabbedPanel<T extends ITab> extends Panel
}
/**
- * @return the value of css class attribute that will be added to last tab. The
- * default value is <code>last</code>
+ * @return the value of css class attribute that will be added to last tab. The default value is
+ * <code>last</code>
*/
protected String getLastTabCssClass()
{
@@ -289,8 +284,8 @@ public class TabbedPanel<T extends ITab> extends Panel
}
/**
- * @return the value of css class attribute that will be added to selected tab. The
- * default value is <code>selected</code>
+ * @return the value of css class attribute that will be added to selected tab. The default
+ * value is <code>selected</code>
*/
protected String getSelectedTabCssClass()
{