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

NIHVIVO-1564 Minor tweak to DumpDirective tests, and comments in BaseDumpDirective.

Browse source
This commit is contained in:
ryounes 2011-04-20 15:41:05 +00:00
parent c7081f81cd
commit 9e847bad59
2 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/freemarker/ext/dump/BaseDumpDirective.java
View file

@ -166,7 +166,8 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
map.putAll( getTemplateModelDump( ( TemplateCollectionModel)model ) );
} else if ( model instanceof StringModel ) {
// A StringModel can wrap either a String or a plain Java object.
// Unwrap it to figure out what to do.
Object unwrappedModel = DeepUnwrap.permissiveUnwrap(model);
if (unwrappedModel instanceof String) {
@ -187,6 +188,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
// Nodes and transforms not included here
} else {
// We shouldn't get here; provide as a safety net.
map.putAll( getTemplateModelDump( (TemplateModel)model ) );
}
} else {
@ -444,7 +446,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
}
private Map<String, Object> getTemplateModelDump(TemplateModel model) throws TemplateModelException {
// One of the above cases should have applied. Track whether this actually occurs.
// One of the more specific cases should have applied. Track whether this actually occurs.
log.debug("Found model with no known type");
Map<String, Object> map = new HashMap<String, Object>();
Object unwrappedModel = DeepUnwrap.permissiveUnwrap(model);