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/11/14 15:00:05 UTC
svn commit: r836180 [1/4] - in /tiles/sandbox/trunk:
tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/
tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/
tiles-request/tiles-request-free...
Author: apetrelli
Date: Sat Nov 14 14:00:02 2009
New Revision: 836180
URL: http://svn.apache.org/viewvc?rev=836180&view=rev
Log:
TILESSB-13
Replaced tabs with spaces.
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.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-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtilTest.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/PortletApplicationScopeMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.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-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/package.html
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/package.html
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java Sat Nov 14 14:00:02 2009
@@ -111,7 +111,7 @@
* @return True if equal, else false
*/
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
if (o != null && o instanceof Map.Entry) {
Map.Entry<K, V> entry = (Map.Entry<K, V>) o;
@@ -130,7 +130,7 @@
* @return The and'ed hashcode of the key and value
*/
@Override
- public int hashCode() {
+ public int hashCode() {
return (this.getKey() == null ? 0 : this.getKey().hashCode())
^ (this.getValue() == null ? 0 : this.getValue().hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java Sat Nov 14 14:00:02 2009
@@ -7,24 +7,24 @@
public final class FreeMarkerRequestUtil {
- private FreeMarkerRequestUtil() {
- }
+ private FreeMarkerRequestUtil() {
+ }
- /**
- * Returns the HTTP request hash model.
- *
- * @param env The current FreeMarker environment.
- * @return The request hash model.
- * @since 2.2.0
- */
- public static HttpRequestHashModel getRequestHashModel(Environment env) {
- try {
- return (HttpRequestHashModel) env.getDataModel().get(
- FreemarkerServlet.KEY_REQUEST);
- } catch (TemplateModelException e) {
- throw new NotAvailableFreemarkerServletException(
- "Exception got when obtaining the request hash model", e);
- }
- }
+ /**
+ * Returns the HTTP request hash model.
+ *
+ * @param env The current FreeMarker environment.
+ * @return The request hash model.
+ * @since 2.2.0
+ */
+ public static HttpRequestHashModel getRequestHashModel(Environment env) {
+ try {
+ return (HttpRequestHashModel) env.getDataModel().get(
+ FreemarkerServlet.KEY_REQUEST);
+ } catch (TemplateModelException e) {
+ throw new NotAvailableFreemarkerServletException(
+ "Exception got when obtaining the request hash model", e);
+ }
+ }
}
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=836180&r1=836179&r2=836180&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 Sat Nov 14 14:00:02 2009
@@ -44,90 +44,90 @@
* @since 2.2.0
*/
public class FreeMarkerTilesRequestContext extends TilesRequestContextWrapper
- implements Request {
+ implements Request {
- /**
- * The FreeMarker current environment.
- */
- private Environment env;
-
- /**
- * The request objects.
- */
- private transient Object[] requestObjects;
-
- public static FreeMarkerTilesRequestContext createServletFreemarkerRequest(
- ApplicationContext applicationContext, Environment env) {
- HttpRequestHashModel requestModel = FreeMarkerRequestUtil
- .getRequestHashModel(env);
- HttpServletRequest request = requestModel.getRequest();
- HttpServletResponse response = requestModel.getResponse();
- Request enclosedRequest = new ServletTilesRequestContext(
- applicationContext, (HttpServletRequest) request,
- (HttpServletResponse) response);
- return new FreeMarkerTilesRequestContext(enclosedRequest, env);
- }
-
- /**
- * Constructor.
- *
- * @param enclosedRequest
- * The request that exposes non-FreeMarker specific properties
- * @param env
- * The FreeMarker environment.
- */
- public FreeMarkerTilesRequestContext(Request enclosedRequest,
- Environment env) {
- super(enclosedRequest);
- this.env = env;
- }
-
- /**
- * Returns the environment object.
- *
- * @return The environment.
- * @since 3.0.0
- */
- public Environment getEnvironment() {
- return env;
- }
-
- /** {@inheritDoc} */
- @Override
- public Locale getRequestLocale() {
- return env.getLocale();
- }
-
- /** {@inheritDoc} */
- @Override
- public void dispatch(String path) throws IOException {
- include(path);
- }
-
- /** {@inheritDoc} */
- @Override
- public PrintWriter getPrintWriter() throws IOException {
- Writer writer = env.getOut();
- if (writer instanceof PrintWriter) {
- return (PrintWriter) writer;
- } else {
- return new PrintWriter(writer);
- }
- }
-
- /** {@inheritDoc} */
- @Override
- public Writer getWriter() throws IOException {
- return env.getOut();
- }
-
- /** {@inheritDoc} */
- @Override
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[1];
- requestObjects[0] = env;
- }
- return requestObjects;
- }
+ /**
+ * The FreeMarker current environment.
+ */
+ private Environment env;
+
+ /**
+ * The request objects.
+ */
+ private transient Object[] requestObjects;
+
+ public static FreeMarkerTilesRequestContext createServletFreemarkerRequest(
+ ApplicationContext applicationContext, Environment env) {
+ HttpRequestHashModel requestModel = FreeMarkerRequestUtil
+ .getRequestHashModel(env);
+ HttpServletRequest request = requestModel.getRequest();
+ HttpServletResponse response = requestModel.getResponse();
+ Request enclosedRequest = new ServletTilesRequestContext(
+ applicationContext, (HttpServletRequest) request,
+ (HttpServletResponse) response);
+ return new FreeMarkerTilesRequestContext(enclosedRequest, env);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param enclosedRequest
+ * The request that exposes non-FreeMarker specific properties
+ * @param env
+ * The FreeMarker environment.
+ */
+ public FreeMarkerTilesRequestContext(Request enclosedRequest,
+ Environment env) {
+ super(enclosedRequest);
+ this.env = env;
+ }
+
+ /**
+ * Returns the environment object.
+ *
+ * @return The environment.
+ * @since 3.0.0
+ */
+ public Environment getEnvironment() {
+ return env;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Locale getRequestLocale() {
+ return env.getLocale();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void dispatch(String path) throws IOException {
+ include(path);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public PrintWriter getPrintWriter() throws IOException {
+ Writer writer = env.getOut();
+ if (writer instanceof PrintWriter) {
+ return (PrintWriter) writer;
+ } else {
+ return new PrintWriter(writer);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Writer getWriter() throws IOException {
+ return env.getOut();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Object[] getRequestObjects() {
+ if (requestObjects == null) {
+ requestObjects = new Object[1];
+ requestObjects[0] = env;
+ }
+ return requestObjects;
+ }
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java Sat Nov 14 14:00:02 2009
@@ -3,25 +3,25 @@
import org.apache.tiles.request.NotAvailableFeatureException;
public class NotAvailableFreemarkerServletException extends
- NotAvailableFeatureException {
+ NotAvailableFeatureException {
- public NotAvailableFreemarkerServletException() {
- // TODO Auto-generated constructor stub
- }
-
- public NotAvailableFreemarkerServletException(String message) {
- super(message);
- // TODO Auto-generated constructor stub
- }
-
- public NotAvailableFreemarkerServletException(Throwable e) {
- super(e);
- // TODO Auto-generated constructor stub
- }
-
- public NotAvailableFreemarkerServletException(String message, Throwable e) {
- super(message, e);
- // TODO Auto-generated constructor stub
- }
+ public NotAvailableFreemarkerServletException() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public NotAvailableFreemarkerServletException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public NotAvailableFreemarkerServletException(Throwable e) {
+ super(e);
+ // TODO Auto-generated constructor stub
+ }
+
+ public NotAvailableFreemarkerServletException(String message, Throwable e) {
+ super(message, e);
+ // TODO Auto-generated constructor stub
+ }
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtilTest.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtilTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtilTest.java Sat Nov 14 14:00:02 2009
@@ -65,12 +65,12 @@
expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
}
- /**
- * Test method for {@link org.apache.tiles.freemarker.context.FreeMarkerRequestUtil#getRequestHashModel(freemarker.core.Environment)}.
- * @throws TemplateModelException If something goes wrong.
- */
- @Test
- public void testGetRequestHashModel() throws TemplateModelException {
+ /**
+ * Test method for {@link org.apache.tiles.freemarker.context.FreeMarkerRequestUtil#getRequestHashModel(freemarker.core.Environment)}.
+ * @throws TemplateModelException If something goes wrong.
+ */
+ @Test
+ public void testGetRequestHashModel() throws TemplateModelException {
HttpServletRequest request = createMock(HttpServletRequest.class);
ObjectWrapper objectWrapper = createMock(ObjectWrapper.class);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
@@ -83,6 +83,6 @@
env.setLocale(locale);
assertEquals(requestModel, FreeMarkerRequestUtil.getRequestHashModel(env));
verify(template, model, request, objectWrapper);
- }
+ }
}
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=836180&r1=836179&r2=836180&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 Sat Nov 14 14:00:02 2009
@@ -55,10 +55,10 @@
private Object[] requestObjects;
public static JspTilesRequestContext createServletJspRequest(ApplicationContext applicationContext, PageContext pageContext) {
- return new JspTilesRequestContext(new ServletTilesRequestContext(
- applicationContext, (HttpServletRequest) pageContext
- .getRequest(), (HttpServletResponse) pageContext
- .getResponse()), pageContext);
+ return new JspTilesRequestContext(new ServletTilesRequestContext(
+ applicationContext, (HttpServletRequest) pageContext
+ .getRequest(), (HttpServletResponse) pageContext
+ .getResponse()), pageContext);
}
/**
@@ -81,18 +81,18 @@
* @see org.apache.tiles.request.servlet.ServletTilesRequestContext#dispatch(java.lang.String)
*/
@Override
- public void dispatch(String path) throws IOException {
+ public void dispatch(String path) throws IOException {
include(path);
}
/** {@inheritDoc} */
@Override
- public void include(String path) throws IOException {
+ public void include(String path) throws IOException {
Boolean retValue = Boolean.valueOf(true);
- pageContext
- .setAttribute(
- org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
- retValue, PageContext.REQUEST_SCOPE);
+ pageContext
+ .setAttribute(
+ org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
+ retValue, PageContext.REQUEST_SCOPE);
try {
pageContext.include(path, false);
} catch (ServletException e) {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java Sat Nov 14 14:00:02 2009
@@ -107,7 +107,7 @@
/** {@inheritDoc} */
@Override
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
PortletContext otherContext = ((PortletApplicationScopeMap) o).context;
boolean retValue = true;
synchronized (context) {
@@ -132,7 +132,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (context.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java Sat Nov 14 14:00:02 2009
@@ -99,7 +99,7 @@
/** {@inheritDoc} */
@Override
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
PortletContext otherContext = ((PortletInitParamMap) o).context;
boolean retValue = true;
synchronized (context) {
@@ -124,7 +124,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (context.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java Sat Nov 14 14:00:02 2009
@@ -100,7 +100,7 @@
/** {@inheritDoc} */
@Override
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletParamMap) o).request;
boolean retValue = true;
synchronized (request) {
@@ -125,7 +125,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java Sat Nov 14 14:00:02 2009
@@ -115,7 +115,7 @@
/** {@inheritDoc} */
@Override
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletParamValuesMap) o).request;
boolean retValue = true;
synchronized (request) {
@@ -140,7 +140,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java Sat Nov 14 14:00:02 2009
@@ -107,7 +107,7 @@
/** {@inheritDoc} */
@Override
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletRequestScopeMap) o).request;
boolean retValue = true;
synchronized (request) {
@@ -132,7 +132,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java Sat Nov 14 14:00:02 2009
@@ -108,7 +108,7 @@
/** {@inheritDoc} */
@Override
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
PortletSession otherSession = ((PortletSessionScopeMap) o).session;
boolean retValue = true;
synchronized (session) {
@@ -133,7 +133,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (session.hashCode());
}
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=836180&r1=836179&r2=836180&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 Sat Nov 14 14:00:02 2009
@@ -268,8 +268,8 @@
rd.include((RenderRequest) request,
(RenderResponse) response);
} catch (PortletException e) {
- throw new IOException("PortletException while including path '"
- + path + "'.", e);
+ throw new IOException("PortletException while including path '"
+ + path + "'.", e);
}
}
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java Sat Nov 14 14:00:02 2009
@@ -46,8 +46,8 @@
* @since 2.0.6
*/
public static boolean isForceInclude(PortletRequest request) {
- Boolean retValue = (Boolean) request
- .getAttribute(org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME);
+ Boolean retValue = (Boolean) request
+ .getAttribute(org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME);
return retValue != null && retValue.booleanValue();
}
@@ -62,9 +62,9 @@
public static void setForceInclude(PortletRequest request,
boolean forceInclude) {
Boolean retValue = Boolean.valueOf(forceInclude);
- request
- .setAttribute(
- org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
- retValue);
+ request
+ .setAttribute(
+ org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
+ retValue);
}
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java Sat Nov 14 14:00:02 2009
@@ -109,7 +109,7 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
ServletContext otherContext = ((ServletApplicationScopeMap) o).context;
boolean retValue = true;
@@ -135,7 +135,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (context.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java Sat Nov 14 14:00:02 2009
@@ -108,7 +108,7 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
HttpServletRequest otherRequest = ((ServletHeaderMap) o).request;
boolean retValue = true;
@@ -134,7 +134,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java Sat Nov 14 14:00:02 2009
@@ -117,7 +117,7 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
HttpServletRequest otherRequest = ((ServletHeaderValuesMap) o).request;
boolean retValue = true;
@@ -149,7 +149,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java Sat Nov 14 14:00:02 2009
@@ -100,7 +100,7 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
ServletContext otherContext = ((ServletInitParamMap) o).context;
boolean retValue = true;
@@ -126,7 +126,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (context.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java Sat Nov 14 14:00:02 2009
@@ -101,7 +101,7 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
ServletRequest otherRequest = ((ServletParamMap) o).request;
boolean retValue = true;
@@ -127,7 +127,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java Sat Nov 14 14:00:02 2009
@@ -115,7 +115,7 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
ServletRequest otherRequest = ((ServletParamValuesMap) o).request;
boolean retValue = true;
@@ -141,7 +141,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java Sat Nov 14 14:00:02 2009
@@ -108,7 +108,7 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
ServletRequest otherRequest = ((ServletRequestScopeMap) o).request;
boolean retValue = true;
@@ -134,7 +134,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java Sat Nov 14 14:00:02 2009
@@ -119,7 +119,7 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
boolean retValue = true;
@@ -157,7 +157,7 @@
/** {@inheritDoc} */
@Override
- public int hashCode() {
+ public int hashCode() {
HttpSession session = request.getSession(false);
if (session == null) {
return 0;
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java Sat Nov 14 14:00:02 2009
@@ -34,62 +34,62 @@
*/
public final class ServletUtil {
- /**
- * Name of the attribute used to store the force-include option.
- * @since 2.0.6
- */
- public static final String FORCE_INCLUDE_ATTRIBUTE_NAME =
- "org.apache.tiles.servlet.context.ServletTilesRequestContext.FORCE_INCLUDE";
+ /**
+ * Name of the attribute used to store the force-include option.
+ * @since 2.0.6
+ */
+ public static final String FORCE_INCLUDE_ATTRIBUTE_NAME =
+ "org.apache.tiles.servlet.context.ServletTilesRequestContext.FORCE_INCLUDE";
- /**
- * Wraps a ServletException to create an IOException with the root cause if present.
- *
- * @param ex The exception to wrap.
- * @param message The message of the exception.
- * @return The wrapped exception.
- * @since 2.1.1
- */
- public static IOException wrapServletException(ServletException ex,
- String message) {
- IOException retValue;
- Throwable rootCause = ex.getRootCause();
- if (rootCause != null) {
- // Replace the ServletException with an IOException, with the root
- // cause of the first as the cause of the latter.
- retValue = new IOException(message, rootCause);
- } else {
- retValue = new IOException(message, ex);
- }
+ /**
+ * Wraps a ServletException to create an IOException with the root cause if present.
+ *
+ * @param ex The exception to wrap.
+ * @param message The message of the exception.
+ * @return The wrapped exception.
+ * @since 2.1.1
+ */
+ public static IOException wrapServletException(ServletException ex,
+ String message) {
+ IOException retValue;
+ Throwable rootCause = ex.getRootCause();
+ if (rootCause != null) {
+ // Replace the ServletException with an IOException, with the root
+ // cause of the first as the cause of the latter.
+ retValue = new IOException(message, rootCause);
+ } else {
+ retValue = new IOException(message, ex);
+ }
- return retValue;
- }
+ return retValue;
+ }
- /**
- * Returns true if forced include of the result is needed.
- *
- * @param request The HTTP request.
- * @return If <code>true</code> the include operation must be forced.
- * @since 2.0.6
- */
- public static boolean isForceInclude(HttpServletRequest request) {
- Boolean retValue = (Boolean) request
- .getAttribute(ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME);
- return retValue != null && retValue.booleanValue();
- }
+ /**
+ * Returns true if forced include of the result is needed.
+ *
+ * @param request The HTTP request.
+ * @return If <code>true</code> the include operation must be forced.
+ * @since 2.0.6
+ */
+ public static boolean isForceInclude(HttpServletRequest request) {
+ Boolean retValue = (Boolean) request
+ .getAttribute(ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME);
+ return retValue != null && retValue.booleanValue();
+ }
- /**
- * Sets the option that enables the forced include of the response.
- *
- * @param request The HTTP request.
- * @param forceInclude If <code>true</code> the include operation must be
- * forced.
- * @since 2.0.6
- */
- public static void setForceInclude(HttpServletRequest request,
- boolean forceInclude) {
- Boolean retValue = Boolean.valueOf(forceInclude);
- request.setAttribute(
- ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
- retValue);
- }
+ /**
+ * Sets the option that enables the forced include of the response.
+ *
+ * @param request The HTTP request.
+ * @param forceInclude If <code>true</code> the include operation must be
+ * forced.
+ * @since 2.0.6
+ */
+ public static void setForceInclude(HttpServletRequest request,
+ boolean forceInclude) {
+ Boolean retValue = Boolean.valueOf(forceInclude);
+ request.setAttribute(
+ ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
+ retValue);
+ }
}
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=836180&r1=836179&r2=836180&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 Sat Nov 14 14:00:02 2009
@@ -78,7 +78,7 @@
/** {@inheritDoc} */
@Override
- public void dispatch(String path) throws IOException {
+ public void dispatch(String path) throws IOException {
include(path);
}
@@ -151,13 +151,13 @@
return requestObjects;
}
- public static Request createVelocityRequest(ApplicationContext applicationContext,
- HttpServletRequest request, HttpServletResponse response,
- Context velocityContext, Writer writer) {
- Request servletRequest = new ServletTilesRequestContext(
- applicationContext, request, response);
- Request velocityRequest = new VelocityTilesRequestContext(
- servletRequest, velocityContext, writer);
- return velocityRequest;
- }
+ public static Request createVelocityRequest(ApplicationContext applicationContext,
+ HttpServletRequest request, HttpServletResponse response,
+ Context velocityContext, Writer writer) {
+ Request servletRequest = new ServletTilesRequestContext(
+ applicationContext, request, response);
+ Request velocityRequest = new VelocityTilesRequestContext(
+ servletRequest, velocityContext, writer);
+ return velocityRequest;
+ }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/package.html
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/package.html?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/package.html (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/package.html Sat Nov 14 14:00:02 2009
@@ -198,7 +198,7 @@
<pre>
<plug-in className=&&quot;org.apache.struts.tiles.TilesPlugin&&quot; >
<set-property property=&&quot;definitions-config&&quot;
- value=&&quot;/WEB-INF/tiles-defs.xml,
+ value=&&quot;/WEB-INF/tiles-defs.xml,
/WEB-INF/tiles-tests-defs.xml,/WEB-INF/tiles-tutorial-defs.xml,
/WEB-INF/tiles-examples-defs.xml&&quot; />
<set-property property=&&quot;moduleAware&&quot; value=&&quot;true&&quot; />
@@ -281,20 +281,20 @@
<pre>
<servlet>
<servlet-name>action</servlet-name>
- <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
+ <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
<!-- Tiles Servlet parameter
- Specify configuration file names. There can be several comma
- separated file names
- -->
- <init-param>
+ Specify configuration file names. There can be several comma
+ separated file names
+ -->
+ <init-param>
<param-name>definitions-config</param-name>
<param-value>/WEB-INF/tiles-defs.xml</param-value>
</init-param>
<!-- Tiles Servlet parameter
- Specify if XML parser should validate the Tiles configuration file(s).
- true : validate. DTD should be specified in file header.
- false : no validation
- -->
+ Specify if XML parser should validate the Tiles configuration file(s).
+ true : validate. DTD should be specified in file header.
+ false : no validation
+ -->
<init-param>
<param-name>org.apache.tiles.definition.digester.DigesterDefinitionsReader.PARSER_VALIDATE</param-name>
<param-value>true</param-value>
@@ -314,7 +314,7 @@
<servlet-class>org.apache.struts.tiles.TilesServlet</servlet-class>
- <init-param>
+ <init-param>
<param-name>definitions-config</param-name>
<param-value>/WEB-INF/tiles-defs.xml</param-value>
</init-param>
@@ -349,25 +349,25 @@
<!-- Main page layout used as a root for other page definitions -->
<definition name=&&quot;site.mainLayout&&quot; template=&&quot;/layouts/classicLayout.jsp&&quot;>
- <put name=&&quot;title&&quot; value=&&quot;Tiles Blank Site&&quot; />
- <put name=&&quot;header&&quot; value=&&quot;/tiles/common/header.jsp&&quot; />
- <put name=&&quot;menu&&quot; value=&&quot;site.menu.bar&&quot; />
- <put name=&&quot;footer&&quot; value=&&quot;/tiles/common/footer.jsp&&quot; />
- <put name=&&quot;body&&quot; value=&&quot;/tiles/body.jsp&&quot; />
+ <put name=&&quot;title&&quot; value=&&quot;Tiles Blank Site&&quot; />
+ <put name=&&quot;header&&quot; value=&&quot;/tiles/common/header.jsp&&quot; />
+ <put name=&&quot;menu&&quot; value=&&quot;site.menu.bar&&quot; />
+ <put name=&&quot;footer&&quot; value=&&quot;/tiles/common/footer.jsp&&quot; />
+ <put name=&&quot;body&&quot; value=&&quot;/tiles/body.jsp&&quot; />
</definition>
<!-- ========================================================== -->
<!-- Index page definition -->
<!-- ========================================================== -->
<!-- This definition inherits from the main definition.
- It overloads the page title and the body used.
- Use the same mechanism to define new pages sharing common
- properties (here header, menu, footer, layout)
- -->
+ It overloads the page title and the body used.
+ Use the same mechanism to define new pages sharing common
+ properties (here header, menu, footer, layout)
+ -->
<definition name=&&quot;site.index.page&&quot; extends=&&quot;site.mainLayout&&quot; >
- <put name=&&quot;title&&quot; value=&&quot;Tiles Blank Site Index&&quot; />
- <put name=&&quot;body&&quot; value=&&quot;/tiles/body.jsp&&quot; />
+ <put name=&&quot;title&&quot; value=&&quot;Tiles Blank Site Index&&quot; />
+ <put name=&&quot;body&&quot; value=&&quot;/tiles/body.jsp&&quot; />
</definition>
</tiles-definition>
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java Sat Nov 14 14:00:02 2009
@@ -182,7 +182,7 @@
/** {@inheritDoc} */
@Override
- protected String[] getRegistrations() {
+ protected String[] getRegistrations() {
if (registrations == null) {
registrations = new String[] {
"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN",
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java Sat Nov 14 14:00:02 2009
@@ -34,7 +34,7 @@
/** {@inheritDoc} */
@Override
- protected ViewPreparer createPreparer(String name) {
+ protected ViewPreparer createPreparer(String name) {
ViewPreparer retValue;
if (name.startsWith("/")) {
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd Sat Nov 14 14:00:02 2009
@@ -7,9 +7,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd Sat Nov 14 14:00:02 2009
@@ -7,9 +7,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd Sat Nov 14 14:00:02 2009
@@ -7,9 +7,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml Sat Nov 14 14:00:02 2009
@@ -36,11 +36,11 @@
<!-- Doc index page description -->
<definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
- <put name="title" value="Tiles Library Documentation" />
- <put name="header" value="/common/header.jsp" />
- <put name="menu" value="doc.menu.main" />
- <put name="footer" value="/common/footer.jsp" />
- <put name="body" value="doc.portal.body" />
+ <put name="title" value="Tiles Library Documentation" />
+ <put name="header" value="/common/header.jsp" />
+ <put name="menu" value="doc.menu.main" />
+ <put name="footer" value="/common/footer.jsp" />
+ <put name="body" value="doc.portal.body" />
<put name="bean" value="This is an object" type="string" />
</definition>
@@ -65,7 +65,7 @@
<add value="/doc/portal/revisions.jsp" />
</putList>
</definition>
-
+
<!-- ======================================================= -->
<!-- Menus definitions -->
<!-- ======================================================= -->
@@ -87,11 +87,11 @@
<item value="Home" link="/index.jsp" />
<item value="Live Examples (new)" link="/examples/index.jsp" />
<!--
- <item> <value>Commented Examples</value>
- <link>/examples/index.jsp</link>
- <classtype>org.apache.tiles.beans.SimpleMenuItem</classtype>
- </item>
- -->
+ <item> <value>Commented Examples</value>
+ <link>/examples/index.jsp</link>
+ <classtype>org.apache.tiles.beans.SimpleMenuItem</classtype>
+ </item>
+ -->
<item value="Quick overview" link="/doc/quickOverview.jsp" />
<!--
<item value="Tutorial" link="/doc/tutorial.jsp" />
@@ -101,8 +101,8 @@
<item value="Installation" link="/doc/installation.jsp" />
<item value="User Guide" link="/doc/userGuide.jsp" />
<item value="Javadoc" link="/api/index.html" />
- <item value="Struts Home" link="http://www.apache.org" icon="/images/struts-power.gif"
- classtype="org.apache.tiles.beans.SimpleMenuItem" />
+ <item value="Struts Home" link="http://www.apache.org" icon="/images/struts-power.gif"
+ classtype="org.apache.tiles.beans.SimpleMenuItem" />
</putList>
</definition>
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml Sat Nov 14 14:00:02 2009
@@ -36,11 +36,11 @@
<!-- Doc index page description -->
<definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
- <put-attribute name="title" value="Tiles Library Documentation" />
- <put-attribute name="header" value="/common/header.jsp" />
- <put-attribute name="menu" value="doc.menu.main" />
- <put-attribute name="footer" value="/common/footer.jsp" />
- <put-attribute name="body" value="doc.portal.body" />
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
<put-attribute name="bean" value="This is an object" type="object" />
</definition>
@@ -65,7 +65,7 @@
<add-attribute value="/doc/portal/revisions.jsp" />
</put-list-attribute>
</definition>
-
+
<!-- ======================================================= -->
<!-- Menus definitions -->
<!-- ======================================================= -->
@@ -87,11 +87,11 @@
<item value="Home" link="/index.jsp" />
<item value="Live Examples (new)" link="/examples/index.jsp" />
<!--
- <item> <value>Commented Examples</value>
- <link>/examples/index.jsp</link>
- <classtype>org.apache.tiles.beans.SimpleMenuItem</classtype>
- </item>
- -->
+ <item> <value>Commented Examples</value>
+ <link>/examples/index.jsp</link>
+ <classtype>org.apache.tiles.beans.SimpleMenuItem</classtype>
+ </item>
+ -->
<item value="Quick overview" link="/doc/quickOverview.jsp" />
<!--
<item value="Tutorial" link="/doc/tutorial.jsp" />
@@ -101,8 +101,8 @@
<item value="Installation" link="/doc/installation.jsp" />
<item value="User Guide" link="/doc/userGuide.jsp" />
<item value="Javadoc" link="/api/index.html" />
- <item value="Struts Home" link="http://www.apache.org" icon="/images/struts-power.gif"
- classtype="org.apache.tiles.beans.SimpleMenuItem" />
+ <item value="Struts Home" link="http://www.apache.org" icon="/images/struts-power.gif"
+ classtype="org.apache.tiles.beans.SimpleMenuItem" />
</put-list-attribute>
</definition>
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java Sat Nov 14 14:00:02 2009
@@ -131,7 +131,7 @@
/** {@inheritDoc} */
@Override
- public String toString() {
+ public String toString() {
StringBuffer buff = new StringBuffer("SimpleMenuItem[");
if (getValue() != null) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java Sat Nov 14 14:00:02 2009
@@ -40,11 +40,11 @@
* @since 2.1.0
*/
public class LocaleDefinitionsFactory extends
- UnresolvingLocaleDefinitionsFactory {
+ UnresolvingLocaleDefinitionsFactory {
/** {@inheritDoc} */
@Override
- public Definition getDefinition(String name,
+ public Definition getDefinition(String name,
Request tilesContext) {
Definition retValue;
Locale locale = null;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java Sat Nov 14 14:00:02 2009
@@ -49,8 +49,8 @@
* @since 2.1.0
*/
public abstract class BaseLocaleUrlDefinitionDAO implements
- DefinitionDAO<Locale>, TilesApplicationContextAware, RefreshMonitor,
- URLReader {
+ DefinitionDAO<Locale>, TilesApplicationContextAware, RefreshMonitor,
+ URLReader {
/**
* The logging object.
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java Sat Nov 14 14:00:02 2009
@@ -240,11 +240,11 @@
}
}
- /**
- * Digester rule to manage assignment of an object as an attribute value.
- *
- * @since 3.0.0
- */
+ /**
+ * Digester rule to manage assignment of an object as an attribute value.
+ *
+ * @since 3.0.0
+ */
public static class SetValueToAttributeRule extends Rule {
/** {@inheritDoc} */
@@ -311,8 +311,8 @@
* @since 3.3.0
*/
public void setValidating(boolean validating) {
- digester.setValidating(validating);
- }
+ digester.setValidating(validating);
+ }
/**
* Reads <code>{@link Definition}</code> objects from a source.
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java Sat Nov 14 14:00:02 2009
@@ -66,7 +66,7 @@
/** {@inheritDoc} */
@Override
- protected Map<String, Definition> addDefinitionsAsPatternMatchers(List<DefinitionPatternMatcher> matchers,
+ protected Map<String, Definition> addDefinitionsAsPatternMatchers(List<DefinitionPatternMatcher> matchers,
Map<String, Definition> defsMap) {
Set<String> excludedKeys = new LinkedHashSet<String>();
for (Map.Entry<String, Definition> de : defsMap.entrySet()) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Sat Nov 14 14:00:02 2009
@@ -108,13 +108,13 @@
/** {@inheritDoc} */
public AttributeContext startContext(Request request) {
AttributeContext context = new BasicAttributeContext();
- ArrayStack<AttributeContext> stack = getContextStack(request);
- if (!stack.isEmpty()) {
- AttributeContext parent = stack.peek();
- context.inheritCascadedAttributes(parent);
- }
- stack.push(context);
- return context;
+ ArrayStack<AttributeContext> stack = getContextStack(request);
+ if (!stack.isEmpty()) {
+ AttributeContext parent = stack.peek();
+ context.inheritCascadedAttributes(parent);
+ }
+ stack.push(context);
+ return context;
}
/** {@inheritDoc} */
@@ -150,11 +150,11 @@
/** {@inheritDoc} */
public AttributeContext getAttributeContext(Request request) {
AttributeContext context = getContext(request);
- if (context == null) {
- context = new BasicAttributeContext();
- pushContext(context, request);
- }
- return context;
+ if (context == null) {
+ context = new BasicAttributeContext();
+ pushContext(context, request);
+ }
+ return context;
}
@@ -242,36 +242,36 @@
/** {@inheritDoc} */
public void render(String definitionName, Request request) {
if (log.isDebugEnabled()) {
- log.debug("Render request recieved for definition '" + definitionName + "'");
- }
+ log.debug("Render request recieved for definition '" + definitionName + "'");
+ }
- Definition definition = getDefinition(definitionName, request);
+ Definition definition = getDefinition(definitionName, request);
- if (definition == null) {
- if (log.isWarnEnabled()) {
- String message = "Unable to find the definition '" + definitionName + "'";
- log.warn(message);
- }
- throw new NoSuchDefinitionException(definitionName);
- }
- render(request, definition);
+ if (definition == null) {
+ if (log.isWarnEnabled()) {
+ String message = "Unable to find the definition '" + definitionName + "'";
+ log.warn(message);
+ }
+ throw new NoSuchDefinitionException(definitionName);
+ }
+ render(request, definition);
}
/** {@inheritDoc} */
public void render(Attribute attr, Request request)
throws IOException {
if (attr == null) {
- throw new CannotRenderException("Cannot render a null attribute");
- }
+ throw new CannotRenderException("Cannot render a null attribute");
+ }
- AttributeRenderer renderer = rendererFactory.getRenderer(attr
- .getRenderer());
- if (renderer == null) {
- throw new CannotRenderException(
- "Cannot render an attribute with renderer name "
- + attr.getRenderer());
- }
- renderer.render(attr, request);
+ AttributeRenderer renderer = rendererFactory.getRenderer(attr
+ .getRenderer());
+ if (renderer == null) {
+ throw new CannotRenderException(
+ "Cannot render an attribute with renderer name "
+ + attr.getRenderer());
+ }
+ renderer.render(attr, request);
}
/** {@inheritDoc} */
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java Sat Nov 14 14:00:02 2009
@@ -35,7 +35,7 @@
/** {@inheritDoc} */
@Override
- public void write(Object value, Attribute attribute,
+ public void write(Object value, Attribute attribute,
Request request)
throws IOException {
request.getWriter().write(value.toString());
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd Sat Nov 14 14:00:02 2009
@@ -9,9 +9,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -221,7 +221,7 @@
<!-- The "bean" element describes an element of a list. It create a bean of the
specified java classtype. This bean is initialized with appropriate nested
<set-property>.
--->
+-->
<!ELEMENT bean (set-property*)>
<!ATTLIST bean id ID #IMPLIED>
<!--
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd Sat Nov 14 14:00:02 2009
@@ -9,9 +9,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -110,7 +110,7 @@
<!--
@attr name The unique identifier for this definition. Required when
it is a root definition, while it is implied in nested
- definitions.
+ definitions.
-->
<!ATTLIST definition name %DefinitionName; #IMPLIED>
<!--
@@ -127,13 +127,13 @@
<!ATTLIST definition template %RequestPath; #IMPLIED>
<!--
@attr templateExpression The expression that will evaluate to a template for this definition.
- This attribute will be ignored if template is specified.
-
+ This attribute will be ignored if template is specified.
+
-->
<!ATTLIST definition templateExpression CDATA #IMPLIED>
<!--
@attr templateType The type of the template attribute. Can be: string,
- template or definition.
+ template or definition.
By default, the type is "template". If a type is
associated, the desidered renderer will be invoked.
-->
@@ -163,8 +163,8 @@
<!ATTLIST put-attribute value CDATA #IMPLIED>
<!--
@attr expression The expression associated to this tiles attribute. This
- attribute will be ignored if value is specified.
-
+ attribute will be ignored if value is specified.
+
-->
<!ATTLIST put-attribute expression CDATA #IMPLIED>
<!--
@@ -231,8 +231,8 @@
<!ATTLIST add-attribute value CDATA #IMPLIED>
<!--
@attr expression The expression associated to this tiles attribute. This
- attribute will be ignored if value is specified.
-
+ attribute will be ignored if value is specified.
+
-->
<!ATTLIST add-attribute expression CDATA #IMPLIED>
<!--
@@ -263,7 +263,7 @@
<!-- The "bean" element describes an element of a list. It create a bean of the
specified java classtype. This bean is initialized with appropriate nested
<set-property>.
--->
+-->
<!ELEMENT bean (set-property*)>
<!ATTLIST bean id ID #IMPLIED>
<!--
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml Sat Nov 14 14:00:02 2009
@@ -30,11 +30,11 @@
<tiles-definitions>
<definition name="test.def3" template="/test.jsp">
- <put-attribute name="title" value="Tiles Library Documentation" />
- <put-attribute name="header" value="/common/header.jsp" />
- <put-attribute name="menu" value="doc.menu.main" />
- <put-attribute name="footer" value="/common/footer.jsp" />
- <put-attribute name="body" value="doc.portal.body" />
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<definition name="test.def*.sub*" template="/test{1}.jsp">
<put-attribute name="country" value="default"/>
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml?rev=836180&r1=836179&r2=836180&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml Sat Nov 14 14:00:02 2009
@@ -37,21 +37,21 @@
<!-- This definition will remain the same for all locales -->
<definition name="test.common" template="/test.jsp">
<put-attribute name="country" value="none"/>
- <put-attribute name="title" value="Common Definition" />
- <put-attribute name="header" value="/common/header.jsp" />
- <put-attribute name="menu" value="doc.menu.main" />
- <put-attribute name="footer" value="/common/footer.jsp" />
- <put-attribute name="body" value="doc.portal.body" />
+ <put-attribute name="title" value="Common Definition" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
<put-attribute name="country" value="default"/>
- <put-attribute name="title" value="Tiles Library Documentation" />
- <put-attribute name="header" value="/common/header.jsp" />
- <put-attribute name="menu" value="doc.menu.main" />
- <put-attribute name="footer" value="/common/footer.jsp" />
- <put-attribute name="body" value="doc.portal.body" />
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<!-- This definition will be extended -->