You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2006/11/05 16:18:04 UTC

svn commit: r471441 - in /incubator/wicket/trunk/wicket/src/main/java/wicket: Application.java markup/parser/onLoadListener/WicketLinkMarkupLoadListener.java markup/resolver/WicketLinkResolver.java

Author: jdonnerstag
Date: Sun Nov  5 07:18:03 2006
New Revision: 471441

URL: http://svn.apache.org/viewvc?view=rev&rev=471441
Log:
reverted recent change for <wicket:link>

Added:
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/WicketLinkResolver.java
      - copied unchanged from r471402, incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/WicketLinkResolver.java
Removed:
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/onLoadListener/WicketLinkMarkupLoadListener.java
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=471441&r1=471440&r2=471441
==============================================================================
--- 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:18:03 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.WicketLinkMarkupLoadListener;
 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.protocol.http.IRequestLogger;
 import wicket.protocol.http.RequestLogger;
 import wicket.session.ISessionStore;
@@ -719,16 +719,16 @@
 	{
 		settingsAccessible = true;
 		IPageSettings pageSettings = getPageSettings();
-
+		
 		// Install default component resolvers
 		pageSettings.addComponentResolver(new ParentResolver());
 		pageSettings.addComponentResolver(new MarkupInheritanceResolver());
+		pageSettings.addComponentResolver(new WicketLinkResolver());
 		pageSettings.addComponentResolver(new FragmentResolver());
 		pageSettings.addComponentResolver(new AutoComponentResolver());
 
 		getMarkupSettings().addMarkupLoadListener(new WicketHeaderMarkupLoadListener());
 		getMarkupSettings().addMarkupLoadListener(new WicketMessageLoadListener());
-		getMarkupSettings().addMarkupLoadListener(new WicketLinkMarkupLoadListener());
 
 		// Install button image resource factory
 		getResourceSettings().addResourceFactory("buttonFactory",