You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/08/23 16:14:40 UTC
[2/2] git commit: WICKET-4728 Use IModel for the bread crumb
participant's title
WICKET-4728 Use IModel for the bread crumb participant's title
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2cd26d81
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2cd26d81
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2cd26d81
Branch: refs/heads/master
Commit: 2cd26d816434188b2fcb6099c61916364dee160b
Parents: 771ddce
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Aug 23 17:13:47 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 23 17:13:47 2012 +0300
----------------------------------------------------------------------
.../wicket/examples/breadcrumb/FirstPanel.java | 6 ++++--
.../wicket/examples/breadcrumb/FourthPanel.java | 6 ++++--
.../wicket/examples/breadcrumb/ResultPanel.java | 6 ++++--
.../wicket/examples/breadcrumb/SecondPanel.java | 6 ++++--
.../wicket/examples/breadcrumb/ThirdPanel.java | 6 ++++--
.../breadcrumb/IBreadCrumbParticipant.java | 3 ++-
.../breadcrumb/panel/BreadCrumbPanel.java | 2 +-
7 files changed, 23 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2cd26d81/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.java
index 43dc8e3..f4156f6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FirstPanel.java
@@ -19,6 +19,8 @@ package org.apache.wicket.examples.breadcrumb;
import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel;
import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel;
import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanelLink;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
/**
* Test bread crumb enabled panel.
@@ -43,8 +45,8 @@ public class FirstPanel extends BreadCrumbPanel
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant#getTitle()
*/
@Override
- public String getTitle()
+ public IModel<String> getTitle()
{
- return "first";
+ return Model.of("first");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2cd26d81/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.java
index 21816b1..f0efe1e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/FourthPanel.java
@@ -18,6 +18,8 @@ package org.apache.wicket.examples.breadcrumb;
import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel;
import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
/**
* Test bread crumb enabled panel.
@@ -41,8 +43,8 @@ public class FourthPanel extends BreadCrumbPanel
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant#getTitle()
*/
@Override
- public String getTitle()
+ public IModel<String> getTitle()
{
- return "fourth";
+ return Model.of("fourth");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2cd26d81/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java
index 1f7d912..a7c8d54 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java
@@ -19,6 +19,8 @@ package org.apache.wicket.examples.breadcrumb;
import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel;
import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
/**
@@ -52,8 +54,8 @@ public class ResultPanel extends BreadCrumbPanel
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant#getTitle()
*/
@Override
- public String getTitle()
+ public IModel<String> getTitle()
{
- return "result";
+ return Model.of("result");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2cd26d81/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java
index 7f14d88..8146b33 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java
@@ -24,6 +24,8 @@ import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
/**
@@ -112,8 +114,8 @@ public class SecondPanel extends BreadCrumbPanel
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant#getTitle()
*/
@Override
- public String getTitle()
+ public IModel<String> getTitle()
{
- return "second";
+ return Model.of("second");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2cd26d81/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.java
index 16b1b95..c6797a8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ThirdPanel.java
@@ -18,6 +18,8 @@ package org.apache.wicket.examples.breadcrumb;
import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel;
import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
/**
* Test bread crumb enabled panel.
@@ -41,8 +43,8 @@ public class ThirdPanel extends BreadCrumbPanel
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant#getTitle()
*/
@Override
- public String getTitle()
+ public IModel<String> getTitle()
{
- return "third";
+ return Model.of("third");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2cd26d81/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
index 8a4dc59..7ddc3a4 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
@@ -18,6 +18,7 @@ package org.apache.wicket.extensions.breadcrumb;
import org.apache.wicket.Component;
import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.util.io.IClusterable;
@@ -50,7 +51,7 @@ public interface IBreadCrumbParticipant extends IClusterable
*
* @return The title of the bread crumb
*/
- String getTitle();
+ IModel<String> getTitle();
/**
* Called when the corresponding bread crumb is activated.
http://git-wip-us.apache.org/repos/asf/wicket/blob/2cd26d81/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java
index 3fba023..629cfbc 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java
@@ -67,7 +67,7 @@ public abstract class BreadCrumbPanel extends Panel implements IBreadCrumbPartic
private static final long serialVersionUID = 1L;
@Override
- public String getTitle()
+ public IModel<String> getTitle()
{
return BreadCrumbPanel.this.getTitle();
}