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/02/21 16:09:33 UTC
svn commit: r1291847 [2/2] - in /tiles/framework/trunk:
tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/
tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/
tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ tiles-paren...
Modified: tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java?rev=1291847&r1=1291846&r2=1291847&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java Tue Feb 21 15:09:30 2012
@@ -315,7 +315,7 @@ public class PortletRequestTest {
@Test
public void testGetNativeScopes() {
assertArrayEquals(new String[] { "request", "portletSession",
- "session", "application" }, req.getNativeScopes());
+ "session", "application" }, req.getNativeScopes().toArray());
}
/**
Modified: tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java?rev=1291847&r1=1291846&r2=1291847&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java Tue Feb 21 15:09:30 2012
@@ -24,6 +24,9 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.Writer;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -53,7 +56,8 @@ public class ServletRequest extends Abst
/**
* The native available scopes: request, session and application.
*/
- private static final String[] SCOPES = {"request", "session", "application"};
+ private static final List<String> SCOPES
+ = Collections.unmodifiableList(Arrays.asList("request", "session", "application"));
/**
* The request object to use.
@@ -179,6 +183,17 @@ public class ServletRequest extends Abst
return request.getParameterMap();
}
+ @Override
+ public Map<String, Object> getContext(String scope) {
+ if("request".equals(scope)){
+ return getRequestScope();
+ }else if("session".equals(scope)){
+ return getSessionScope();
+ }else if("application".equals(scope)){
+ return getApplicationScope();
+ }
+ throw new IllegalArgumentException(scope + " does not exist. Call getAvailableScopes() first to check.");
+ }
/** {@inheritDoc} */
public Map<String, Object> getRequestScope() {
@@ -202,7 +217,7 @@ public class ServletRequest extends Abst
}
@Override
- public String[] getNativeScopes() {
+ public List<String> getNativeScopes() {
return SCOPES;
}
@@ -291,12 +306,10 @@ public class ServletRequest extends Abst
return request.getLocale();
}
- /** {@inheritDoc} */
public HttpServletRequest getRequest() {
return request;
}
- /** {@inheritDoc} */
public HttpServletResponse getResponse() {
return response;
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java?rev=1291847&r1=1291846&r2=1291847&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java Tue Feb 21 15:09:30 2012
@@ -278,7 +278,7 @@ public class ServletRequestTest {
*/
@Test
public void testGetNativeScopes() {
- assertArrayEquals(new String[] {"request", "session", "application"}, req.getNativeScopes());
+ assertArrayEquals(new String[] {"request", "session", "application"}, req.getNativeScopes().toArray());
}
/**
Modified: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java?rev=1291847&r1=1291846&r2=1291847&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java Tue Feb 21 15:09:30 2012
@@ -24,6 +24,8 @@ package org.apache.tiles.request.velocit
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
+import java.util.Collections;
+import java.util.List;
import java.util.Map;
import javax.servlet.RequestDispatcher;
@@ -50,7 +52,7 @@ public class VelocityRequest extends Abs
/**
* The native available scopes, in fact only "page".
*/
- private static final String[] SCOPES = {"page"};
+ private static final List<String> SCOPES = Collections.singletonList("page");
/**
* The Velocity current context.
@@ -103,7 +105,7 @@ public class VelocityRequest extends Abs
}
@Override
- public String[] getNativeScopes() {
+ public List<String> getNativeScopes() {
return SCOPES;
}
@@ -164,4 +166,10 @@ public class VelocityRequest extends Abs
}
return pageScope;
}
+
+ @Override
+ public Map<String, Object> getContext(String scope) {
+ return "page".equals(scope) ? getPageScope() : super.getContext(scope);
+ }
+
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java?rev=1291847&r1=1291846&r2=1291847&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java Tue Feb 21 15:09:30 2012
@@ -98,7 +98,7 @@ public class VelocityRequestTest {
DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext, writer);
- assertArrayEquals(new String[] {"page"}, context.getNativeScopes());
+ assertArrayEquals(new String[] {"page"}, context.getNativeScopes().toArray());
verify(enclosedRequest);
}