Author: apetrelli
Date: Sun Dec 12 13:29:34 2010
New Revision: 1044819
URL: http://svn.apache.org/viewvc?rev=1044819&view=rev
Log:
TILESSB-38
Fixed tiles-autotag-freemarker checkstyle.
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/package-info.java
(with props)
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelGenerator.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGenerator.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactory.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelGeneratorTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGeneratorTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactoryTest.java
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelGenerator.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelGenerator.java?rev=1044819&r1=1044818&r2=1044819&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelGenerator.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelGenerator.java
Sun Dec 12 13:29:34 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;
import java.io.File;
@@ -8,8 +28,18 @@ import org.apache.tiles.autotag.model.Te
import org.apache.tiles.autotag.model.TemplateSuite;
import org.apache.velocity.app.VelocityEngine;
+/**
+ * Generates a single Freemarker directive model, given a template class.
+ *
+ * @version $Rev$ $Date$
+ */
public class FMModelGenerator extends AbstractTemplateClassGenerator {
+ /**
+ * Constructor.
+ *
+ * @param velocityEngine The Velocity engine.
+ */
public FMModelGenerator(VelocityEngine velocityEngine) {
super(velocityEngine);
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGenerator.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGenerator.java?rev=1044819&r1=1044818&r2=1044819&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGenerator.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGenerator.java
Sun Dec 12 13:29:34 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;
import java.io.File;
@@ -7,22 +27,38 @@ import org.apache.tiles.autotag.generate
import org.apache.tiles.autotag.model.TemplateSuite;
import org.apache.velocity.app.VelocityEngine;
+/**
+ * Generates the model repository, given the template suite.
+ *
+ * @version $Rev$ $Date$
+ */
public class FMModelRepositoryGenerator extends AbstractTemplateSuiteGenerator
{
+ /**
+ * Constructor.
+ *
+ * @param velocityEngine The Velocity engine.
+ */
public FMModelRepositoryGenerator(VelocityEngine velocityEngine) {
super(velocityEngine);
}
- protected String getTemplatePath(File directory, String packageName,
TemplateSuite suite, Map<String, String> parameters) {
+ @Override
+ protected String getTemplatePath(File directory, String packageName,
+ TemplateSuite suite, Map<String, String> parameters) {
return "/org/apache/tiles/autotag/freemarker/repository.vm";
}
- protected String getFilename(File directory, String packageName,
TemplateSuite suite, Map<String, String> parameters) {
+ @Override
+ protected String getFilename(File directory, String packageName,
+ TemplateSuite suite, Map<String, String> parameters) {
String name = suite.getName();
return name.substring(0, 1).toUpperCase() + name.substring(1) +
"FMModelRepository.java";
}
- protected String getDirectoryName(File directory, String packageName,
TemplateSuite suite, Map<String, String> parameters) {
+ @Override
+ protected String getDirectoryName(File directory, String packageName,
+ TemplateSuite suite, Map<String, String> parameters) {
return packageName.replaceAll("\\.", "/");
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactory.java?rev=1044819&r1=1044818&r2=1044819&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactory.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactory.java
Sun Dec 12 13:29:34 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;
import java.io.File;
@@ -7,6 +27,11 @@ import org.apache.tiles.autotag.generate
import org.apache.tiles.autotag.generate.TemplateGeneratorFactory;
import org.apache.velocity.app.VelocityEngine;
+/**
+ * Creates a template generator that generates code for Freemarker.
+ *
+ * @version $Rev$ $Date$
+ */
public class FMTemplateGeneratorFactory implements TemplateGeneratorFactory {
/**
@@ -17,10 +42,23 @@ public class FMTemplateGeneratorFactory
*/
private File classesOutputDirectory;
+ /**
+ * The Velocity engine.
+ */
private VelocityEngine velocityEngine;
+ /**
+ * The template generator builder.
+ */
private TemplateGeneratorBuilder templateGeneratorBuilder;
+ /**
+ * Constructor.
+ *
+ * @param classesOutputDirectory Directory where code will be placed.
+ * @param velocityEngine The Velocity engine.
+ * @param templateGeneratorBuilder The template generator builder.
+ */
public FMTemplateGeneratorFactory(File classesOutputDirectory,
VelocityEngine velocityEngine, TemplateGeneratorBuilder
templateGeneratorBuilder) {
this.classesOutputDirectory = classesOutputDirectory;
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/package-info.java?rev=1044819&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/package-info.java
Sun Dec 12 13:29:34 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.
+ */
+/**
+ * Autotag support for Freemarker.
+ */
+package org.apache.tiles.autotag.freemarker;
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/java/org/apache/tiles/autotag/freemarker/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelGeneratorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelGeneratorTest.java?rev=1044819&r1=1044818&r2=1044819&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelGeneratorTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelGeneratorTest.java
Sun Dec 12 13:29:34 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;
@@ -10,7 +27,6 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
import org.apache.commons.io.FileUtils;
@@ -32,7 +48,7 @@ import org.junit.Test;
public class FMModelGeneratorTest {
/**
- * Test method for {...@link TagClassGenerator#generate(File, String,
TemplateSuite, TemplateClass, Map)}.
+ * Test method for {...@link TagClassGenerator#generate(File, String,
TemplateSuite, TemplateClass, java.util.Map)}.
* @throws Exception If something goes wrong.
*/
@Test
@@ -74,7 +90,9 @@ public class FMModelGeneratorTest {
generator.generate(file, "org.apache.tiles.autotag.freemarker.test",
suite, clazz, null);
- InputStream expected =
getClass().getResourceAsStream("/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat");
+ InputStream expected = getClass()
+ .getResourceAsStream(
+
"/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat");
File effectiveFile = new File(file,
"/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.java");
assertTrue(effectiveFile.exists());
InputStream effective = new FileInputStream(effectiveFile);
@@ -106,7 +124,9 @@ public class FMModelGeneratorTest {
generator.generate(file, "org.apache.tiles.autotag.freemarker.test",
suite, clazz, null);
- expected =
getClass().getResourceAsStream("/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat");
+ expected = getClass()
+ .getResourceAsStream(
+
"/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat");
effectiveFile = new File(file,
"/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.java");
assertTrue(effectiveFile.exists());
effective = new FileInputStream(effectiveFile);
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGeneratorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGeneratorTest.java?rev=1044819&r1=1044818&r2=1044819&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGeneratorTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGeneratorTest.java
Sun Dec 12 13:29:34 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;
@@ -10,7 +27,6 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
import org.apache.commons.io.FileUtils;
@@ -32,7 +48,7 @@ import org.junit.Test;
public class FMModelRepositoryGeneratorTest {
/**
- * Test method for {...@link
org.apache.tiles.autotag.jsp.TLDGenerator#generate(java.io.File,
java.lang.String, org.apache.tiles.autotag.model.TemplateSuite, Map)}.
+ * Test method for {...@link FMModelRepositoryGenerator#generate(File,
String, TemplateSuite, java.util.Map)}.
* @throws Exception If something goes wrong.
*/
@Test
@@ -96,7 +112,9 @@ public class FMModelRepositoryGeneratorT
generator.generate(file, "org.apache.tiles.autotag.freemarker.test",
suite, null);
- InputStream expected =
getClass().getResourceAsStream("/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat");
+ InputStream expected = getClass()
+ .getResourceAsStream(
+
"/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat");
File effectiveFile = new File(file,
"/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.java");
assertTrue(effectiveFile.exists());
InputStream effective = new FileInputStream(effectiveFile);
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactoryTest.java?rev=1044819&r1=1044818&r2=1044819&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactoryTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactoryTest.java
Sun Dec 12 13:29:34 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;
@@ -36,7 +53,8 @@ public class FMTemplateGeneratorFactoryT
expect(builder.build()).andReturn(generator);
replay(classesOutputDirectory, velocityEngine, builder, generator);
- FMTemplateGeneratorFactory factory = new
FMTemplateGeneratorFactory(classesOutputDirectory, velocityEngine, builder);
+ FMTemplateGeneratorFactory factory = new FMTemplateGeneratorFactory(
+ classesOutputDirectory, velocityEngine, builder);
assertSame(generator, factory.createTemplateGenerator());
verify(classesOutputDirectory, velocityEngine, builder, generator);
}
