You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/02/07 15:28:24 UTC
wicket git commit: WICKET-5790 VariableInterpolator &
#getThrowExceptionOnMissingResource
Repository: wicket
Updated Branches:
refs/heads/master 5c42e992b -> 1ddb483f0
WICKET-5790 VariableInterpolator & #getThrowExceptionOnMissingResource
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1ddb483f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1ddb483f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1ddb483f
Branch: refs/heads/master
Commit: 1ddb483f0338b41f9b89909f167ce7cb463d2fc8
Parents: 5c42e99
Author: Andrea Del Bene <ad...@apache.org>
Authored: Sat Feb 7 14:56:25 2015 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Sat Feb 7 14:56:25 2015 +0100
----------------------------------------------------------------------
.../wicket/markup/html/form/FormComponent.java | 24 ++++++++------------
1 file changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1ddb483f/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
index 343ed74..88c5350 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
@@ -215,27 +215,21 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme
protected String getValue(String variableName)
{
Object value = vars.get(variableName);
- if (value == null)
+
+ if (value == null ||value instanceof String)
{
- return null;
+ return String.valueOf(value);
}
- else if (value instanceof String)
+
+ IConverter converter = getConverter(value.getClass());
+
+ if (converter == null)
{
- // small optimization - no need to bother with conversion
- // for String vars, e.g. {label}
- return (String)value;
+ return Strings.toString(value);
}
else
{
- IConverter converter = getConverter(value.getClass());
- if (converter == null)
- {
- return Strings.toString(value);
- }
- else
- {
- return converter.convertToString(value, getLocale());
- }
+ return converter.convertToString(value, getLocale());
}
}
}.toString();