svn commit: r1133847 - /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java

[mgrigorov]

Author: mgrigorov
Date: Thu Jun  9 12:57:04 2011
New Revision: 1133847

URL: http://svn.apache.org/viewvc?rev=1133847&view=rev
Log:
WICKET-3780 Warning text outdated in InheritedMarkupMarkupLoader


Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java?rev=1133847&r1=1133846&r2=1133847&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
 Thu Jun  9 12:57:04 2011
@@ -102,7 +102,7 @@ public class InheritedMarkupMarkupLoader
                                                .getContainerInfo()
                                                .getContainerClass()
                                                .getName() +
-                                       " Enable debug messages for 
org.apache.wicket.util.resource.Resource to get a list of all filenames 
tried.");
+                                       ". Enable debug messages for 
org.apache.wicket.util.resource.locator.ResourceStreamLocator to get a list of 
all filenames tried.");
                }
 
                // Merge base and derived markup
@@ -119,10 +119,12 @@ public class InheritedMarkupMarkupLoader
                final boolean enforceReload)
        {
                // get the base markup
-               Markup baseMarkup = 
Application.get().getMarkupSettings().getMarkupCache().getMarkup(
-                       container,
-                       
markup.getMarkupResourceData().getResource().getMarkupClass().getSuperclass(),
-                       enforceReload);
+               Markup baseMarkup = Application.get()
+                       .getMarkupSettings()
+                       .getMarkupCache()
+                       .getMarkup(container,
+                               
markup.getMarkupResourceData().getResource().getMarkupClass().getSuperclass(),
+                               enforceReload);
 
                return baseMarkup;
        }