Author: ivaynberg
Date: Sat Sep 27 01:33:26 2008
New Revision: 699605
URL: http://svn.apache.org/viewvc?rev=699605&view=rev
Log:
WICKET-861
Removed:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/detectSVG.js
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?rev=699605&r1=699604&r2=699605&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
Sat Sep 27 01:33:26 2008
@@ -49,6 +49,7 @@
import org.apache.wicket.IRedirectListener;
import org.apache.wicket.IResourceListener;
import org.apache.wicket.Page;
+import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
@@ -1204,10 +1205,40 @@
component.getClass());
}
+ // manually create the url using default strategy and
format
parameters.put(WebRequestCodingStrategy.INTERFACE_PARAMETER_NAME, pageMapName +
':' +
component.getPath() + ':' + (version == 0 ? ""
: "" + version) + ':' +
Classes.simpleName(clazz) + "::");
+ // see if we can replace our manual listener url with a
properly generated one...
+
+ try
+ {
+ RequestListenerInterface rli =
(RequestListenerInterface)clazz.getField("INTERFACE")
+ .get(clazz);
+
+ String auto =
component.getRequestCycle().urlFor(component, rli).toString();
+ int idx =
auto.indexOf(WebRequestCodingStrategy.INTERFACE_PARAMETER_NAME);
+ if (idx >= 0)
+ {
+ auto = auto.substring(idx +
+
WebRequestCodingStrategy.INTERFACE_PARAMETER_NAME.length() + 1);
+ }
+ idx = auto.indexOf("&");
+ if (idx >= 0)
+ {
+ auto = auto.substring(0, idx);
+ }
+
+
parameters.put(WebRequestCodingStrategy.INTERFACE_PARAMETER_NAME, auto);
+
+ }
+ catch (Exception e)
+ {
+ // noop
+ }
+
+
if (component.isStateless() &&
component.getPage().isBookmarkable())
{
parameters.put(WebRequestCodingStrategy.BOOKMARKABLE_PAGE_PARAMETER_NAME,
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java?rev=699605&r1=699604&r2=699605&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java
Sat Sep 27 01:33:26 2008
@@ -18,7 +18,10 @@
import junit.framework.TestCase;
+import org.apache.wicket.Page;
+import org.apache.wicket.PageParameters;
import org.apache.wicket.request.IRequestCycleProcessor;
+import org.apache.wicket.util.tester.ITestPageSource;
import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.util.tester.WicketTester.DummyWebApplication;
@@ -61,8 +64,8 @@
*/
public void test2()
{
- // @TODO Johan, why does this fail with a NumberException????
- // tester.startPage(new MyPage());
+
+ tester.startPage(new MyPage());
}
/**
@@ -70,17 +73,16 @@
*/
public void test3()
{
- // @TODO Johan, why does this fail with a NumberException????
-// tester.startPage(new ITestPageSource()
-// {
-// private static final long serialVersionUID = 1L;
-//
-// public Page getTestPage()
-// {
-// PageParameters params = new PageParameters();
-// params.add("0", "param");
-// return new MyPage();
-// }
-// });
+ tester.startPage(new ITestPageSource()
+ {
+ private static final long serialVersionUID = 1L;
+
+ public Page getTestPage()
+ {
+ PageParameters params = new PageParameters();
+ params.add("0", "param");
+ return new MyPage();
+ }
+ });
}
}
