Author: apetrelli
Date: Sun Dec 6 19:43:17 2009
New Revision: 887751
URL: http://svn.apache.org/viewvc?rev=887751&view=rev
Log:
TILESSB-16
Removed almost useless annotation in favour of a method in Request interface.
Removed:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/scope/ScopeOrder.java
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
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-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java?rev=887751&r1=887750&r2=887751&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
Sun Dec 6 19:43:17 2009
@@ -55,6 +55,8 @@
Map<String, Object> getContext(String scope);
+ String[] getNativeScopes();
+
String[] getAvailableScopes();
/**
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=887751&r1=887750&r2=887751&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
Sun Dec 6 19:43:17 2009
@@ -63,10 +63,10 @@
private Set<String> getSpecificScopeSet(Request request) {
Set<String> scopes = class2scopes.get(request.getClass());
if (scopes == null) {
- ScopeOrder order =
request.getClass().getAnnotation(ScopeOrder.class);
scopes = new LinkedHashSet<String>();
- if (order != null) {
- for (String scopeName: order.value()) {
+ String[] nativeScopes = request.getNativeScopes();
+ if (nativeScopes != null) {
+ for (String scopeName: nativeScopes) {
scopes.add(scopeName);
}
}
Modified:
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/TilesRequestContextWrapper.java?rev=887751&r1=887750&r2=887751&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/TilesRequestContextWrapper.java
Sun Dec 6 19:43:17 2009
@@ -81,6 +81,11 @@
}
@Override
+ public String[] getNativeScopes() {
+ return null;
+ }
+
+ @Override
public String[] getAvailableScopes() {
ContextResolver resolver =
ApplicationAccess.getContextResolver(context.getApplicationContext());
return resolver.getAvailableScopes(this);
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java?rev=887751&r1=887750&r2=887751&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
Sun Dec 6 19:43:17 2009
@@ -32,7 +32,6 @@
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.scope.ScopeOrder;
import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.apache.tiles.request.util.TilesRequestContextWrapper;
@@ -45,9 +44,9 @@
* @version $Rev$ $Date$
* @since 2.2.0
*/
-...@scopeorder({"page"})
-public class FreeMarkerTilesRequestContext extends TilesRequestContextWrapper
- implements Request {
+public class FreeMarkerTilesRequestContext extends TilesRequestContextWrapper {
+
+ private static final String[] SCOPES = {"page"};
/**
* The FreeMarker current environment.
@@ -109,6 +108,11 @@
return pageScope;
}
+ @Override
+ public String[] getNativeScopes() {
+ return SCOPES;
+ }
+
/** {...@inheritdoc} */
@Override
public void dispatch(String path) throws IOException {
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java?rev=887751&r1=887750&r2=887751&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
Sun Dec 6 19:43:17 2009
@@ -32,7 +32,6 @@
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.scope.ScopeOrder;
import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.apache.tiles.request.servlet.ServletUtil;
import org.apache.tiles.request.util.TilesRequestContextWrapper;
@@ -43,9 +42,10 @@
*
* @version $Rev$ $Date$
*/
-...@scopeorder({"page", "request", "session", "application"})
public class JspTilesRequestContext extends TilesRequestContextWrapper {
+ private static final String[] SCOPES = {"page", "request", "session",
"application"};
+
/**
* The current page context.
*/
@@ -99,6 +99,11 @@
this.pageContext = pageContext;
}
+ @Override
+ public String[] getNativeScopes() {
+ return SCOPES;
+ }
+
/**
* Dispatches a path. In fact it "includes" it!
*
@@ -113,6 +118,7 @@
/** {...@inheritdoc} */
@Override
+
public void include(String path) throws IOException {
Boolean retValue = Boolean.valueOf(true);
pageContext
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java?rev=887751&r1=887750&r2=887751&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
Sun Dec 6 19:43:17 2009
@@ -39,16 +39,16 @@
import org.apache.tiles.request.AbstractRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.scope.ScopeOrder;
/**
* Portlet-based TilesApplicationContext implementation.
*
* @version $Rev$ $Date$
*/
-...@scopeorder({"request", "portletSession", "session", "application"})
public class PortletTilesRequestContext extends AbstractRequest {
+ private static final String[] SCOPES = {"request", "portletSession",
"session", "application"};
+
/**
* <p>The lazily instantiated <code>Map</code> of header name-value
* combinations (immutable).</p>
@@ -257,8 +257,9 @@
return (portletSessionScope);
}
- public Map<String, Object> getDefaultScope() {
- return getRequestScope();
+ @Override
+ public String[] getNativeScopes() {
+ return SCOPES;
}
/** {...@inheritdoc} */
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java?rev=887751&r1=887750&r2=887751&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java
Sun Dec 6 19:43:17 2009
@@ -34,16 +34,16 @@
import org.apache.tiles.request.AbstractRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.scope.ScopeOrder;
/**
* Servlet-based implementation of the TilesApplicationContext interface.
*
* @version $Rev$ $Date$
*/
-...@scopeorder({"request", "session", "application"})
public class ServletTilesRequestContext extends AbstractRequest {
+ private static final String[] SCOPES = {"request", "session",
"application"};
+
/**
* The request object to use.
*/
@@ -189,8 +189,9 @@
}
- public Map<String, Object> getDefaultScope() {
- return getRequestScope();
+ @Override
+ public String[] getNativeScopes() {
+ return SCOPES;
}
/** {...@inheritdoc} */
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java?rev=887751&r1=887750&r2=887751&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
Sun Dec 6 19:43:17 2009
@@ -33,7 +33,6 @@
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.scope.ScopeOrder;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.apache.tiles.request.servlet.ServletUtil;
@@ -46,9 +45,10 @@
* @version $Rev$ $Date$
* @since 2.2.0
*/
-...@scopeorder({"page"})
public class VelocityTilesRequestContext extends TilesRequestContextWrapper {
+ private static final String[] SCOPES = {"page"};
+
/**
* The Velocity current context.
*/
@@ -81,6 +81,11 @@
this.writer = writer;
}
+ @Override
+ public String[] getNativeScopes() {
+ return SCOPES;
+ }
+
/** {...@inheritdoc} */
@Override
public void dispatch(String path) throws IOException {
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java?rev=887751&r1=887750&r2=887751&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
Sun Dec 6 19:43:17 2009
@@ -151,4 +151,9 @@
public String[] getAvailableScopes() {
return null;
}
+
+ @Override
+ public String[] getNativeScopes() {
+ return null;
+ }
}
