Author: jbq
Date: Tue Feb 27 15:25:03 2007
New Revision: 512488
URL: http://svn.apache.org/viewvc?view=rev&rev=512488
Log:
Very minor reformat and code sync with 1.x
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/InlineFrame.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/ResourceLink.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/BufferedWebResponse.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/IWebApplicationFactory.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockHttpServletRequest.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockServletContext.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/HrefTest.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/InlineFrame.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/InlineFrame.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/InlineFrame.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/InlineFrame.java
Tue Feb 27 15:25:03 2007
@@ -203,4 +203,4 @@
{
return PageMap.forName(this.pageMapName);
}
-}
\ No newline at end of file
+}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/ResourceLink.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/ResourceLink.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/ResourceLink.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/link/ResourceLink.java
Tue Feb 27 15:25:03 2007
@@ -114,8 +114,8 @@
*/
public final void onResourceRequested()
{
- onClick();
resource.onResourceRequested();
+ onClick();
}
/**
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/BufferedWebResponse.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/BufferedWebResponse.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/BufferedWebResponse.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/BufferedWebResponse.java
Tue Feb 27 15:25:03 2007
@@ -85,7 +85,7 @@
redirectURL = null;
buffer.clear();
}
-
+
/**
* Saves url to redirect to when buffered response is flushed.
* Implementations should encode the URL to make sure cookie-less
operation
@@ -129,7 +129,7 @@
}
}
-
+
/**
*
* @see java.lang.Object#toString()
@@ -139,4 +139,4 @@
{
return buffer.toString();
}
-}
\ No newline at end of file
+}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/IWebApplicationFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/IWebApplicationFactory.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/IWebApplicationFactory.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/IWebApplicationFactory.java
Tue Feb 27 15:25:03 2007
@@ -17,7 +17,7 @@
package wicket.protocol.http;
/**
- * A factory interface used by wicket servlet to create application objects.
+ * A factory interface used by wicket filter to create application objects.
* Configure your webapplication to use this factory in web.xml like:
*
* <pre>
@@ -41,4 +41,4 @@
* @return application object instance
*/
WebApplication createApplication(WicketFilter filter);
-}
\ No newline at end of file
+}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockHttpServletRequest.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockHttpServletRequest.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockHttpServletRequest.java
Tue Feb 27 15:25:03 2007
@@ -54,6 +54,7 @@
import wicket.IRedirectListener;
import wicket.IResourceListener;
import wicket.Page;
+import wicket.WicketRuntimeException;
import wicket.markup.html.form.Form;
import wicket.markup.html.form.FormComponent;
import wicket.markup.html.form.IFormSubmitListener;
@@ -781,6 +782,7 @@
* Get the request url. Always return the path value.
*
* @return The path value
+ * @see javax.servlet.http.HttpServletRequest#getRequestURI()
*/
public String getRequestURI()
{
@@ -1369,7 +1371,8 @@
}
catch (IOException e)
{
- throw new IllegalStateException(e);
+ // NOTE: IllegalStateException(Throwable) only exists
since Java 1.5
+ throw new WicketRuntimeException(e);
}
issb.append(boundary).append("--").append(crlf);
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockServletContext.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockServletContext.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockServletContext.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockServletContext.java
Tue Feb 27 15:25:03 2007
@@ -113,7 +113,7 @@
// Set ServletContext temp dir
setAttribute("javax.servlet.context.tempdir",
createTempDir("wicket" + UUID.randomUUID()));
}
-
+
/**
* Creates a temp directory
*
@@ -163,7 +163,6 @@
return dir;
}
-
/**
* Add an init parameter.
*
@@ -611,4 +610,4 @@
{
attributes.put(name, o);
}
-}
\ No newline at end of file
+}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycle.java
Tue Feb 27 15:25:03 2007
@@ -289,6 +289,4 @@
return super.getRedirect();
}
}
-
-
}
Modified:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/HrefTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/HrefTest.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/HrefTest.java
(original)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/HrefTest.java
Tue Feb 27 15:25:03 2007
@@ -19,7 +19,7 @@
import wicket.WicketTestCase;
/**
- * Simple tester that demonstrates the mock http tester code (and
+ * Simple tester that demonstrates the mock http application code (and
* checks that it is working)
*
* @author Chris Turner
Modified:
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java?view=diff&rev=512488&r1=512487&r2=512488
==============================================================================
---
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java
(original)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java
Tue Feb 27 15:25:03 2007
@@ -46,10 +46,12 @@
*/
public void testIndexedLink() throws Exception
{
- tester.getApplication().mount(new
IndexedParamUrlCodingStrategy("/test1",
- BookmarkableHomePageLinksPage.class, null));
- tester.getApplication().mount(new
IndexedParamUrlCodingStrategy("/test2",
- BookmarkableHomePageLinksPage.class,
"mypagemap"));
+ tester.getApplication().mount(
+ new IndexedParamUrlCodingStrategy("/test1",
BookmarkableHomePageLinksPage.class,
+ null));
+ tester.getApplication().mount(
+ new IndexedParamUrlCodingStrategy("/test2",
BookmarkableHomePageLinksPage.class,
+ "mypagemap"));
tester.setupRequestAndResponse();
WebRequestCycle cycle = tester.createRequestCycle();
@@ -61,11 +63,13 @@
String url1 = cycle.urlFor(
new
BookmarkablePageRequestTarget(BookmarkableHomePageLinksPage.class, parameters))
.toString();
- assertEquals(url1,
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/test1/Integer0/Integer1");
+ assertEquals(url1,
+
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/test1/Integer0/Integer1");
String url2 = cycle.urlFor(
new BookmarkablePageRequestTarget("mypagemap",
BookmarkableHomePageLinksPage.class,
parameters)).toString();
- assertEquals(url2,
+ assertEquals(
+ url2,
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/test2/Integer0/Integer1/wicket:pageMapName/mypagemap");
tester.setupRequestAndResponse();
@@ -96,7 +100,7 @@
if (target2 instanceof BookmarkablePageRequestTarget)
{
-
assertEquals(((BookmarkablePageRequestTarget)target2).getPageMapName(),
"mypagemap");
+ assertEquals("mypagemap",
((BookmarkablePageRequestTarget)target2).getPageMapName());
}
else
{
