You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2011/05/10 10:01:47 UTC
svn commit: r1101355 -
/james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
Author: rdonkin
Date: Tue May 10 08:01:47 2011
New Revision: 1101355
URL: http://svn.apache.org/viewvc?rev=1101355&view=rev
Log:
MAILETDOCS-3 Clarify some variable names.
Modified:
james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
Modified: james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
URL: http://svn.apache.org/viewvc/james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java?rev=1101355&r1=1101354&r2=1101355&view=diff
==============================================================================
--- james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java (original)
+++ james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java Tue May 10 08:01:47 2011
@@ -128,18 +128,21 @@ public class DefaultDescriptorsExtractor
final Class<?> klass) throws InstantiationException,
IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
- Object m = klass.newInstance();
- String matcherInfo = (String) klass.getMethod(
- "getMatcherInfo", null).invoke(m, null);
- log.info("Found a Matcher: " + klass.getName());
- MailetMatcherDescriptor result = new MailetMatcherDescriptor();
+ final MailetMatcherDescriptor result = new MailetMatcherDescriptor();
result.setName(nextClass.getName());
result.setFullyQualifiedName(nameOfNextClass);
+ result.setClassDocs(nextClass.getComment());
result.setType(MailetMatcherDescriptor.TYPE_MATCHER);
- if (matcherInfo != null && matcherInfo.length() > 0) {
- result.setInfo(matcherInfo);
+
+ final Object instance = klass.newInstance();
+ final String info = (String) klass.getMethod(
+ "getMatcherInfo", null).invoke(instance, null);
+ if (info != null && info.length() > 0) {
+ result.setInfo(info);
}
- result.setClassDocs(nextClass.getComment());
+
+
+ log.info("Found a Matcher: " + klass.getName());
return result;
}
@@ -148,20 +151,22 @@ public class DefaultDescriptorsExtractor
final JavaClass nextClass, final String nameOfNextClass,
final Class<?> klass) throws InstantiationException,
IllegalAccessException, InvocationTargetException,
- NoSuchMethodException {
- Object m = klass.newInstance();
- String mailetInfo = (String) klass.getMethod(
- "getMailetInfo", null).invoke(m, null);
- log.info("Found a Mailet: " + klass.getName());
- MailetMatcherDescriptor mmdesc = new MailetMatcherDescriptor();
- mmdesc.setName(nextClass.getName());
- mmdesc.setFullyQualifiedName(nameOfNextClass);
- mmdesc.setType(MailetMatcherDescriptor.TYPE_MAILET);
- if (mailetInfo != null && mailetInfo.length() > 0) {
- mmdesc.setInfo(mailetInfo);
+ NoSuchMethodException {
+ final MailetMatcherDescriptor result = new MailetMatcherDescriptor();
+ result.setName(nextClass.getName());
+ result.setFullyQualifiedName(nameOfNextClass);
+ result.setClassDocs(nextClass.getComment());
+ result.setType(MailetMatcherDescriptor.TYPE_MAILET);
+
+ final Object instance = klass.newInstance();
+ final String info = (String) klass.getMethod(
+ "getMailetInfo", null).invoke(instance, null);
+ if (info != null && info.length() > 0) {
+ result.setInfo(info);
}
- mmdesc.setClassDocs(nextClass.getComment());
- return mmdesc;
+
+ log.info("Found a Mailet: " + klass.getName());
+ return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org