From e10914b835342a0428ec23d5daa9e8bd1cee940e Mon Sep 17 00:00:00 2001 From: Vincent Siveton Date: Mon, 11 Aug 2008 22:04:46 +0000 Subject: [PATCH] MPLUGIN-133: JavaMojoDescriptorExtractor doesn't handle @requiresProject o added the support of @requiresProject git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@684956 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/JavaMojoDescriptorExtractor.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java index 1943159..faef2dd 100644 --- a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java +++ b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java @@ -303,6 +303,11 @@ public class JavaMojoDescriptorExtractor getBooleanTagValue( javaClass, JavaMojoAnnotation.REQUIRES_PROJECT, mojoDescriptor.isProjectRequired() ); mojoDescriptor.setProjectRequired( value ); + // requiresReports flag + value = + getBooleanTagValue( javaClass, JavaMojoAnnotation.REQUIRES_REPORTS, mojoDescriptor.isRequiresReports() ); + mojoDescriptor.setRequiresReports( value ); + // Aggregator flag DocletTag aggregator = findInClassHierarchy( javaClass, JavaMojoAnnotation.AGGREGATOR ); if ( aggregator != null ) @@ -341,15 +346,15 @@ public class JavaMojoDescriptorExtractor */ private static boolean getBooleanTagValue( JavaClass javaClass, String tagName, boolean defaultValue ) { - DocletTag requiresProject = findInClassHierarchy( javaClass, tagName ); + DocletTag tag = findInClassHierarchy( javaClass, tagName ); - if ( requiresProject != null ) + if ( tag != null ) { - String requiresProjectValue = requiresProject.getValue(); + String value = tag.getValue(); - if ( requiresProjectValue != null && requiresProjectValue.length() > 0 ) + if ( StringUtils.isNotEmpty( value ) ) { - defaultValue = Boolean.valueOf( requiresProjectValue ).booleanValue(); + defaultValue = Boolean.valueOf( value ).booleanValue(); } } return defaultValue;