svn commit: r471443 - /incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java

[jd...@apache.org]

Author: jdonnerstag
Date: Sun Nov  5 07:32:55 2006
New Revision: 471443

URL: http://svn.apache.org/viewvc?view=rev&rev=471443
Log:
cleaned up the markup load listener code

Modified:
    incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java

Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java?view=diff&rev=471443&r1=471442&r2=471443
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java Sun Nov  5 07:32:55 2006
@@ -36,12 +36,12 @@
 import wicket.markup.MarkupCache;
 import wicket.markup.html.image.resource.DefaultButtonImageResourceFactory;
 import wicket.markup.parser.onLoadListener.WicketHeaderMarkupLoadListener;
-import wicket.markup.parser.onLoadListener.WicketMessageLoadListener;
 import wicket.markup.resolver.AutoComponentResolver;
 import wicket.markup.resolver.FragmentResolver;
 import wicket.markup.resolver.MarkupInheritanceResolver;
 import wicket.markup.resolver.ParentResolver;
 import wicket.markup.resolver.WicketLinkResolver;
+import wicket.markup.resolver.WicketMessageResolver;
 import wicket.protocol.http.IRequestLogger;
 import wicket.protocol.http.RequestLogger;
 import wicket.session.ISessionStore;
@@ -724,11 +724,11 @@
 		pageSettings.addComponentResolver(new ParentResolver());
 		pageSettings.addComponentResolver(new MarkupInheritanceResolver());
 		pageSettings.addComponentResolver(new WicketLinkResolver());
+		pageSettings.addComponentResolver(new WicketMessageResolver());
 		pageSettings.addComponentResolver(new FragmentResolver());
 		pageSettings.addComponentResolver(new AutoComponentResolver());
 
 		getMarkupSettings().addMarkupLoadListener(new WicketHeaderMarkupLoadListener());
-		getMarkupSettings().addMarkupLoadListener(new WicketMessageLoadListener());
 
 		// Install button image resource factory
 		getResourceSettings().addResourceFactory("buttonFactory",