svn commit: r492065 - in /incubator/wicket/trunk/wicket/src/main/java/wicket/markup: MarkupCache.java loader/DefaultMarkupLoader.java

[jdonnerstag]

Author: jdonnerstag
Date: Tue Jan  2 23:24:22 2007
New Revision: 492065

URL: http://svn.apache.org/viewvc?view=rev&rev=492065
Log:
fixed DefaultMarkupLoader issue

Modified:
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java
    
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java

Modified: 
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java?view=diff&rev=492065&r1=492064&r2=492065
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java 
(original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java 
Tue Jan  2 23:24:22 2007
@@ -409,7 +409,7 @@
         */
        protected IMarkupLoader newMarkupLoader()
        {
-               return new DefaultMarkupLoader(application);
+               return new DefaultMarkupLoader();
        }
 
        /**

Modified: 
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java?view=diff&rev=492065&r1=492064&r2=492065
==============================================================================
--- 
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java
 (original)
+++ 
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java
 Tue Jan  2 23:24:22 2007
@@ -25,38 +25,36 @@
 import wicket.util.resource.ResourceStreamNotFoundException;
 
 /**
- * Load the markup via the MarkupParser, not more, not less. Caching is 
provided
- * separately as well as Inherited-Markup merging.
+ * Reading and parsing the markup resource file is just one task while loading
+ * the whole markup associated with a component. E.g. markup inheritance
+ * requires to merge two markup files.
  * 
  * @author Juergen Donnerstag
  */
-public class DefaultMarkupLoader implements IMarkupLoader
+public class DefaultMarkupLoader extends AbstractMarkupLoader
 {
-       /** The Wicket application */
-       private final Application application;
-
        /**
         * Constructor.
-        * 
-        * @param application
         */
-       public DefaultMarkupLoader(final Application application)
+       public DefaultMarkupLoader()
        {
-               this.application = application;
        }
 
        /**
         * @see 
wicket.markup.loader.IMarkupLoader#loadMarkup(wicket.MarkupContainer,
         *      wicket.markup.MarkupResourceStream)
         */
+       @Override
        public final MarkupFragment loadMarkup(final MarkupContainer container,
                        final MarkupResourceStream markupResourceStream) throws 
IOException,
                        ResourceStreamNotFoundException
        {
-               // read and parse the markup
-               MarkupFragment markup = 
application.getMarkupSettings().getMarkupParserFactory()
-                               
.newMarkupParser(markupResourceStream).readAndParse();
+               final Application application = Application.get();
+
+               IMarkupLoader loader = new 
InheritedMarkupMarkupLoader(application)
+                               .setParent(new 
HeaderCleanupMarkupLoader(application)
+                                               .setParent(new 
BaseMarkupLoader()));
 
-               return markup;
+               return loader.loadMarkup(container, markupResourceStream);
        }
 }