You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/12/22 21:14:35 UTC
svn commit: r893302 - in /tiles/sandbox/trunk: tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/scope/ tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ tiles-request/tiles-request-freemarker/src/main/ja...

Author: apetrelli
Date: Tue Dec 22 20:14:32 2009
New Revision: 893302

URL: http://svn.apache.org/viewvc?rev=893302&view=rev
Log:
TILESSB-18
Refactored other names of request classes.

Added:
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextWrapper.java
      - copied, changed from r892972, tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/RequestWrapper.java
      - copied, changed from r892972, tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java
Removed:
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java
Modified:
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/scope/ReflectionContextResolver.java
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
    tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
    tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/scope/ReflectionContextResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/scope/ReflectionContextResolver.java?rev=893302&r1=893301&r2=893302&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/scope/ReflectionContextResolver.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/scope/ReflectionContextResolver.java Tue Dec 22 20:14:32 2009
@@ -9,7 +9,7 @@
 import java.util.Set;
 
 import org.apache.tiles.request.Request;
-import org.apache.tiles.request.util.TilesRequestContextWrapper;
+import org.apache.tiles.request.util.RequestWrapper;
 
 public class ReflectionContextResolver implements ContextResolver {
 
@@ -24,8 +24,8 @@
         try {
             method = request.getClass().getMethod(methodName);
         } catch (NoSuchMethodException e) {
-            if (request instanceof TilesRequestContextWrapper) {
-                TilesRequestContextWrapper wrapper = (TilesRequestContextWrapper) request;
+            if (request instanceof RequestWrapper) {
+                RequestWrapper wrapper = (RequestWrapper) request;
                 return getContext(wrapper.getWrappedRequest(), scope);
             }
             throw new NoSuchScopeException("No accessor method for '" + scope
@@ -49,8 +49,8 @@
         boolean finished = false;
         do {
             scopes.addAll(getSpecificScopeSet(request));
-            if (request instanceof TilesRequestContextWrapper) {
-                request = ((TilesRequestContextWrapper) request)
+            if (request instanceof RequestWrapper) {
+                request = ((RequestWrapper) request)
                         .getWrappedRequest();
             } else {
                 finished = true;

Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextWrapper.java (from r892972, tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextWrapper.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextWrapper.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java&r1=892972&r2=893302&rev=893302&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextWrapper.java Tue Dec 22 20:14:32 2009
@@ -33,7 +33,7 @@
  * @since Tiles 2.1.1
  * @version $Rev$ $Date$
  */
-public class TilesApplicationContextWrapper implements ApplicationContext {
+public class ApplicationContextWrapper implements ApplicationContext {
 
     /**
      * The original context.
@@ -45,7 +45,7 @@
      *
      * @param context The original context.
      */
-    public TilesApplicationContextWrapper(ApplicationContext context) {
+    public ApplicationContextWrapper(ApplicationContext context) {
         this.context = context;
     }
 

Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/RequestWrapper.java (from r892972, tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/RequestWrapper.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/RequestWrapper.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java&r1=892972&r2=893302&rev=893302&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/RequestWrapper.java Tue Dec 22 20:14:32 2009
@@ -37,7 +37,7 @@
  * @since Tiles 2.0
  * @version $Rev$ $Date$
  */
-public class TilesRequestContextWrapper implements Request {
+public class RequestWrapper implements Request {
 
     /**
      * The wrapper request context object.
@@ -50,7 +50,7 @@
      *
      * @param context The request context to wrap.
      */
-    public TilesRequestContextWrapper(Request context) {
+    public RequestWrapper(Request context) {
         this.context = context;
     }
 

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java?rev=893302&r1=893301&r2=893302&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java Tue Dec 22 20:14:32 2009
@@ -33,7 +33,7 @@
 import org.apache.tiles.request.ApplicationContext;
 import org.apache.tiles.request.Request;
 import org.apache.tiles.request.servlet.ServletRequest;
-import org.apache.tiles.request.util.TilesRequestContextWrapper;
+import org.apache.tiles.request.util.RequestWrapper;
 
 import freemarker.core.Environment;
 import freemarker.ext.servlet.HttpRequestHashModel;
@@ -44,7 +44,7 @@
  * @version $Rev$ $Date$
  * @since 2.2.0
  */
-public class FreemarkerRequest extends TilesRequestContextWrapper {
+public class FreemarkerRequest extends RequestWrapper {
 
 	private static final String[] SCOPES = {"page"};
 

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java?rev=893302&r1=893301&r2=893302&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java Tue Dec 22 20:14:32 2009
@@ -34,7 +34,7 @@
 import org.apache.tiles.request.Request;
 import org.apache.tiles.request.servlet.ServletRequest;
 import org.apache.tiles.request.servlet.ServletUtil;
-import org.apache.tiles.request.util.TilesRequestContextWrapper;
+import org.apache.tiles.request.util.RequestWrapper;
 
 /**
  * Context implementation used for executing tiles within a
@@ -42,7 +42,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class JspRequest extends TilesRequestContextWrapper {
+public class JspRequest extends RequestWrapper {
 
 	private static final String[] SCOPES = {"page", "request", "session", "application"};
 

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java?rev=893302&r1=893301&r2=893302&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java Tue Dec 22 20:14:32 2009
@@ -36,7 +36,7 @@
 import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
 import org.apache.tiles.request.servlet.ServletRequest;
 import org.apache.tiles.request.servlet.ServletUtil;
-import org.apache.tiles.request.util.TilesRequestContextWrapper;
+import org.apache.tiles.request.util.RequestWrapper;
 import org.apache.velocity.context.Context;
 
 /**
@@ -45,7 +45,7 @@
  * @version $Rev$ $Date$
  * @since 2.2.0
  */
-public class VelocityRequest extends TilesRequestContextWrapper {
+public class VelocityRequest extends RequestWrapper {
 
 	private static final String[] SCOPES = {"page"};
 

Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java?rev=893302&r1=893301&r2=893302&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java Tue Dec 22 20:14:32 2009
@@ -29,7 +29,7 @@
 import org.apache.tiles.request.servlet.NotAServletEnvironmentException;
 import org.apache.tiles.request.servlet.ServletApplicationContext;
 import org.apache.tiles.request.servlet.ServletRequest;
-import org.apache.tiles.request.util.TilesRequestContextWrapper;
+import org.apache.tiles.request.util.RequestWrapper;
 
 
 /**
@@ -65,10 +65,10 @@
             if (currentRequest instanceof ServletRequest) {
                 return (ServletRequest) currentRequest;
             }
-            if (!(currentRequest instanceof TilesRequestContextWrapper)) {
+            if (!(currentRequest instanceof RequestWrapper)) {
                 throw new NotAServletEnvironmentException("Not a Servlet environment, not supported");
             }
-            currentRequest = ((TilesRequestContextWrapper) currentRequest).getWrappedRequest();
+            currentRequest = ((RequestWrapper) currentRequest).getWrappedRequest();
         }
     }