Author: pete
Date: Sat Nov 13 11:58:56 2010
New Revision: 1034735
URL: http://svn.apache.org/viewvc?rev=1034735&view=rev
Log:
WICKET-3161: improve naming
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ICookieSavingResponse.java
- copied, changed from r1034731,
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IBufferedWebResponse.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IBufferedWebResponse.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java?rev=1034735&r1=1034734&r2=1034735&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
Sat Nov 13 11:58:56 2010
@@ -36,7 +36,7 @@ import org.apache.wicket.util.lang.Args;
*
* @author Matej Knopp
*/
-public class BufferedWebResponse extends WebResponse implements
IBufferedWebResponse
+public class BufferedWebResponse extends WebResponse implements
ICookieSavingResponse
{
private final transient WebResponse originalResponse;
@@ -47,10 +47,10 @@ public class BufferedWebResponse extends
*/
public BufferedWebResponse(WebResponse originalResponse)
{
- // if original response had some cookies set we should not
forget
- // to transfer them to the current response
- if(originalResponse instanceof IBufferedWebResponse)
- ((IBufferedWebResponse)
originalResponse).transferCookies(this);
+ // if original response eventually had some cookies set
+ // we should transfer them to the current response
+ if(originalResponse instanceof ICookieSavingResponse)
+ ((ICookieSavingResponse)
originalResponse).transferCookies(this);
this.originalResponse = originalResponse;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java?rev=1034735&r1=1034734&r2=1034735&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
Sat Nov 13 11:58:56 2010
@@ -33,7 +33,7 @@ import org.apache.wicket.request.http.We
*
* @author Matej Knopp
*/
-class HeaderBufferingWebResponse extends WebResponse implements
IBufferedWebResponse
+class HeaderBufferingWebResponse extends WebResponse implements
ICookieSavingResponse
{
private final WebResponse originalResponse;
private final BufferedWebResponse bufferedResponse;
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ICookieSavingResponse.java
(from r1034731,
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IBufferedWebResponse.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ICookieSavingResponse.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ICookieSavingResponse.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IBufferedWebResponse.java&r1=1034731&r2=1034735&rev=1034735&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IBufferedWebResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ICookieSavingResponse.java
Sat Nov 13 11:58:56 2010
@@ -18,12 +18,17 @@ package org.apache.wicket.protocol.http;
import org.apache.wicket.request.http.WebResponse;
-public interface IBufferedWebResponse
+/**
+ * any kind of response that is capable of remembering the cookies that were
set
+ * <p/>
+ * this is for example needed to save the cookies during a redirect to buffer
operation
+ */
+public interface ICookieSavingResponse
{
/**
- * transfer cookie operations (add + clear cookie) to given web response
+ * transfer cookies to given web response
*
- * @param webResponse web response that should receive the current
cookie operation
+ * @param webResponse web response that should receive the current
cookies
*/
void transferCookies(WebResponse webResponse);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java?rev=1034735&r1=1034734&r2=1034735&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletResponse.java
Sat Nov 13 11:58:56 2010
@@ -36,7 +36,7 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.protocol.http.IBufferedWebResponse;
+import org.apache.wicket.protocol.http.ICookieSavingResponse;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.value.ValueMap;
@@ -47,7 +47,7 @@ import org.apache.wicket.util.value.Valu
*
* @author Chris Turner
*/
-public class MockHttpServletResponse implements HttpServletResponse,
IBufferedWebResponse
+public class MockHttpServletResponse implements HttpServletResponse,
ICookieSavingResponse
{
private static final int MODE_BINARY = 1;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1034735&r1=1034734&r2=1034735&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Sat Nov 13 11:58:56 2010
@@ -76,7 +76,7 @@ import org.apache.wicket.mock.MockReques
import org.apache.wicket.mock.MockSessionStore;
import org.apache.wicket.page.IPageManager;
import org.apache.wicket.page.IPageManagerContext;
-import org.apache.wicket.protocol.http.IBufferedWebResponse;
+import org.apache.wicket.protocol.http.ICookieSavingResponse;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WicketFilter;
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
@@ -2078,7 +2078,7 @@ public class BaseWicketTester
}
}
- private class WicketTesterServletWebResponse extends ServletWebResponse
implements IBufferedWebResponse
+ private class WicketTesterServletWebResponse extends ServletWebResponse
implements ICookieSavingResponse
{
private List<Cookie> cookies = new ArrayList<Cookie>();
