litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1564 Implement recursion in template model dump

Browse source
This commit is contained in:
rjy7 2011-02-23 21:08:20 +00:00
parent cdaaf369f0
commit 199190fb05
2 changed files with 8 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpHelper.java
View file

@ -213,54 +213,11 @@ public class DumpHelper {
}
private Map<String, Object> getTemplateModelValues(TemplateModel wrappedModel, BaseTemplateModel unwrappedModel) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("value", unwrappedModel.dump());
int exposureLevel = getExposureLevel(wrappedModel, unwrappedModel.getClass());
List<Method> publicMethods = getMethodsAvailableToTemplate(exposureLevel, unwrappedModel.getClass());
Map<String, String> properties = new HashMap<String, String>();
List<String> methods = new ArrayList<String>();
for (Method method : publicMethods) {
// Don't include the dump method, since this is used above to provide the value of the object.
if (method.getName().equals("dump")) {
continue;
}
String key = getMethodDisplayName(method);
if (key.endsWith(")")) {
methods.add(key);
} else {
try {
Object result = method.invoke(unwrappedModel);
String value;
if (result == null) {
value = "null";
} else if (result instanceof BaseTemplateModel) {
value = getTemplateModelDump((BaseTemplateModel)result, exposureLevel);
} else {
// Don't use ?html in the template, because then the output of
// getTemplateModelDump, which is html, gets escaped too.
value = StringEscapeUtils.escapeHtml(result.toString());
}
properties.put(key, value);
} catch (Exception e) {
log.error(e, e);
continue;
}
}
}
map.put("properties", properties);
map.put("methods", methods);
return map;
return getTemplateModelValues(unwrappedModel, exposureLevel);
}
private String getTemplateModelDump(BaseTemplateModel model, int exposureLevel) {
// What we need to do here is recurse down into the model and display the value, type,
// properties, and methods for each one. Pull out the part shared by this and getTemplateModelValues
// into a common method. This will return the string so that the template doesn't have to follow
// the recursion.
private Map<String, Object> getTemplateModelValues(BaseTemplateModel model, int exposureLevel) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("value", model.dump());
@ -299,7 +256,11 @@ public class DumpHelper {
map.put("type", model.getClass().getName());
map.put("properties", properties);
map.put("methods", methods);
return map;
}
private String getTemplateModelDump(BaseTemplateModel model, int exposureLevel) {
Map<String, Object> map = getTemplateModelValues(model, exposureLevel);
return BaseTemplateDirectiveModel.processTemplateToString("dump-var.ftl", map, env);
}

2
webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl
View file

@ -4,7 +4,7 @@
<div class="var">
<#if var??> <#-- not defined for a nested template model object -->
<p><strong>Variable name: ${var}</strong></p>
<p><strong>Variable name:</strong> ${var}</p>
</#if>
<#if value??>