Updated Branches:
  refs/heads/master 3bd454b10 -> 88e81c0d5

WICKET-4608 small optimization for String vars


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/88e81c0d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/88e81c0d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/88e81c0d

Branch: refs/heads/master
Commit: 88e81c0d5ce5f38646551660c8e99477c7fbed38
Parents: 3bd454b
Author: svenmeier <svenme...@apache.org>
Authored: Thu Jan 3 13:10:59 2013 +0100
Committer: svenmeier <svenme...@apache.org>
Committed: Thu Jan 3 13:10:59 2013 +0100

----------------------------------------------------------------------
 .../wicket/markup/html/form/FormComponent.java     |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/88e81c0d/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 558cc1a..401e729 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
@@ -220,6 +220,12 @@ public abstract class FormComponent<T> extends 
LabeledWebMarkupContainer
                                        {
                                                return null;
                                        }
+                                       else if (value instanceof String)
+                                       {
+                                               // small optimization - no need 
to bother with conversion
+                                               // for String vars, e.g. {label}
+                                               return (String)value;
+                                       }
                                        else
                                        {
                                                IConverter converter = 
getConverter(value.getClass());
@@ -1193,7 +1199,7 @@ public abstract class FormComponent<T> extends 
LabeledWebMarkupContainer
         * Override this method to modify the ValidationError object, e.g. add 
a custom variable for
         * message substitution:
         * <p>
-        *
+        * 
         * <pre>
         * new FormComponent&lt;T&gt;(id)
         * {

Reply via email to