Repository: wicket Updated Branches: refs/heads/master c4db9222e -> 273902166
WICKET-5754 (String)ResourceModel's defaultValue could be an IModel<String> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/27390216 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/27390216 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/27390216 Branch: refs/heads/master Commit: 27390216627c8d69d4b156f781a3e6124a8eb300 Parents: c4db922 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Nov 10 13:08:10 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Nov 10 13:08:10 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/model/StringResourceModel.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/27390216/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 07e2080..54fdd2d 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 @@ -414,23 +414,13 @@ public class StringResourceModel extends LoadableDetachableModel<String> { // Get the string resource, doing any property substitutions as part // of the get operation - String defaultVal = defaultValue != null ? defaultValue.getObject() : null; - value = localizer.getString(getResourceKey(), component, model, defaultVal); - if (value == null) - { - value = defaultVal; - } + 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 - String defaultVal = defaultValue != null ? defaultValue.getObject() : null; - value = localizer.getString(getResourceKey(), component, null, defaultVal); - if (value == null) - { - value = defaultVal; - } + value = localizer.getString(getResourceKey(), component, null, null, null, defaultValue); if (value != null) { // Build the real parameters
