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/06/30 20:11:43 UTC
svn commit: r552187 - in /incubator/wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/markup/ test/java/org/apache/wicket/
test/java/org/apache/wicket/ajax/markup/html/componentMap/
test/java/org/apache/wicket/markup/parser/filter/
Author: jdonnerstag
Date: Sat Jun 30 11:11:42 2007
New Revision: 552187
URL: http://svn.apache.org/viewvc?view=rev&rev=552187
Log:
fixed error in DiffUtil (MarkupStream.equalsTo). It failed to compare markup streams with just one MarkupElement.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java?view=diff&rev=552187&r1=552186&r2=552187
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java Sat Jun 30 11:11:42 2007
@@ -153,8 +153,8 @@
while (this.hasMore())
{
// Get an element from each
- final MarkupElement thisElement = this.next();
- final MarkupElement thatElement = that.next();
+ final MarkupElement thisElement = this.get();
+ final MarkupElement thatElement = that.get();
// and if the elements are not equal
if (thisElement != null && thatElement != null)
@@ -174,6 +174,8 @@
return false;
}
}
+ this.next();
+ that.next();
}
// If we've run out of markup elements in b
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html?view=diff&rev=552187&r1=552186&r2=552187
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html Sat Jun 30 11:11:42 2007
@@ -5,4 +5,4 @@
/*-->]^]^>*/</script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-</head>]]></header-contribution><component id="comp0" ><![CDATA[<span wicket:id="comp" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:comp::IBehaviorListener:0', function() { }, function() { });" id="comp0">body</span>]]></component></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><component id="comp0" ><![CDATA[<span wicket:id="comp" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:comp::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));" id="comp0">body</span>]]></component></ajax-response>
\ No newline at end of file
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html?view=diff&rev=552187&r1=552186&r2=552187
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html Sat Jun 30 11:11:42 2007
@@ -5,4 +5,4 @@
/*-->]^]^>*/</script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-</head>]]></header-contribution><component id="linja10" ><![CDATA[<span wicket:id="linja1" id="linja10">1</span>]]></component><evaluate><![CDATA[setTimeout("var wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1:-1:IUnversionedBehaviorListener:0&wicket:ignoreIfNotActive=true', function() { }, function() { });", 2000);]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><component id="linja10" ><![CDATA[<span wicket:id="linja1" id="linja10">1</span>]]></component><evaluate><![CDATA[setTimeout("var wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IBehaviorListener:0:&wicket:ignoreIfNotActive=true', function() { }.bind(this), function() { }.bind(this), function() {var c = Wicket.$('linja10'); return typeof(c) != 'undefined' && c != null});", 2000);]]></evaluate></ajax-response>
\ No newline at end of file
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html?view=diff&rev=552187&r1=552186&r2=552187
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html Sat Jun 30 11:11:42 2007
@@ -16,7 +16,7 @@
<head>
<!-- insert header even though no <wicket:head> is given -->
panel header</head>
-<body onload="function()">
+<body>
<span wicket:id="panel"><wicket:panel>
panel
</wicket:panel></span>