svn commit: r904757 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Jan 30 10:43:45 2010
New Revision: 904757

URL: http://svn.apache.org/viewvc?rev=904757&view=rev
Log:
fixed: FormComponent.MessageSource.getMessage(String) and 
getValidatorKeyPrefix()
Issue: WICKET-2704

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=904757&r1=904756&r2=904757&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
 Sat Jan 30 10:43:45 2010
@@ -175,11 +175,11 @@
                        if (Strings.isEmpty(message))
                        {
                                resource = prefix(prefix, key);
-                               message = getString(localizer, key, 
formComponent);
+                               message = getString(localizer, resource, 
formComponent);
                        }
 
                        // If not found try the most general form [key]
-                       if (Strings.isEmpty(message) && Strings.isEmpty(prefix))
+                       if (Strings.isEmpty(message))
                        {
                                // Try a variation of the resource key
                                message = getString(localizer, key, 
formComponent);