svn commit: r1037902 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/markup/resolver/ test/java/org/apache/wicket/markup/html/basic/ test/java/org/apache/wicket/markup/resolver/

Mon, 22 Nov 2010 13:56:31 -0800 

Author: jdonnerstag
Date: Mon Nov 22 21:54:55 2010
New Revision: 1037902

URL: http://svn.apache.org/viewvc?rev=1037902&view=rev
Log: (empty)

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/resolver/SimplePageExpectedResult_1.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=1037902&r1=1037901&r2=1037902&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
 Mon Nov 22 21:54:55 2010
@@ -72,7 +72,7 @@ import org.slf4j.LoggerFactory;
  * 
  * <pre>
  * add(new Label(&quot;amount&quot;, new 
Model&lt;String&gt;(&quot;$5.00&quot;)));
- * add(new BookmarkablePageLink<Void>(&quot;link&quot;, DetailsPage.class));
+ * add(new BookmarkablePageLink&lt;Void&gt;(&quot;link&quot;, 
DetailsPage.class));
  * </pre>
  * 
  * This will output
@@ -166,6 +166,8 @@ public class WicketMessageResolver imple
        {
                private static final long serialVersionUID = 1L;
 
+               private static final String NOT_FOUND = "[Warning: Property for 
'myKeyNotExsts' not found]";
+
                /**
                 * Construct.
                 * 
@@ -232,6 +234,20 @@ public class WicketMessageResolver imple
                                }
 
                                log.warn("No value found for wicket:message tag 
with key: {}", key);
+
+                               // If open tag was open-close
+                               if (markupStream.hasMore() == false)
+                               {
+                                       getResponse().write(NOT_FOUND);
+                               }
+// else if (markupStream.get() instanceof RawMarkup)
+// {
+// String text = markupStream.get().toString().trim();
+// if (Strings.isEmpty(text))
+// {
+// getResponse().write(NOT_FOUND);
+// }
+// }
                                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=1037902&r1=1037901&r2=1037902&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
 Mon Nov 22 21:54:55 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"></wicket:message>
+  <wicket:message key="myKeyNotExsts">[Warning: Property for 'myKeyNotExsts' 
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/resolver/SimplePageExpectedResult_1.html
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html?rev=1037902&r1=1037901&r2=1037902&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html
 Mon Nov 22 21:54:55 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"></wicket:message>
+  <wicket:message key="myKeyNotExsts">[Warning: Property for 'myKeyNotExsts' 
not found]</wicket:message>
   <wicket:message key="myKey">myValue</wicket:message>
 
   <!-- wicket message with some raw markup -->

Reply via email to