Author: apetrelli
Date: Mon Dec 13 20:03:56 2010
New Revision: 1045351
URL: http://svn.apache.org/viewvc?rev=1045351&view=rev
Log:
TILESSB-38
Fixed tiles-autotag-velocity-runtime checkstyle.
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java
(with props)
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java?rev=1045351&r1=1045350&r2=1045351&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java
Mon Dec 13 20:03:56 2010
@@ -74,6 +74,14 @@ public abstract class BodyDirective exte
return true;
}
+ /**
+ * Executes the directive.
+ *
+ * @param params The parameters.
+ * @param request The request.
+ * @param modelBody The body.
+ * @throws IOException If something goes wrong.
+ */
protected abstract void execute(Map<String, Object> params,
Request request, ModelBody modelBody) throws IOException;
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java?rev=1045351&r1=1045350&r2=1045351&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java
Mon Dec 13 20:03:56 2010
@@ -70,6 +70,13 @@ public abstract class BodylessDirective
return true;
}
+ /**
+ * Executes the directive.
+ *
+ * @param params The parameters.
+ * @param request The request.
+ * @throws IOException If something goes wrong.
+ */
protected abstract void execute(Map<String, Object> params,
Request request) throws IOException;
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java?rev=1045351&r1=1045350&r2=1045351&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
Mon Dec 13 20:03:56 2010
@@ -1,3 +1,23 @@
+/*
+ * $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.autotag.velocity.runtime;
import java.io.IOException;
@@ -7,12 +27,30 @@ import org.apache.tiles.autotag.core.run
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.node.ASTBlock;
+/**
+ * Body abstraction for a Velocity directive body.
+ *
+ * @version $Rev$ $Date$
+ */
public class VelocityModelBody extends AbstractModelBody {
+ /**
+ * The real body.
+ */
private ASTBlock body;
+ /**
+ * The Velocity context.
+ */
private InternalContextAdapter context;
+ /**
+ * Constructor.
+ *
+ * @param context The Velocity context.
+ * @param body The real body.
+ * @param defaultWriter The default writer.
+ */
public VelocityModelBody(InternalContextAdapter context, ASTBlock body,
Writer defaultWriter) {
super(defaultWriter);
this.context = context;
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java?rev=1045351&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java
Mon Dec 13 20:03:56 2010
@@ -0,0 +1,24 @@
+/*
+ * $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.
+ */
+/**
+ * Runtime part of Autotag support for Velocity.
+ */
+package org.apache.tiles.autotag.velocity.runtime;
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java?rev=1045351&r1=1045350&r2=1045351&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java
Mon Dec 13 20:03:56 2010
@@ -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.autotag.velocity.runtime;
@@ -9,9 +26,6 @@ import java.io.IOException;
import java.io.Writer;
import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.parser.node.ASTBlock;
import org.junit.Test;
@@ -25,12 +39,9 @@ public class VelocityModelBodyTest {
/**
* Test method for {...@link
org.apache.tiles.autotag.velocity.runtime.VelocityModelBody#evaluate(java.io.Writer)}.
* @throws IOException If something goes wrong.
- * @throws ParseErrorException If something goes wrong.
- * @throws ResourceNotFoundException If something goes wrong.
- * @throws MethodInvocationException If something goes wrong.
*/
@Test
- public void testEvaluateWriter() throws MethodInvocationException,
ResourceNotFoundException, ParseErrorException, IOException {
+ public void testEvaluateWriter() throws IOException {
InternalContextAdapter internalContextAdapter =
createMock(InternalContextAdapter.class);
ASTBlock body = createMock(ASTBlock.class);
Writer writer = createMock(Writer.class);
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java?rev=1045351&r1=1045350&r2=1045351&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java
Mon Dec 13 20:03:56 2010
@@ -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.autotag.velocity.runtime;
@@ -21,7 +38,7 @@ import org.junit.Test;
public class VelocityUtilTest {
/**
- * Test method for {...@link
org.apache.tiles.autotag.velocity.runtime.VelocityUtil#getParameters(org.apache.velocity.context.InternalContextAdapter,
org.apache.velocity.runtime.parser.node.Node)}.
+ * Test method for {...@link
VelocityUtil#getParameters(InternalContextAdapter, Node)}.
*/
@Test
public void testGetParameters() {
@@ -40,7 +57,7 @@ public class VelocityUtilTest {
}
/**
- * Test method for {...@link
org.apache.tiles.autotag.velocity.runtime.VelocityUtil#getObject(java.lang.Object,
java.lang.Object)}.
+ * Test method for {...@link VelocityUtil#getObject(Object, Object)}.
*/
@Test
public void testGetObject() {
