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 2007/05/08 19:50:35 UTC
svn commit: r536274 - in /incubator/wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/markup/parser/filter/
main/java/org/apache/wicket/util/diff/ test/java/org/apache/wicket/markup/
Author: jdonnerstag
Date: Tue May 8 10:50:34 2007
New Revision: 536274
URL: http://svn.apache.org/viewvc?view=rev&rev=536274
Log:
First step in backporting markup fragments
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java?view=diff&rev=536274&r1=536273&r2=536274
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java Tue May 8 10:50:34 2007
@@ -22,7 +22,7 @@
import org.apache.wicket.Application;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.Markup;
+import org.apache.wicket.markup.MarkupResourceData;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.util.value.IValueMap;
@@ -42,7 +42,7 @@
private static final String WICKET_URI = "http://wicket.apache.org";
/** The markup created by reading the markup file */
- private final Markup markup;
+ private final MarkupResourceData markup;
/**
* namespace prefix: e.g. <html
@@ -56,7 +56,7 @@
* @param markup
* The markup created by reading the markup file
*/
- public WicketNamespaceHandler(final Markup markup)
+ public WicketNamespaceHandler(final MarkupResourceData markup)
{
this.markup = markup;
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java?view=diff&rev=536274&r1=536273&r2=536274
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java Tue May 8 10:50:34 2007
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.Markup;
+import org.apache.wicket.markup.MarkupResourceData;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
@@ -47,7 +47,7 @@
private static List wellKnownTagNames;
/** The current markup needed to get the markups namespace */
- private final Markup markup;
+ private final MarkupResourceData markup;
/**
* Construct.
@@ -55,7 +55,7 @@
* @param markup
* The markup as known by now
*/
- public WicketTagIdentifier(final Markup markup)
+ public WicketTagIdentifier(final MarkupResourceData markup)
{
this.markup = markup;
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java?view=diff&rev=536274&r1=536273&r2=536274
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java Tue May 8 10:50:34 2007
@@ -24,8 +24,8 @@
import junit.framework.Assert;
-import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupParser;
+import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.string.StringList;
@@ -175,8 +175,8 @@
try
{
// Parse a and b into markup and compare
- final Markup amarkup = new MarkupParser(a).parse();
- final Markup bmarkup = new MarkupParser(b).parse();
+ final MarkupStream amarkup = new MarkupStream(new MarkupParser(a).parse());
+ final MarkupStream bmarkup = new MarkupStream(new MarkupParser(b).parse());
return amarkup.equalTo(bmarkup);
}
catch (IOException e)
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java?view=diff&rev=536274&r1=536273&r2=536274
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java Tue May 8 10:50:34 2007
@@ -67,9 +67,7 @@
parser.setWicketNamespace("componentName");
final Markup markup = parser.parse();
-
final MarkupStream markupStream = new MarkupStream(markup);
-
final ComponentTag aOpen = (ComponentTag)markupStream.next();
log.info("", aOpen);