You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/08/09 01:20:38 UTC
svn commit: r1371014 - in /tiles/request/trunk:
tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java
tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
Author: nlebas
Date: Wed Aug 8 23:20:38 2012
New Revision: 1371014
URL: http://svn.apache.org/viewvc?rev=1371014&view=rev
Log:
Removed the (useless) references to DispatchRequestWrapper and deprecated it
Modified:
tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java
tiles/request/trunk/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
Modified: tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java
URL: http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java?rev=1371014&r1=1371013&r2=1371014&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java (original)
+++ tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java Wed Aug 8 23:20:38 2012
@@ -34,8 +34,10 @@ import org.apache.tiles.request.attribut
/**
* Delegate for ease of customization.
*
+ * @deprecated prefer RequestWrapper which is more general in purpose, unless you want to override dispatch() or include().
* @version $Rev: 1215009 $ $Date: 2011-12-16 01:32:31 +0100 (Fri, 16 Dec 2011) $
*/
+@Deprecated
public class DispatchRequestWrapper extends AbstractRequest implements
RequestWrapper {
Modified: tiles/request/trunk/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java?rev=1371014&r1=1371013&r2=1371014&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java (original)
+++ tiles/request/trunk/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java Wed Aug 8 23:20:38 2012
@@ -28,7 +28,7 @@ import javax.servlet.ServletException;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.ApplicationAccess;
-import org.apache.tiles.request.DispatchRequestWrapper;
+import org.apache.tiles.request.RequestWrapper;
import org.apache.tiles.request.Request;
/**
@@ -97,10 +97,10 @@ public final class ServletUtil {
if (currentRequest instanceof ServletRequest) {
return (ServletRequest) currentRequest;
}
- if (!(currentRequest instanceof DispatchRequestWrapper)) {
+ if (!(currentRequest instanceof RequestWrapper)) {
throw new NotAServletEnvironmentException("Not a Servlet environment, not supported");
}
- currentRequest = ((DispatchRequestWrapper) currentRequest).getWrappedRequest();
+ currentRequest = ((RequestWrapper) currentRequest).getWrappedRequest();
}
}