svn commit: r1023439 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/protocol/http/request/ test/java/org/apache/wicket/protocol/http/

[mg...@apache.org]

Author: mgrigorov
Date: Sun Oct 17 09:05:30 2010
New Revision: 1023439

URL: http://svn.apache.org/viewvc?rev=1023439&view=rev
Log:
Rename WebExternalResourceRequestTarget to WebExternalResourceRequestHandler to be in sync with all other IResourceHandler impls

Now the only one *RequestTarget is AjaxRequestTarget

Added:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java   (contents, props changed)
      - copied, changed from r1023435, wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java
Removed:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java
Modified:
    wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java

Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java (from r1023435, wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java&r1=1023435&r2=1023439&rev=1023439&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java Sun Oct 17 09:05:30 2010
@@ -37,10 +37,10 @@ import org.slf4j.LoggerFactory;
  * 
  * @author Eelco Hillenius
  */
-public class WebExternalResourceRequestTarget extends ResourceStreamRequestHandler
+public class WebExternalResourceRequestHandler extends ResourceStreamRequestHandler
 {
 	/** log. */
-	private static final Logger log = LoggerFactory.getLogger(WebExternalResourceRequestTarget.class);
+	private static final Logger log = LoggerFactory.getLogger(WebExternalResourceRequestHandler.class);
 
 	/** the relative url of the external resource. */
 	private final String uri;
@@ -51,7 +51,7 @@ public class WebExternalResourceRequestT
 	 * @param uri
 	 *            the relative url of the external resource
 	 */
-	public WebExternalResourceRequestTarget(String uri)
+	public WebExternalResourceRequestHandler(String uri)
 	{
 		super(new WebExternalResourceStream(uri));
 		this.uri = uri;
@@ -82,9 +82,9 @@ public class WebExternalResourceRequestT
 	@Override
 	public boolean equals(Object obj)
 	{
-		if (obj instanceof WebExternalResourceRequestTarget)
+		if (obj instanceof WebExternalResourceRequestHandler)
 		{
-			WebExternalResourceRequestTarget that = (WebExternalResourceRequestTarget)obj;
+			WebExternalResourceRequestHandler that = (WebExternalResourceRequestHandler)obj;
 			return uri.equals(that.uri);
 		}
 		return false;

Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java?rev=1023439&r1=1023438&r2=1023439&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java Sun Oct 17 09:05:30 2010
@@ -23,7 +23,7 @@ import java.io.InputStream;
 import junit.framework.TestCase;
 
 import org.apache.wicket.mock.MockApplication;
-import org.apache.wicket.protocol.http.request.WebExternalResourceRequestTarget;
+import org.apache.wicket.protocol.http.request.WebExternalResourceRequestHandler;
 import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
 import org.apache.wicket.util.io.Streams;
 import org.apache.wicket.util.resource.WebExternalResourceStream;
@@ -69,7 +69,7 @@ public class WebExternalResourceTest ext
 	 */
 	public void testWebExternalResourceRequestTarget() throws Exception
 	{
-		WebExternalResourceRequestTarget rt = new WebExternalResourceRequestTarget("/index.html");
+		WebExternalResourceRequestHandler rt = new WebExternalResourceRequestHandler("/index.html");
 		tester.processRequest(rt);
 		assertTrue(tester.getContentTypeFromResponseHeader().startsWith("text/html"));
 		tester.assertContains("<h1>Hello, World!</h1>");