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/04/15 23:56:55 UTC
svn commit: r765386 - in /tiles/framework/trunk/tiles-freemarker/src:
main/java/org/apache/tiles/freemarker/
main/java/org/apache/tiles/freemarker/context/
main/java/org/apache/tiles/freemarker/io/
main/java/org/apache/tiles/freemarker/servlet/ main/ja...
Author: apetrelli
Date: Wed Apr 15 21:56:54 2009
New Revision: 765386
URL: http://svn.apache.org/viewvc?rev=765386&view=rev
Log:
TILES-383
Removed trailing spaces and tabs in tiles-freemarker.
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreeMarkerTilesException.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/TilesFMModelRepository.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreeMarkerTilesException.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreeMarkerTilesException.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreeMarkerTilesException.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreeMarkerTilesException.java Wed Apr 15 21:56:54 2009
@@ -25,7 +25,7 @@
/**
* Exception connected to the usage of FreeMarker and Tiles.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -33,7 +33,7 @@
/**
* Constructor.
- *
+ *
* @since 2.2.0
*/
public FreeMarkerTilesException() {
@@ -42,7 +42,7 @@
/**
* Constructor.
- *
+ *
* @param message The message of the exception.
* @since 2.2.0
*/
@@ -52,7 +52,7 @@
/**
* Constructor.
- *
+ *
* @param e The cause of the exception.
* @since 2.2.0
*/
@@ -62,7 +62,7 @@
/**
* Constructor.
- *
+ *
* @param message The message of the exception.
* @param e The cause of the exception.
* @since 2.2.0
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java Wed Apr 15 21:56:54 2009
@@ -33,25 +33,25 @@
/**
* The FreeMarker-specific request context.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
public class FreeMarkerTilesRequestContext extends TilesRequestContextWrapper implements TilesRequestContext {
-
+
/**
* The FreeMarker current environment.
*/
private Environment env;
-
+
/**
* The request objects.
*/
private transient Object[] requestObjects;
-
+
/**
* Constructor.
- *
+ *
* @param enclosedRequest The request that exposes non-FreeMarker specific properties
* @param env The FreeMarker environment.
*/
@@ -60,26 +60,26 @@
super(enclosedRequest);
this.env = env;
}
-
+
/** {@inheritDoc} */
- public void dispatch(String path) throws IOException {
- include(path);
- }
+ public void dispatch(String path) throws IOException {
+ include(path);
+ }
/** {@inheritDoc} */
- public Object getRequest() {
- return env;
- }
+ public Object getRequest() {
+ return env;
+ }
/** {@inheritDoc} */
- public Locale getRequestLocale() {
- return env.getLocale();
- }
+ public Locale getRequestLocale() {
+ return env.getLocale();
+ }
/** {@inheritDoc} */
- public Object getResponse() {
- return env;
- }
+ public Object getResponse() {
+ return env;
+ }
/** {@inheritDoc} */
@Override
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java Wed Apr 15 21:56:54 2009
@@ -40,7 +40,7 @@
/**
* The FreeMarker-specific request context factory.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -51,7 +51,7 @@
* The logging object.
*/
private final Log log = LogFactory.getLog(getClass());
-
+
/**
* Parent Tiles context factory.
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java Wed Apr 15 21:56:54 2009
@@ -46,11 +46,11 @@
/**
* Utilities for FreeMarker usage in Tiles.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class FreeMarkerUtil {
+public final class FreeMarkerUtil {
/**
* The name of the attribute that holds the compose stack.
@@ -65,7 +65,7 @@
/**
* Returns true if forced include of the result is needed.
- *
+ *
* @param env The current FreeMarker environment.
* @return If <code>true</code> the include operation must be forced.
* @since 2.2.0
@@ -77,7 +77,7 @@
/**
* Sets the option that enables the forced include of the response.
- *
+ *
* @param env The current FreeMarker environment.
* @param forceInclude If <code>true</code> the include operation must be
* forced.
@@ -107,7 +107,7 @@
/**
* Sets the current container to use in web pages.
- *
+ *
* @param env The current FreeMarker environment.
* @param key The key under which the container is stored.
* @since 2.2.0
@@ -125,7 +125,7 @@
/**
* Sets the current container to use in web pages.
- *
+ *
* @param env The current FreeMarker environment.
* @param container The container to use as the current container.
* @since 2.2.0
@@ -139,7 +139,7 @@
/**
* Returns the current container that has been set, or the default one.
- *
+ *
* @param env The current FreeMarker environment.
* @return The current Tiles container to use in web pages.
* @since 2.2.0
@@ -152,7 +152,7 @@
/**
* Returns the HTTP request hash model.
- *
+ *
* @param env The current FreeMarker environment.
* @return The request hash model.
* @since 2.2.0
@@ -169,7 +169,7 @@
/**
* Returns the servlet context hash model.
- *
+ *
* @param env The current FreeMarker environment.
* @return The servlet context hash model.
* @since 2.2.0
@@ -188,7 +188,7 @@
/**
* Unwraps a TemplateModel to extract a string.
- *
+ *
* @param model The TemplateModel to unwrap.
* @return The unwrapped string.
* @since 2.2.0
@@ -203,7 +203,7 @@
/**
* Unwraps a TemplateModel to extract a boolean.
- *
+ *
* @param model The TemplateModel to unwrap.
* @param defaultValue If the value is null, this value will be returned.
* @return The unwrapped boolean.
@@ -220,7 +220,7 @@
/**
* Unwraps a TemplateModel to extract an object.
- *
+ *
* @param model The TemplateModel to unwrap.
* @return The unwrapped object.
* @since 2.2.0
@@ -235,11 +235,12 @@
/**
* Sets an attribute in the desired scope.
- *
+ *
* @param env The FreeMarker current environment.
* @param name The name of the attribute.
* @param obj The value of the attribute.
- * @param scope The scope. It can be <code>page</code>, <code>request</code>, <code>session</code>, <code>application</code>.
+ * @param scope The scope. It can be <code>page</code>, <code>request</code>
+ * , <code>session</code>, <code>application</code>.
* @since 2.2.0
*/
public static void setAttribute(Environment env, String name, Object obj,
@@ -265,10 +266,10 @@
.setAttribute(name, obj);
}
}
-
+
/**
* Returns the current compose stack, or creates a new one if not present.
- *
+ *
* @param env The current FreeMarker environment.
* @return The compose stack.
* @since 2.2.0
@@ -287,7 +288,7 @@
/**
* Evaluates the body without rendering it.
- *
+ *
* @param body The body to evaluate.
* @throws TemplateException If something goes wrong during evaluation.
* @throws IOException If something goes wrong during writing the result.
@@ -307,7 +308,7 @@
/**
* Renders the body as a string.
- *
+ *
* @param body The body to render.
* @return The rendered string.
* @throws TemplateException If something goes wrong during evaluation.
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java Wed Apr 15 21:56:54 2009
@@ -26,7 +26,7 @@
/**
* A writer that does not write anything.
- *
+ *
* @version $Rev: 751886 $ $Date: 2009-03-09 23:39:50 +0100 (lun, 09 mar 2009) $
* @since 2.2.0
*/
@@ -49,4 +49,4 @@
public void write(char[] cbuf, int off, int len) throws IOException {
// Does nothing
}
-}
\ No newline at end of file
+}
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java Wed Apr 15 21:56:54 2009
@@ -30,7 +30,7 @@
/**
* Extends FreemarkerServlet to load Tiles directives as a shared variable.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java Wed Apr 15 21:56:54 2009
@@ -38,7 +38,7 @@
* Wraps {@link AddAttributeModel} to be used in FreeMarker. For the list of
* parameters, see {@link AddAttributeModel#start(Stack)} and
* {@link AddAttributeModel#end(Stack, Object, String, String, String, String)}.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -48,10 +48,10 @@
* The template model.
*/
private AddAttributeModel model;
-
+
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java Wed Apr 15 21:56:54 2009
@@ -38,7 +38,7 @@
* Wraps {@link AddListAttributeModel} to be used in FreeMarker. For the list of
* parameters, see {@link AddListAttributeModel#start(Stack, String)} and
* {@link AddListAttributeModel#end(Stack)}.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -48,10 +48,10 @@
* The template model.
*/
private AddListAttributeModel model;
-
+
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java Wed Apr 15 21:56:54 2009
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.util.Map;
-import java.util.Stack;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.mgmt.MutableTilesContainer;
@@ -37,9 +36,9 @@
/**
* Wraps {@link DefinitionModel} to be used in FreeMarker. For the list of
- * parameters, see {@link DefinitionModel#start(Stack, String, String, String, String, String)} and
- * {@link DefinitionModel#end(MutableTilesContainer, Stack, Object...)}.
- *
+ * parameters, see {@link DefinitionModel#start(java.util.Stack, String, String, String, String, String)} and
+ * {@link DefinitionModel#end(MutableTilesContainer, java.util.Stack, Object...)}.
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -49,10 +48,10 @@
* The template model.
*/
private DefinitionModel model;
-
+
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java Wed Apr 15 21:56:54 2009
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.util.Map;
-import java.util.Stack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
@@ -39,11 +38,13 @@
/**
* Wraps {@link GetAsStringModel} to be used in FreeMarker. For the list of
* parameters, see
- * {@link GetAsStringModel#start(Stack, TilesContainer, boolean, String, String, Object, String, String, String, Attribute, Object...)}
+ * {@link GetAsStringModel
+ * #start(java.util.Stack, TilesContainer, boolean, String, String, Object, String, String, String,
+ * Attribute, Object...)}
* and
- * {@link GetAsStringModel#end(Stack, TilesContainer, java.io.Writer, boolean, Object...)}
+ * {@link GetAsStringModel#end(java.util.Stack, TilesContainer, java.io.Writer, boolean, Object...)}
* .
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -56,7 +57,7 @@
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java Wed Apr 15 21:56:54 2009
@@ -39,7 +39,7 @@
* parameters, see
* {@link ImportAttributeModel#getImportedAttributes(TilesContainer, String, String, boolean, Object...)}
* .
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -52,7 +52,7 @@
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java Wed Apr 15 21:56:54 2009
@@ -43,7 +43,7 @@
* and
* {@link InsertAttributeModel#end(Stack, TilesContainer, boolean, Object...)}
* .
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -56,7 +56,7 @@
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java Wed Apr 15 21:56:54 2009
@@ -41,7 +41,7 @@
* and
* {@link InsertDefinitionModel#end(TilesContainer, String, String, String, String, Object...)}
* .
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -54,7 +54,7 @@
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java Wed Apr 15 21:56:54 2009
@@ -41,7 +41,7 @@
* and
* {@link InsertTemplateModel#end(TilesContainer, String, String, String, Object...)}
* .
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -54,7 +54,7 @@
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java Wed Apr 15 21:56:54 2009
@@ -41,7 +41,7 @@
* and
* {@link PutAttributeModel#end(org.apache.tiles.TilesContainer, Stack, String, Object, String, String, String, String, boolean, Object...)}
* .
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -54,7 +54,7 @@
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java Wed Apr 15 21:56:54 2009
@@ -41,7 +41,7 @@
* and
* {@link PutListAttributeModel#end(org.apache.tiles.TilesContainer, Stack, String, boolean, Object...)}
* .
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -51,10 +51,10 @@
* The template model.
*/
private PutListAttributeModel model;
-
+
/**
* Constructor.
- *
+ *
* @param model The template model.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java Wed Apr 15 21:56:54 2009
@@ -35,7 +35,7 @@
/**
* Sets the current container, to be used in Tiles templates. Use the
* "containerKey" parameter to indicate the name of the container to use.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/TilesFMModelRepository.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/TilesFMModelRepository.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/TilesFMModelRepository.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/TilesFMModelRepository.java Wed Apr 15 21:56:54 2009
@@ -36,7 +36,7 @@
/**
* Collects all Tiles FreeMarker directives to be used in an application.
- *
+ *
* @version $Rev$ $Date$
* @since 2.2.0
*/
@@ -99,7 +99,7 @@
/**
* Constructor.
- *
+ *
* @since 2.2.0
*/
public TilesFMModelRepository() {
@@ -123,7 +123,7 @@
}
/**
* Returns the "addAttribute" directive.
- *
+ *
* @return The "addAttribute" directive.
* @since 2.2.0
*/
@@ -133,7 +133,7 @@
/**
* Returns the "addListAttribute" directive.
- *
+ *
* @return The "addListAttribute" directive.
* @since 2.2.0
*/
@@ -143,7 +143,7 @@
/**
* Returns the "definition" directive.
- *
+ *
* @return The "definition" directive.
* @since 2.2.0
*/
@@ -153,7 +153,7 @@
/**
* Returns the "getAsString" directive.
- *
+ *
* @return The "getAsString" directive.
* @since 2.2.0
*/
@@ -163,7 +163,7 @@
/**
* Returns the "importAttribute" directive.
- *
+ *
* @return The "importAttribute" directive.
* @since 2.2.0
*/
@@ -173,7 +173,7 @@
/**
* Returns the "insertAttribute" directive.
- *
+ *
* @return The "insertAttribute" directive.
* @since 2.2.0
*/
@@ -183,7 +183,7 @@
/**
* Returns the "insertDefinition" directive.
- *
+ *
* @return The "insertDefinition" directive.
* @since 2.2.0
*/
@@ -193,7 +193,7 @@
/**
* Returns the "insertTemplate" directive.
- *
+ *
* @return The "insertTemplate" directive.
* @since 2.2.0
*/
@@ -203,7 +203,7 @@
/**
* Returns the "putAttribute" directive.
- *
+ *
* @return The "putAttribute" directive.
* @since 2.2.0
*/
@@ -213,7 +213,7 @@
/**
* Returns the "putListAttribute" directive.
- *
+ *
* @return The "putListAttribute" directive.
* @since 2.2.0
*/
@@ -223,7 +223,7 @@
/**
* Returns the "setCurrentContainer" directive.
- *
+ *
* @return The "setCurrentContainer" directive.
* @since 2.2.0
*/
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java?rev=765386&r1=765385&r2=765386&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/io/NullWriterTest.java Wed Apr 15 21:56:54 2009
@@ -1,5 +1,22 @@
-/**
- *
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.tiles.freemarker.io;
@@ -15,10 +32,14 @@
public class NullWriterTest {
/**
+ * A dummy size.
+ */
+ private static final int DUMMY_SIZE = 15;
+ /**
* The object to test.
*/
private NullWriter writer;
-
+
/**
* @throws java.lang.Exception If something goes wrong.
*/
@@ -33,7 +54,7 @@
*/
@Test
public void testWriteCharArrayIntInt() throws IOException {
- writer.write("Hello there".toCharArray(), 0, 15);
+ writer.write("Hello there".toCharArray(), 0, DUMMY_SIZE);
}
/**