Author: jdonnerstag
Date: Sat Aug 11 02:08:10 2007
New Revision: 564877
URL: http://svn.apache.org/viewvc?view=rev&rev=564877
Log:
fix an issue with Fragment if the associated tag is open-close and improve the
error message if the provider markup was not found.
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html?view=diff&rev=564877&r1=564876&r2=564877
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html
Sat Aug 11 02:08:10 2007
@@ -3,5 +3,7 @@
<span wicket:id="myPanel1">panel 1</span>
<span wicket:id="myPanel2">panel 2</span>
+
+
</body>
</html>
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html?view=diff&rev=564877&r1=564876&r2=564877
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html
Sat Aug 11 02:08:10 2007
@@ -3,5 +3,7 @@
<span wicket:id="myPanel1">
aaa<span wicket:id="label1">my label text</span>bbb
</span>
+
+
</body>
</html>
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html?view=diff&rev=564877&r1=564876&r2=564877
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html
Sat Aug 11 02:08:10 2007
@@ -3,6 +3,8 @@
<span wicket:id="myPanel"><wicket:panel>
<span wicket:id="myPanel1">panel 1</span>
<span wicket:id="myPanel2">panel 2</span>
+
+
</wicket:panel></span>
</body>
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html?view=diff&rev=564877&r1=564876&r2=564877
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html
Sat Aug 11 02:08:10 2007
@@ -1,5 +1,6 @@
<html xmlns:wicket>
<body>
<span wicket:id="myPanel1">panel 1</span>
- <span wicket:id="myPanel2">panel 2</span></body>
+ <span wicket:id="myPanel2">panel 2</span>
+</body>
</html>
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html?view=diff&rev=564877&r1=564876&r2=564877
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
Sat Aug 11 02:08:10 2007
@@ -10,7 +10,7 @@
<div wicket:id="container">
<div wicket:id="fragment">
- <span wicket:id="fragmentContent" id="fragmentContent0">foo</span>
+ <span wicket:id="fragmentContent" id="fragmentContent1">foo</span>
</div>
</div>
@@ -20,7 +20,7 @@
-<a href="#" wicket:id="ajaxRefresh" onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:provider:ajaxRefresh::IBehaviorListener:0:',
function() { }.bind(this), function() { }.bind(this));return !wcall;"
id="ajaxRefresh1">AJAX refresh</a>
+<a href="#" wicket:id="ajaxRefresh" onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:provider:ajaxRefresh::IBehaviorListener:0:',
function() { }.bind(this), function() { }.bind(this));return !wcall;"
id="ajaxRefresh3">AJAX refresh</a>
</wicket:panel></div>
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java?view=diff&rev=564877&r1=564876&r2=564877
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
Sat Aug 11 02:08:10 2007
@@ -18,7 +18,6 @@
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupException;
-import org.apache.wicket.markup.resolver.FragmentResolver;
/**
@@ -111,7 +110,6 @@
*/
public void testInlinePanel_4() throws Exception
{
-
tester.getApplication().getPageSettings().addComponentResolver(new
FragmentResolver());
executeTest(InlinePanelPage_4.class,
"InlinePanelPageExpectedResult_4.html");
}
@@ -126,7 +124,8 @@
/**
* @throws Exception
*/
- // TODO FIX this test.
+ // TODO FIX the implementation. Fragment markup provider can not be a
+ // sibling of the panel.
// public void testInlinePanel_6() throws Exception
// {
// executeTest(InlinePanelPage_6.class,
"InlinePanelPageExpectedResult_6.html");
