Author: rdonkin
Date: Mon May 9 19:11:31 2011
New Revision: 1101152
URL: http://svn.apache.org/viewvc?rev=1101152&view=rev
Log:
MAILETDOCS-3 Factor out body from loop.
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=1101152&r1=1101151&r2=1101152&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:11:31 2011
@@ -49,7 +49,7 @@ public class DefaultDescriptorsExtractor
*/
public List<MailetMatcherDescriptor> extractDescriptors(MavenProject
project, Log log) {
- List<MailetMatcherDescriptor> res = new
LinkedList<MailetMatcherDescriptor>();
+ List<MailetMatcherDescriptor> descriptors = new
LinkedList<MailetMatcherDescriptor>();
final JavaClass[] classes = javaClasses(project);
@@ -59,81 +59,88 @@ public class DefaultDescriptorsExtractor
logDirectories(project, log);
for (int i = 0; i < classes.length; i++) {
- log.debug("Class: " + classes[i].getFullyQualifiedName());
- try {
- Class<?> klass = classLoader.loadClass(classes[i]
- .getFullyQualifiedName());
-
- log.debug("Constr: " + klass.getConstructor(null));
-
- List<Class<?>> zuper = getAllInterfaces(klass);
- Class<?> mailetClass = classLoader.loadClass(Mailet.class
- .getName());
- Class<?> matcherClass = classLoader.loadClass(Matcher.class
- .getName());
- if (zuper.contains(mailetClass)) {
- 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(classes[i].getName());
- mmdesc.setFullyQualifiedName(classes[i]
- .getFullyQualifiedName());
- mmdesc.setType(MailetMatcherDescriptor.TYPE_MAILET);
- if (mailetInfo != null && mailetInfo.length() > 0) {
- mmdesc.setInfo(mailetInfo);
- }
- mmdesc.setClassDocs(classes[i].getComment());
- res.add(mmdesc);
-
- } else if (zuper.contains(matcherClass)) {
- Object m = klass.newInstance();
- String matcherInfo = (String) klass.getMethod(
- "getMatcherInfo", null).invoke(m, null);
- log.info("Found a Matcher: " + klass.getName());
- MailetMatcherDescriptor mmdesc = new
MailetMatcherDescriptor();
- mmdesc.setName(classes[i].getName());
- mmdesc.setFullyQualifiedName(classes[i]
- .getFullyQualifiedName());
- mmdesc.setType(MailetMatcherDescriptor.TYPE_MATCHER);
- if (matcherInfo != null && matcherInfo.length() > 0) {
- mmdesc.setInfo(matcherInfo);
- }
- mmdesc.setClassDocs(classes[i].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 {
- log.debug("No interfaces for " + klass.getName());
- }
+ final JavaClass nextClass = classes[i];
+ addDescriptor(log, descriptors, classLoader, nextClass);
+ }
- } catch (ClassNotFoundException e) {
- log.error("NotFound: " + e.getMessage());
- } catch (InstantiationException e) {
- log.info("IE: " + e.getMessage()+" / Probably an abstract
mailet/matcher: "+classes[i].getName());
- } catch (IllegalAccessException e) {
- log.error("IAE: " + e.getMessage());
- } catch (SecurityException e) {
- log.error("SE: " + e.getMessage());
- } catch (NoSuchMethodException e) {
- log.error("NSME: " + e.getMessage());
- } catch (IllegalArgumentException e) {
- log.error("IAE2: " + e.getMessage());
- } catch (InvocationTargetException e) {
- log.error("ITE: " + e.getMessage());
- }
+ return descriptors;
+ }
- List<JavaClass> implementedInterfaces =
getAllInterfacesQdox(classes[i]);
- for (int k = 0; k < implementedInterfaces.size(); k++) {
- log.info("I: " + implementedInterfaces.get(k));
- }
+ private void addDescriptor(Log log, List<MailetMatcherDescriptor> res,
+ final URLClassLoader classLoader, final JavaClass nextClass) {
+ final String nameOfNextClass = nextClass.getFullyQualifiedName();
+ if (log.isDebugEnabled()) {
+ log.debug("Class: " + nameOfNextClass);
}
+
+ try {
+ Class<?> klass = classLoader.loadClass(nameOfNextClass);
- return res;
+ log.debug("Constr: " + klass.getConstructor(null));
+
+ List<Class<?>> zuper = getAllInterfaces(klass);
+ Class<?> mailetClass = classLoader.loadClass(Mailet.class
+ .getName());
+ Class<?> matcherClass = classLoader.loadClass(Matcher.class
+ .getName());
+ if (zuper.contains(mailetClass)) {
+ 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);
+ }
+ mmdesc.setClassDocs(nextClass.getComment());
+ res.add(mmdesc);
+
+ } else if (zuper.contains(matcherClass)) {
+ Object m = klass.newInstance();
+ String matcherInfo = (String) klass.getMethod(
+ "getMatcherInfo", null).invoke(m, null);
+ log.info("Found a Matcher: " + klass.getName());
+ MailetMatcherDescriptor mmdesc = new MailetMatcherDescriptor();
+ mmdesc.setName(nextClass.getName());
+ mmdesc.setFullyQualifiedName(nameOfNextClass);
+ mmdesc.setType(MailetMatcherDescriptor.TYPE_MATCHER);
+ if (matcherInfo != null && matcherInfo.length() > 0) {
+ mmdesc.setInfo(matcherInfo);
+ }
+ 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 {
+ log.debug("No interfaces for " + klass.getName());
+ }
+
+ } catch (ClassNotFoundException e) {
+ log.error("NotFound: " + e.getMessage());
+ } catch (InstantiationException e) {
+ log.info("IE: " + e.getMessage()+" / Probably an abstract
mailet/matcher: "+nextClass.getName());
+ } catch (IllegalAccessException e) {
+ log.error("IAE: " + e.getMessage());
+ } catch (SecurityException e) {
+ log.error("SE: " + e.getMessage());
+ } catch (NoSuchMethodException e) {
+ log.error("NSME: " + e.getMessage());
+ } catch (IllegalArgumentException e) {
+ log.error("IAE2: " + e.getMessage());
+ } catch (InvocationTargetException e) {
+ log.error("ITE: " + e.getMessage());
+ }
+
+ List<JavaClass> implementedInterfaces =
getAllInterfacesQdox(nextClass);
+ for (int k = 0; k < implementedInterfaces.size(); k++) {
+ log.info("I: " + implementedInterfaces.get(k));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]