Author: ivaynberg
Date: Sat Oct 10 02:16:33 2009
New Revision: 823765
URL: http://svn.apache.org/viewvc?rev=823765&view=rev
Log:
a long overdue refactor make onerror in ajax button and link abstract to force
the user to think of those usecases, hopefuly we can avoid more threads like
this :| http://markmail.org/thread/rc3kwvyxx4oiw73n
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java
Sat Oct 10 02:16:33 2009
@@ -91,6 +91,13 @@
target.addComponent(feedback);
}
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ // update feedback to display errors
+ target.addComponent(feedback);
+ }
+
});
}
}
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
Sat Oct 10 02:16:33 2009
@@ -264,6 +264,11 @@
// add the item
onAdd(item, target);
}
+
+ @Override
+ protected void
onError(AjaxRequestTarget target, Form<?> form)
+ {
+ }
});
add(new AjaxButton("cancel", this)
@@ -273,6 +278,11 @@
{
onCancelTodo(target);
}
+
+ @Override
+ protected void
onError(AjaxRequestTarget target, Form<?> form)
+ {
+ }
});
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
Sat Oct 10 02:16:33 2009
@@ -189,10 +189,6 @@
*
* @param target
* @param form
- *
- * TODO 1.3: Make abstract to be consistent with onSubmit()
*/
- protected void onError(AjaxRequestTarget target, Form<?> form)
- {
- }
+ protected abstract void onError(AjaxRequestTarget target, Form<?> form);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
Sat Oct 10 02:16:33 2009
@@ -179,12 +179,7 @@
*
* @param target
* @param form
- *
- * TODO 1.3: Make abstract to be consistent with onsubmit()
*/
- protected void onError(AjaxRequestTarget target, Form<?> form)
- {
-
- }
+ protected abstract void onError(AjaxRequestTarget target, Form<?> form);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
Sat Oct 10 02:16:33 2009
@@ -78,6 +78,11 @@
{
System.out.println("Ajax ok");
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ }
}).setDefaultFormProcessing(false));
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/MyBorder.java
Sat Oct 10 02:16:33 2009
@@ -44,6 +44,11 @@
{
target.addComponent(form);
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ }
});
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
Sat Oct 10 02:16:33 2009
@@ -126,6 +126,12 @@
formSubmitted = formSubmitted | AJAX;
target.addComponent(form);
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ }
+
});
form3.add(new SubmitLink("submit2")
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java
Sat Oct 10 02:16:33 2009
@@ -66,6 +66,11 @@
{
target.addComponent(this);
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ }
});
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
Sat Oct 10 02:16:33 2009
@@ -71,6 +71,11 @@
assertNotNull(form);
linkClicked = true;
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ }
});
tester.startPage(new ITestPageSource()
@@ -117,6 +122,11 @@
assertNotNull(form);
linkClicked = true;
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ }
};
page.add(link);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_6/LinkPage.java
Sat Oct 10 02:16:33 2009
@@ -118,6 +118,11 @@
{
getRequestCycle().setResponsePage(new
ResultPage("A form label"));
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ }
};
form.add(submit);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java?rev=823765&r1=823764&r2=823765&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
Sat Oct 10 02:16:33 2009
@@ -62,6 +62,11 @@
{
}
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form)
+ {
+ }
});
}
}
