Author: almaw
Date: Tue Jul 24 10:04:58 2007
New Revision: 559109
URL: http://svn.apache.org/viewvc?view=rev&rev=559109
Log:
Let us override wicket:message values to empty strings.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?view=diff&rev=559109&r1=559108&r2=559109
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
Tue Jul 24 10:04:58 2007
@@ -82,14 +82,21 @@
"Wrong format of
<wicket:message key='xxx'>: attribute 'key' is missing");
}
+ // If the key can't be resolved and the default
is null, an
+ // exception will be thrown. Instead, we
default to a unique
+ // string and check against this later. Don't
just use an empty
+ // string here, as people might want to
override wicket:messages
+ // to empty strings.
+ final String defaultValue =
"DEFAULT_WICKET_MESSAGE_RESOLVER_VALUE";
+
final String value =
container.getApplication().getResourceSettings()
-
.getLocalizer().getString(messageKey, container, "");
+
.getLocalizer().getString(messageKey, container, defaultValue);
final String id = "_message_" +
container.getPage().getAutoIndex();
Component component = null;
- if ((value != null) && (value.trim().length() >
0))
+ if (value != null &&
!defaultValue.equals(value))
{
- component = new MyLabel(id, value);
+ component = new MyLabel(id,
value.trim());
}
else
{
