Author: apetrelli
Date: Wed Jan 12 12:22:58 2011
New Revision: 1058106
URL: http://svn.apache.org/viewvc?rev=1058106&view=rev
Log:
TILESSB-38
Fixed tiles-template Checkstyle.
Fixed some checkstyle rules.
Added:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/package-info.java
Removed:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/package.html
Modified:
tiles/maven/trunk/build/tiles_checks_v5.xml
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java
Modified: tiles/maven/trunk/build/tiles_checks_v5.xml
URL:
http://svn.apache.org/viewvc/tiles/maven/trunk/build/tiles_checks_v5.xml?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
--- tiles/maven/trunk/build/tiles_checks_v5.xml (original)
+++ tiles/maven/trunk/build/tiles_checks_v5.xml Wed Jan 12 12:22:58 2011
@@ -46,7 +46,6 @@
<property name="max" value="120"/>
</module>
<module name="MethodLength"/>
- <module name="ParameterNumber"/>
<module name="EmptyForIteratorPad"/>
<module name="NoWhitespaceAfter">
<property name="tokens"
value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
Wed Jan 12 12:22:58 2011
@@ -57,8 +57,9 @@ public class AddAttributeModel {
* @param role A comma-separated list of roles. If present, the attribute
* will be rendered only if the current user belongs to one of the roles.
* @param type The type (renderer) of the attribute.
- * @param request TODO
- * @param modelBody TODO
+ * @param request The request.
+ * @param modelBody The body.
+ * @throws IOException If the body cannot be correctly evaluated.
* @since 2.2.0
*/
public void execute(Object value, String expression, String role,
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
Wed Jan 12 12:22:58 2011
@@ -44,6 +44,14 @@ import org.apache.tiles.request.Request;
*/
public class AddListAttributeModel {
+ /**
+ * Executes the model.
+ *
+ * @param role The comma-separated list of roles that can use the list
attribute.
+ * @param request The request.
+ * @param modelBody The body.
+ * @throws IOException If the body cannot be evaluated.
+ */
public void execute(String role, Request request, ModelBody modelBody)
throws IOException {
Deque<Object> composeStack = ComposeStackUtil.getComposeStack(request);
ListAttribute listAttribute = new ListAttribute();
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
Wed Jan 12 12:22:58 2011
@@ -58,10 +58,8 @@ public class DefinitionModel {
* @param extendsParam The definition name that this definition extends.
* @param preparer The preparer to use to invoke before the definition is
* rendered.
- * @param request TODO
- * @param modelBody TODO
- * @param container The Tiles container to use. It must be "mutable".
- * @param composeStack The compose stack.
+ * @param request The request.
+ * @param modelBody The body.
* @throws IOException If something goes wrong.
* @since 2.2.0
*/
@@ -113,7 +111,7 @@ public class DefinitionModel {
* @param container The container into which the definition will be
* registered.
* @param composeStack The compose stack,
- * @param request TODO
+ * @param request The request.
*/
private void registerDefinition(Definition definition,
MutableTilesContainer container, Deque<Object> composeStack,
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
Wed Jan 12 12:22:58 2011
@@ -96,10 +96,8 @@ public class GetAsStringModel {
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param request TODO
- * @param modelBody TODO
- * @param writer The writer into which the attribute will be written.
- * @param container The Tiles container to use.
+ * @param request The request.
+ * @param modelBody The body.
* @throws IOException If an I/O error happens during rendering.
* @since 2.2.0
*/
@@ -138,7 +136,7 @@ public class GetAsStringModel {
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param request TODO
+ * @param request The request.
* @return The resolved attribute.
*/
private Attribute resolveAttribute(TilesContainer container,
@@ -163,7 +161,7 @@ public class GetAsStringModel {
* @param writer The writer into which the attribute will be written.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
- * @param request TODO
+ * @param request The request.
* @throws IOException If an I/O error happens during rendering.
*/
private void renderAttribute(Attribute attribute, TilesContainer container,
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
Wed Jan 12 12:22:58 2011
@@ -53,6 +53,20 @@ public class ImportAttributeModel {
*/
private Logger log = LoggerFactory.getLogger(getClass());
+ /**
+ * Executes the model.
+ *
+ * @param name The name of the attribute to import. If it is
+ * <code>null</code>, all the attributes will be imported.
+ * @param scope The scope into which the attribute(s) will be imported. If
+ * <code>null</code>, the import will go in page scope.
+ * @param toName The name of the attribute into which the attribute will be
+ * imported. To be used in conjunction to <code>name</code>. If
+ * <code>null</code>, the value of <code>name</code> will be used.
+ * @param ignore If <code>true</code>, if the attribute is not present, the
+ * problem will be ignored.
+ * @param request The request.
+ */
public void execute(String name, String scope, String toName, boolean
ignore, Request request) {
Map<String, Object> attributes = getImportedAttributes(
name, toName, ignore, request);
@@ -71,8 +85,7 @@ public class ImportAttributeModel {
* if <code>name</code> is specified.
* @param ignore If <code>true</code> and the attribute is not found, or an
* exception happens, the problem will be ignored.
- * @param request TODO
- * @param container The Tiles container to use.
+ * @param request The request.
*
* @return A Map of the attributes to be imported: the key is the name of
an
* attribute, the value is the value of that attribute.
@@ -110,7 +123,7 @@ public class ImportAttributeModel {
* @param ignore If <code>true</code> and the attribute is not found, or an
* exception happens, the problem will be ignored.
* @param attributes The map of the attributes to fill.
- * @param request TODO
+ * @param request The request.
*/
private void importSingleAttribute(TilesContainer container,
AttributeContext attributeContext, String name, String toName,
@@ -158,7 +171,7 @@ public class ImportAttributeModel {
* @param attributes The map of the attributes to fill.
* @param ignore If <code>true</code> and the attribute is not found, or an
* exception happens, the problem will be ignored.
- * @param request TODO
+ * @param request The request.
*/
private void importAttributes(Collection<String> names,
TilesContainer container, AttributeContext attributeContext,
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
Wed Jan 12 12:22:58 2011
@@ -107,10 +107,9 @@ public class InsertAttributeModel {
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param flush TODO
- * @param request TODO
- * @param modelBody TODO
- * @param container The Tiles container to use.
+ * @param flush If <code>true</code>, the response will be flushed after
the insert.
+ * @param request The request.
+ * @param modelBody The body.
* @throws IOException If an I/O error happens during rendering.
* @since 2.2.0
*/
@@ -150,7 +149,7 @@ public class InsertAttributeModel {
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param request TODO
+ * @param request The request.
* @return The resolved attribute.
*/
private Attribute resolveAttribute(TilesContainer container,
@@ -173,7 +172,7 @@ public class InsertAttributeModel {
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
* @param attribute The attribute to use, previously resolved.
- * @param request TODO
+ * @param request The request.
*
* @throws IOException If an I/O error happens during rendering.
*/
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
Wed Jan 12 12:22:58 2011
@@ -81,10 +81,9 @@ public class InsertDefinitionModel {
* @param preparer The preparer to use to invoke before the definition is
* rendered. If specified, it overrides the preparer specified in the
* definition itself.
- * @param flush TODO
- * @param request TODO
- * @param modelBody TODO
- * @param container The Tiles container.
+ * @param flush If <code>true</code>, the response will be flushed after
the insert.
+ * @param request The request.
+ * @param modelBody The body.
* @throws IOException If something goes wrong.
* @since 2.2.0
*/
@@ -101,6 +100,24 @@ public class InsertDefinitionModel {
templateExpression, role, preparer, flush, request);
}
+ /**
+ * Renders a definition.
+ *
+ * @param container The container to use.
+ * @param definitionName The name of the definition to render.
+ * @param template If specified, this template will be used instead of the
+ * one used by the definition.
+ * @param templateType The type of the template attribute.
+ * @param templateExpression The expression to evaluate to get the value
of the template.
+ * @param role A comma-separated list of roles. If present, the definition
+ * will be rendered only if the current user belongs to one of the roles.
+ * @param preparer The preparer to use to invoke before the definition is
+ * rendered. If specified, it overrides the preparer specified in the
+ * definition itself.
+ * @param flush If <code>true</code>, the response will be flushed after
the insert.
+ * @param request The request.
+ * @throws IOException If something goes wrong.
+ */
private void renderDefinition(TilesContainer container,
String definitionName, String template, String templateType,
String templateExpression, String role, String preparer,
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
Wed Jan 12 12:22:58 2011
@@ -79,10 +79,9 @@ public class InsertTemplateModel {
* @param preparer The preparer to use to invoke before the definition is
* rendered. If specified, it overrides the preparer specified in the
* definition itself.
- * @param flush TODO
- * @param request TODO
- * @param modelBody TODO
- * @param container The Tiles container.
+ * @param flush If <code>true</code>, the response will be flushed after
the insert.
+ * @param request The request.
+ * @param modelBody The body.
* @throws IOException If something goes wrong.
* @since 2.2.0
*/
@@ -98,6 +97,22 @@ public class InsertTemplateModel {
role, preparer, flush, request);
}
+ /**
+ * Renders a template.
+ *
+ * @param container The container to use.
+ * @param template The template to render.
+ * @param templateType The type of the template attribute.
+ * @param templateExpression The expression to evaluate to get the value
of the template.
+ * @param role A comma-separated list of roles. If present, the template
+ * will be rendered only if the current user belongs to one of the roles.
+ * @param preparer The preparer to use to invoke before the definition is
+ * rendered. If specified, it overrides the preparer specified in the
+ * definition itself.
+ * @param flush If <code>true</code>, the response will be flushed after
the insert.
+ * @param request The request.
+ * @throws IOException If something goes wrong.
+ */
private void renderTemplate(TilesContainer container, String template,
String templateType, String templateExpression, String role,
String preparer, boolean flush, Request request) throws
IOException {
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
Wed Jan 12 12:22:58 2011
@@ -83,10 +83,9 @@ public class PutAttributeModel {
* will be rendered only if the current user belongs to one of the roles.
* @param type The type (renderer) of the attribute.
* @param cascade If <code>true</code> the attribute will be cascaded to
all nested attributes.
- * @param request TODO
- * @param modelBody TODO
- * @param container The Tiles container to use.
- * @param composeStack The composing stack.
+ * @param request The request.
+ * @param modelBody The body.
+ * @throws IOException If the body cannot be evaluated.
* @since 2.2.0
*/
public void execute(@Parameter(required = true) String name, Object value,
@@ -119,7 +118,7 @@ public class PutAttributeModel {
* will be rendered only if the current user belongs to one of the roles.
* @param type The type (renderer) of the attribute.
* @param cascade If <code>true</code> the attribute will be cascaded to
all nested attributes.
- * @param request TODO
+ * @param request The request.
*/
private void putAttributeInParent(Attribute attribute,
TilesContainer container, Deque<Object> composeStack, String name,
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
Wed Jan 12 12:22:58 2011
@@ -49,6 +49,19 @@ import org.apache.tiles.request.Request;
*/
public class PutListAttributeModel {
+ /**
+ * Executes the model.
+ *
+ * @param name The name of the attribute to put.
+ * @param role A comma-separated list of roles. If present, the attribute
+ * will be rendered only if the current user belongs to one of the roles.
+ * @param inherit If <code>true</code>, the list attribute will use, as
first elements, the
+ * list contained in the list attribute, put with the same name, of the
containing definition.
+ * @param cascade If <code>true</code> the attribute will be cascaded to
all nested attributes.
+ * @param request The request.
+ * @param modelBody The body.
+ * @throws IOException If the body cannot be evaluated.
+ */
public void execute(@Parameter(required = true) String name, String role,
boolean inherit, boolean cascade, Request request,
ModelBody modelBody) throws IOException {
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java
Wed Jan 12 12:22:58 2011
@@ -1,10 +1,43 @@
+/*
+ * $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.template;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.Request;
+/**
+ * Selects a container to be used as the "current" container.
+ *
+ * @version $Rev$ $Date$
+ * @since 3.0.0
+ */
public class SetCurrentContainerModel {
+ /**
+ * Executes the model.
+ *
+ * @param containerKey The key of the container to be used as "current". If
+ * <code>null</code>, the default one will be used.
+ * @param request The request.
+ */
public void execute(String containerKey, Request request) {
TilesAccess.setCurrentContainer(request, containerKey);
}
Added:
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/package-info.java?rev=1058106&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/package-info.java
Wed Jan 12 12:22:58 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * 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.
+ */
+/**
+ * Tiles template classes, that enable to write support code for template
languages (JSP, FreeMarker, Velocity).
+ */
+package org.apache.tiles.template;
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
Wed Jan 12 12:22:58 2011
@@ -60,7 +60,7 @@ public class AddListAttributeModelTest {
/**
* Test method for
- * {...@link
org.apache.tiles.template.AddListAttributeModel#execute(String, Request,
org.apache.tiles.autotag.core.runtime.ModelBody)}
+ * {...@link AddListAttributeModel#execute(String, Request, ModelBody)}
* .
* @throws IOException If something goes wrong.
*/
Modified:
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java?rev=1058106&r1=1058105&r2=1058106&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java
Wed Jan 12 12:22:58 2011
@@ -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.template;
@@ -24,7 +41,7 @@ import org.junit.Test;
public class SetCurrentContainerModelTest {
/**
- * Test method for {...@link
org.apache.tiles.template.SetCurrentContainerModel#execute(java.lang.String,
org.apache.tiles.request.Request)}.
+ * Test method for {...@link SetCurrentContainerModel#execute(String,
Request)}.
*/
@Test
public void testSetCurrentContainer() {
@@ -46,9 +63,9 @@ public class SetCurrentContainerModelTes
}
/**
- * Test method for {...@link
org.apache.tiles.template.SetCurrentContainerModel#execute(java.lang.String,
org.apache.tiles.request.Request)}.
+ * Test method for {...@link SetCurrentContainerModel#execute(String,
Request)}.
*/
- @Test(expected=NoSuchContainerException.class)
+ @Test(expected = NoSuchContainerException.class)
public void testSetCurrentContainerException() {
Request request = createMock(Request.class);
ApplicationContext context = createMock(ApplicationContext.class);
