Author: apetrelli
Date: Mon Dec 13 19:28:37 2010
New Revision: 1045329
URL: http://svn.apache.org/viewvc?rev=1045329&view=rev
Log:
TILESSB-38
Fixed tiles-autotag-freemarker-runtime checkstyle.
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java
(with props)
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModelTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModelTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java
Mon Dec 13 19:28:37 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.freemarker.runtime;
import java.io.IOException;
@@ -13,6 +33,11 @@ import freemarker.template.TemplateDirec
import freemarker.template.TemplateDirectiveModel;
import freemarker.template.TemplateModel;
+/**
+ * Base directive model for models with a body.
+ *
+ * @version $Rev$ $Date$
+ */
public abstract class BodyFMModel implements TemplateDirectiveModel {
@SuppressWarnings("unchecked")
@@ -25,6 +50,14 @@ public abstract class BodyFMModel implem
execute(params, request, modelBody);
}
+ /**
+ * Executes the model.
+ *
+ * @param parms Parameters.
+ * @param request The request.
+ * @param modelBody The body.
+ * @throws IOException If something goes wrong.
+ */
protected abstract void execute(Map<String, TemplateModel> parms,
Request request, ModelBody modelBody) throws IOException;
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java
Mon Dec 13 19:28:37 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.freemarker.runtime;
import java.io.IOException;
@@ -12,6 +32,11 @@ import freemarker.template.TemplateDirec
import freemarker.template.TemplateDirectiveModel;
import freemarker.template.TemplateModel;
+/**
+ * Base directive model for models with a body.
+ *
+ * @version $Rev$ $Date$
+ */
public abstract class BodylessFMModel implements TemplateDirectiveModel {
@SuppressWarnings("unchecked")
@@ -23,6 +48,13 @@ public abstract class BodylessFMModel im
execute(params, request);
}
+ /**
+ * Executes the model.
+ *
+ * @param parms Parameters.
+ * @param request The request.
+ * @throws IOException If something goes wrong.
+ */
protected abstract void execute(Map<String, TemplateModel> parms,
Request request) throws IOException;
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
Mon Dec 13 19:28:37 2010
@@ -1,18 +1,62 @@
+/*
+ * $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.freemarker.runtime;
+/**
+ * Thrown when a Freemarker problem under Autotag runtime part happens.
+ *
+ * @version $Rev$ $Date$
+ */
public class FreemarkerAutotagException extends RuntimeException {
+ /**
+ * Constructor.
+ */
public FreemarkerAutotagException() {
}
+ /**
+ * Constructor.
+ *
+ * @param message The message of the exception.
+ */
public FreemarkerAutotagException(String message) {
super(message);
}
+ /**
+ * Constructor.
+ *
+ * @param cause The cause.
+ */
public FreemarkerAutotagException(Throwable cause) {
super(cause);
}
+ /**
+ * Constructor.
+ *
+ * @param message The message of the exception.
+ * @param cause The cause.
+ */
public FreemarkerAutotagException(String message, Throwable cause) {
super(message, cause);
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
Mon Dec 13 19:28:37 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.freemarker.runtime;
import java.io.IOException;
@@ -8,10 +28,24 @@ import org.apache.tiles.autotag.core.run
import freemarker.template.TemplateDirectiveBody;
import freemarker.template.TemplateException;
+/**
+ * Body implementation of a Freemarker model body.
+ *
+ * @version $Rev$ $Date$
+ */
public class FreemarkerModelBody extends AbstractModelBody {
+ /**
+ * The real body.
+ */
private TemplateDirectiveBody templateDirectiveBody;
+ /**
+ * Constructor.
+ *
+ * @param defaultWriter The default writer.
+ * @param templateDirectiveBody The real body.
+ */
public FreemarkerModelBody(Writer defaultWriter, TemplateDirectiveBody
templateDirectiveBody) {
super(defaultWriter);
this.templateDirectiveBody = templateDirectiveBody;
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java
Mon Dec 13 19:28:37 2010
@@ -43,6 +43,8 @@ public final class FreemarkerUtil {
* Unwraps a TemplateModel to extract an object.
*
* @param model The TemplateModel to unwrap.
+ * @param defaultValue The default value, as specified in the template
+ * model, or null if not specified.
* @return The unwrapped object.
* @since 3.0.0
*/
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java?rev=1045329&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java
Mon Dec 13 19:28:37 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 Freemarker.
+ */
+package org.apache.tiles.autotag.freemarker.runtime;
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModelTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModelTest.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModelTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModelTest.java
Mon Dec 13 19:28:37 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.freemarker.runtime;
@@ -41,7 +58,7 @@ public class BodyFMModelTest {
/**
* Test method for
- * {...@link
org.apache.tiles.autotag.freemarker.runtime.BodyFMModel#execute(freemarker.core.Environment,
java.util.Map, freemarker.template.TemplateModel[],
freemarker.template.TemplateDirectiveBody)}
+ * {...@link BodyFMModel#execute(Environment, Map, TemplateModel[],
TemplateDirectiveBody)}
* .
*
* @throws IOException If something goes wrong.
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModelTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModelTest.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModelTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModelTest.java
Mon Dec 13 19:28:37 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.freemarker.runtime;
@@ -40,7 +57,7 @@ public class BodylessFMModelTest {
/**
* Test method for
- * {...@link
org.apache.tiles.autotag.freemarker.runtime.BodylessFMModel#execute(freemarker.core.Environment,
java.util.Map, freemarker.template.TemplateModel[],
freemarker.template.TemplateDirectiveBody)}
+ * {...@link BodylessFMModel#execute(Environment, Map, TemplateModel[],
TemplateDirectiveBody)}
* .
*
* @throws IOException If something goes wrong.
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java
Mon Dec 13 19:28:37 2010
@@ -64,7 +64,7 @@ public class FreemarkerAutotagExceptionT
}
/**
- * Test method for {...@link
FreemarkerAutotagException#FreemarkerAutotagException(java.lang.String,
java.lang.Throwable)}.
+ * Test method for {...@link
FreemarkerAutotagException#FreemarkerAutotagException(String, Throwable)}.
*/
@Test
public void testFreemarkerAutotagExceptionStringThrowable() {
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java
Mon Dec 13 19:28:37 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.freemarker.runtime;
@@ -58,7 +75,7 @@ public class FreemarkerModelBodyTest {
* @throws IOException If something goes wrong.
* @throws TemplateException If something goes wrong.
*/
- @Test(expected=IOException.class)
+ @Test(expected = IOException.class)
public void testEvaluateWriterException() throws TemplateException,
IOException {
TemplateDirectiveBody body = createMock(TemplateDirectiveBody.class);
Writer writer = createMock(Writer.class);
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java?rev=1045329&r1=1045328&r2=1045329&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java
Mon Dec 13 19:28:37 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.freemarker.runtime;
@@ -26,7 +43,7 @@ import freemarker.template.TemplateNumbe
public class FreemarkerUtilTest {
/**
- * Test method for {...@link
org.apache.tiles.autotag.freemarker.runtime.FreemarkerUtil#getAsObject(freemarker.template.TemplateModel,
java.lang.Object)}.
+ * Test method for {...@link FreemarkerUtil#getAsObject(TemplateModel,
Object)}.
* @throws TemplateModelException If something goes wrong.
*/
@Test
@@ -48,7 +65,7 @@ public class FreemarkerUtilTest {
}
/**
- * Test method for {...@link
org.apache.tiles.autotag.freemarker.runtime.FreemarkerUtil#getAsObject(freemarker.template.TemplateModel,
java.lang.Object)}.
+ * Test method for {...@link FreemarkerUtil#getAsObject(TemplateModel,
Object)}.
* @throws TemplateModelException If something goes wrong.
*/
@Test
@@ -67,10 +84,10 @@ public class FreemarkerUtilTest {
}
/**
- * Test method for {...@link
org.apache.tiles.autotag.freemarker.runtime.FreemarkerUtil#getAsObject(freemarker.template.TemplateModel,
java.lang.Object)}.
+ * Test method for {...@link FreemarkerUtil#getAsObject(TemplateModel,
Object)}.
* @throws TemplateModelException If something goes wrong.
*/
- @Test(expected=FreemarkerAutotagException.class)
+ @Test(expected = FreemarkerAutotagException.class)
public void testGetAsObjectException() throws TemplateModelException {
TemplateNumberModel model = createMock(TemplateNumberModel.class);
Template template = createMock(Template.class);
