You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/10/21 08:56:14 UTC
svn commit: r1025854 - in
/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal:
ModalContent1Page.java ModalWindowPage.java
Author: ivaynberg
Date: Thu Oct 21 06:56:13 2010
New Revision: 1025854
URL: http://svn.apache.org/viewvc?rev=1025854&view=rev
Log:
WICKET-3114 fix example. do not pass a page instance to another page, instead use page reference
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java?rev=1025854&r1=1025853&r2=1025854&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java Thu Oct 21 06:56:13 2010
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.ajax.builtin.modal;
import org.apache.wicket.Page;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
@@ -36,7 +37,7 @@ public class ModalContent1Page extends W
* @param modalWindowPage
* @param window
*/
- public ModalContent1Page(final ModalWindowPage modalWindowPage, final ModalWindow window)
+ public ModalContent1Page(final PageReference modalWindowPage, final ModalWindow window)
{
add(new AjaxLink<Void>("closeOK")
{
@@ -44,7 +45,7 @@ public class ModalContent1Page extends W
public void onClick(AjaxRequestTarget target)
{
if (modalWindowPage != null)
- modalWindowPage.setResult("Modal window 1 - close link OK");
+ ((ModalWindowPage)modalWindowPage.getPage()).setResult("Modal window 1 - close link OK");
window.close(target);
}
});
@@ -55,7 +56,7 @@ public class ModalContent1Page extends W
public void onClick(AjaxRequestTarget target)
{
if (modalWindowPage != null)
- modalWindowPage.setResult("Modal window 1 - close link Cancel");
+ ((ModalWindowPage)modalWindowPage.getPage()).setResult("Modal window 1 - close link Cancel");
window.close(target);
}
});
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java?rev=1025854&r1=1025853&r2=1025854&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalWindowPage.java Thu Oct 21 06:56:13 2010
@@ -52,7 +52,7 @@ public class ModalWindowPage extends Bas
{
public Page createPage()
{
- return new ModalContent1Page(ModalWindowPage.this, modal1);
+ return new ModalContent1Page(ModalWindowPage.this.getPageReference(), modal1);
}
});
modal1.setWindowClosedCallback(new ModalWindow.WindowClosedCallback()