Modified Freemarker output to write to files.

forge · Jan 25, 2013 · 739e3b6 · 739e3b6
1 parent 41f2a79
commit 739e3b6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/main/java/org/jboss/forge/scaffold/html5/Html5Scaffold.java b/src/main/java/org/jboss/forge/scaffold/html5/Html5Scaffold.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -92,26 +93,27 @@ public List<Resource<?>> generateIndex(String targetDir, Resource<?> template, b
         config.setClassForTemplateLoading(getClass(), "/scaffold/angularjs");
         config.setObjectWrapper(new DefaultObjectWrapper());
 
-        List<String> entities = new ArrayList<String>();
+        ArrayList<Resource<?>> result = new ArrayList<Resource<?>>();
+        List<String> entityNames = new ArrayList<String>();
         WebResourceFacet web = this.project.getFacet(WebResourceFacet.class);
         FileResource<?> partialsDirectory = web.getWebResource("partials");
         for (Resource<?> resource : partialsDirectory.listResources()) {
-            entities.add(resource.getName());
+            entityNames.add(resource.getName());
         }
         Map root = new HashMap();
-        root.put("entities", entities);
+        root.put("entityNames", entityNames);
 
         try {
             Template indexTemplate = config.getTemplate("index.html.ftl");
-            Writer out = new OutputStreamWriter(System.out);
-            indexTemplate.process(root, out);
-            out.flush();
+            Writer contents = new StringWriter();
+            indexTemplate.process(root, contents);
+            contents.flush();
+            result.add(ScaffoldUtil.createOrOverwrite(prompt, web.getWebResource("index.html"), contents.toString(), overwrite));
         } catch (IOException e) {
             throw new RuntimeException(e);
         } catch (TemplateException e) {
             throw new RuntimeException(e);
         }
-        ArrayList<Resource<?>> result = new ArrayList<Resource<?>>();
         return result;
     }
 
@@ -122,22 +124,26 @@ public List<Resource<?>> generateFromEntity(String targetDir, Resource<?> templa
         Configuration config = new Configuration();
         config.setClassForTemplateLoading(getClass(), "/scaffold/angularjs");
         config.setObjectWrapper(new DefaultObjectWrapper());
-
+
+        ArrayList<Resource<?>> result = new ArrayList<Resource<?>>();
+        WebResourceFacet web = this.project.getFacet(WebResourceFacet.class);
         Map root = new HashMap();
         root.put("entity", entity);
 
         try {
             Template indexTemplate = config.getTemplate("partials/detail.html.ftl");
-            Writer out = new OutputStreamWriter(System.out);
+            Writer out = new StringWriter();
             indexTemplate.process(root, out);
             out.flush();
+            result.add(ScaffoldUtil.createOrOverwrite(prompt,
+                    web.getWebResource("/partials/" + entity.getName() + "/detail.html"), out.toString(), overwrite));
         } catch (IOException e) {
             throw new RuntimeException(e);
         } catch (TemplateException e) {
             throw new RuntimeException(e);
         }
         generateIndex(targetDir, template, overwrite);
-        return new ArrayList<Resource<?>>();
+        return result;
     }
 
     @Override

diff --git a/src/main/resources/scaffold/angularjs/index.html.ftl b/src/main/resources/scaffold/angularjs/index.html.ftl
@@ -25,8 +25,8 @@
                 <img src="images/forge-logo.png" alt="JBoss Forge"></img>
                 <nav class="well sidebar-nav">
                     <ul id="sidebar-entries" class="nav nav-list">
-                        <#list entities as entity>
-                    	<li><a href="#${entity.name}">${entity.name}</a></li>
+                        <#list entityNames as entityName>
+                    	<li><a href="#${entityName}">${entityName}</a></li>
                     	</#list>
                     </ul>
                 </nav>