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

NIHVIVO-564 Refined method list output by describe directive

Browse source
This commit is contained in:
rjy7 2010-08-09 18:46:29 +00:00
parent badfac1321
commit a0e94628eb
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DescribeDirective.java
View file

@ -6,7 +6,7 @@ import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -14,6 +14,7 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.utils.StringUtils;
import edu.cornell.mannlib.vitro.webapp.web.directives.BaseTemplateDirectiveModel; import edu.cornell.mannlib.vitro.webapp.web.directives.BaseTemplateDirectiveModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
import freemarker.core.Environment; import freemarker.core.Environment;
@ -78,6 +79,7 @@ public class DescribeDirective extends BaseTemplateDirectiveModel {
for (Method m : methods) { for (Method m : methods) {
methodDescriptions.add(getMethodDescription(m)); methodDescriptions.add(getMethodDescription(m));
} }
Collections.sort(methodDescriptions);
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("var", varName); map.put("var", varName);
@ -118,7 +120,7 @@ public class DescribeDirective extends BaseTemplateDirectiveModel {
private List<Method> getPublicMethods(Class<?> cls) { private List<Method> getPublicMethods(Class<?> cls) {
List<Method> methods = new ArrayList<Method>(); List<Method> methods = new ArrayList<Method>();
// Go up the class hierarchy only until we get to the immediate subclass of BaseTemplateModel // Go up the class hierarchy only as far as the immediate subclass of BaseTemplateModel
if (! cls.getName().equals("edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel")) { if (! cls.getName().equals("edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel")) {
methods = getDeclaredPublicMethods(cls); methods = getDeclaredPublicMethods(cls);
methods.addAll(getPublicMethods(cls.getSuperclass())); methods.addAll(getPublicMethods(cls.getSuperclass()));
@ -142,7 +144,28 @@ public class DescribeDirective extends BaseTemplateDirectiveModel {
private String getMethodDescription(Method method) { private String getMethodDescription(Method method) {
return method.toString();
String methodName = method.getName();
methodName = methodName.replaceAll("^(get|is)", "");
methodName = methodName.substring(0, 1).toLowerCase() + methodName.substring(1);
Class<?>[] paramTypes = method.getParameterTypes();
String paramList = "";
if (paramTypes.length > 0) {
List<String> paramTypeList = new ArrayList<String>(paramTypes.length);
for (Class<?> cls : paramTypes) {
String name = cls.getName();
String[] nameParts = name.split("\\.");
String typeName = nameParts[nameParts.length-1];
typeName = typeName.replaceAll(";", "s");
typeName = typeName.substring(0,1).toLowerCase() + typeName.substring(1);
paramTypeList.add(typeName);
}
paramList = "(" + StringUtils.join(paramTypeList) + ")";
}
return methodName + paramList;
} }
} }

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

@ -2,9 +2,9 @@
<#-- Template for displaying directive describe --> <#-- Template for displaying directive describe -->
<div class="dump">
<h3>Methods available to variable <em>${var}</em></h3> <h3>Methods available to variable <em>${var}</em></h3>
<div class="dump">
<#list methods as method> <#list methods as method>
${method}<br /> ${method}<br />
</#list> </#list>