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/09 21:37:06 UTC
svn commit: r1101166 -
/james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
Author: rdonkin
Date: Mon May 9 19:37:05 2011
New Revision: 1101166
URL: http://svn.apache.org/viewvc?rev=1101166&view=rev
Log:
MAILETDOCS-3 Tidy up and some variable name improvements.
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=1101166&r1=1101165&r2=1101166&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 Mon May 9 19:37:05 2011
@@ -44,6 +44,9 @@ import com.thoughtworks.qdox.model.JavaC
*/
public class DefaultDescriptorsExtractor implements DescriptorsExtractor {
+ private static final String MATCHER_CLASS_NAME = Matcher.class.getName();
+ private static final String MAILET_CLASS_NAME = Mailet.class.getName();
+
/**
* @see org.apache.james.mailet.DescriptorsExtractor#extractDescriptors(MavenProject, Log)
*/
@@ -75,16 +78,15 @@ public class DefaultDescriptorsExtractor
}
try {
- Class<?> klass = classLoader.loadClass(nameOfNextClass);
+ final Class<?> klass = classLoader.loadClass(nameOfNextClass);
logConstructor(log, klass);
- List<Class<?>> zuper = getAllInterfaces(klass);
- Class<?> mailetClass = classLoader.loadClass(Mailet.class
- .getName());
- Class<?> matcherClass = classLoader.loadClass(Matcher.class
- .getName());
- if (zuper.contains(mailetClass)) {
+ final List<Class<?>> allInterfaces = getAllInterfaces(klass);
+ final Class<?> mailetClass = classLoader.loadClass(MAILET_CLASS_NAME);
+ final Class<?> matcherClass = classLoader.loadClass(MATCHER_CLASS_NAME);
+
+ if (allInterfaces.contains(mailetClass)) {
Object m = klass.newInstance();
String mailetInfo = (String) klass.getMethod(
"getMailetInfo", null).invoke(m, null);
@@ -99,7 +101,7 @@ public class DefaultDescriptorsExtractor
mmdesc.setClassDocs(nextClass.getComment());
res.add(mmdesc);
- } else if (zuper.contains(matcherClass)) {
+ } else if (allInterfaces.contains(matcherClass)) {
Object m = klass.newInstance();
String matcherInfo = (String) klass.getMethod(
"getMatcherInfo", null).invoke(m, null);
@@ -113,9 +115,9 @@ public class DefaultDescriptorsExtractor
}
mmdesc.setClassDocs(nextClass.getComment());
res.add(mmdesc);
- } else if (zuper.size() > 0) {
- for (int k = 0; k < zuper.size(); k++) {
- log.debug("I: " + ((Class) zuper.get(k)).getName());
+ } else if (allInterfaces.size() > 0) {
+ for (int k = 0; k < allInterfaces.size(); k++) {
+ log.debug("I: " + ((Class) allInterfaces.get(k)).getName());
}
} else {
log.debug("No interfaces for " + klass.getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org