Commits

Anonymous committed f5c5cf1

Include splash page templates in layout, rather than separately generating output and embedding it

Comments (0)

Files changed (2)

compchem-handler/src/main/java/net/chempound/compchem/display/CompChemSplashPageWriter.java

 import net.chempound.rdf.CPTerms;
 import net.chempound.services.FreemarkerService;
 import net.chempound.webapp.output.AbstractSplashPageWriter;
+import net.chempound.webapp.output.Page;
 import org.apache.commons.io.IOUtils;
 
 import javax.inject.Inject;
     }
 
     @Override
-    public String write(final Model model, final URI aggregationUri, final Map<String, Object> map) throws IOException, TemplateException {
-        map.put("headers", headers);
+    public void write(final Model model, final URI aggregationUri, final Map<String, Object> map, final Page page) throws IOException, TemplateException {
+        page.addParam("headers", headers);
 
         final BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
         final TemplateHashModel staticModels = wrapper.getStaticModels();
         final Resource r = model.getResource(aggregationUri.toString());
         final CompChemCalculation entry = r.as(CompChemCalculation.class);
 
-        map.put("uri", aggregationUri.toString());
+        page.addParam("uri", aggregationUri.toString());
 
-        map.put("calculation", new BeanModel(entry, wrapper));
+        page.addParam("calculation", new BeanModel(entry, wrapper));
 
-        map.put("CP", staticModels.get(CPTerms.class.getName()));
-        map.put("DC", staticModels.get(DCTerms.class.getName()));
+        page.addParam("CP", staticModels.get(CPTerms.class.getName()));
+        page.addParam("DC", staticModels.get(DCTerms.class.getName()));
 
-        return super.write(model, aggregationUri, map);
+        super.write(model, aggregationUri, map, page);
     }
 
 }

compchem-importer/pom.xml

         <dependency>
             <groupId>sea36</groupId>
             <artifactId>JmolImageGenerator</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-cli</groupId>
+                    <artifactId>commons-cli</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.