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 2015/03/12 09:16:37 UTC
[4/5] wicket git commit: WICKET-5754 (String)ResourceModel's
defaultValue could be an IModel
WICKET-5754 (String)ResourceModel's defaultValue could be an IModel<String>
Downport the improvement for StringResourceModel too.
(cherry picked from commit 27390216627c8d69d4b156f781a3e6124a8eb300)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/08fe67e3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/08fe67e3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/08fe67e3
Branch: refs/heads/wicket-6.x
Commit: 08fe67e37733f05c4cf199b5367faf5dd63e1d90
Parents: 2ed52c0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 10 13:08:10 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 12 10:14:28 2015 +0200
----------------------------------------------------------------------
.../org/apache/wicket/model/StringResourceModel.java | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/08fe67e3/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java b/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
index 595c774..0c65d92 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
@@ -413,21 +413,13 @@ public class StringResourceModel extends LoadableDetachableModel<String>
{
// Get the string resource, doing any property substitutions as part
// of the get operation
- value = localizer.getString(getResourceKey(), component, model, defaultValue);
- if (value == null)
- {
- value = defaultValue;
- }
+ value = localizer.getString(getResourceKey(), component, model, null, null, defaultValue);
}
else
{
// Get the string resource, doing not any property substitutions
// that has to be done later after MessageFormat
- value = localizer.getString(getResourceKey(), component, null, defaultValue);
- if (value == null)
- {
- value = defaultValue;
- }
+ value = localizer.getString(getResourceKey(), component, null, null, null, defaultValue);
if (value != null)
{
// Build the real parameters