Author: mgrigorov
Date: Tue Nov 23 15:46:23 2010
New Revision: 1038170
URL: http://svn.apache.org/viewvc?rev=1038170&view=rev
Log:
WICKET-2786 WicketMessageResolver: Render warning if
getThrowExceptionOnMissingResource is false like Label does
Use the current key when show the warning message
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=1038170&r1=1038169&r2=1038170&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
Tue Nov 23 15:46:23 2010
@@ -166,7 +166,7 @@ public class WicketMessageResolver imple
{
private static final long serialVersionUID = 1L;
- private static final String NOT_FOUND = "[Warning: Property for
'myKeyNotExsts' not found]";
+ private static final String NOT_FOUND = "[Warning: Property for
'%s' not found]";
/**
* Construct.
@@ -235,17 +235,18 @@ public class WicketMessageResolver imple
log.warn("No value found for wicket:message tag
with key: {}", key);
+ String formatedNotFound =
String.format(NOT_FOUND, key);
// If open tag was open-close
if (markupStream.hasMore() == false)
{
- getResponse().write(NOT_FOUND);
+ getResponse().write(formatedNotFound);
}
// else if (markupStream.get() instanceof RawMarkup)
// {
// String text = markupStream.get().toString().trim();
// if (Strings.isEmpty(text))
// {
-// getResponse().write(NOT_FOUND);
+// getResponse().write(formatedNotFound);
// }
// }
super.onComponentTagBody(markupStream, openTag);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html?rev=1038170&r1=1038169&r2=1038170&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
Tue Nov 23 15:46:23 2010
@@ -2,7 +2,7 @@
<body>
<wicket:message key="myKeyNotExsts">Default Text</wicket:message>
<wicket:message key="myKey">myValue</wicket:message>
- <wicket:message key="myKeyNotExsts">[Warning: Property for 'myKeyNotExsts'
not found]</wicket:message>
+ <wicket:message key="myKeyNotExists">[Warning: Property for 'myKeyNotExists'
not found]</wicket:message>
<wicket:message key="myKey">myValue</wicket:message>
<span wicket:id="message">here it goes</span>
<span wicket:message="attr-name:i18n-key" attr-name="my i18n key">test
2</span>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html?rev=1038170&r1=1038169&r2=1038170&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html
Tue Nov 23 15:46:23 2010
@@ -2,7 +2,7 @@
<body>
<wicket:message key="myKeyNotExsts">Default Text</wicket:message>
<wicket:message key="myKey">Default Text</wicket:message>
- <wicket:message key="myKeyNotExsts"/>
+ <wicket:message key="myKeyNotExists"/>
<wicket:message key="myKey"/>
<span wicket:id="message">test</span>
<span wicket:message="attr-name:i18n-key">test 2</span>
