svn commit: r164900 - /maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java

[jdcasey]

Author: jdcasey
Date: Tue Apr 26 15:18:16 2005
New Revision: 164900

URL: http://svn.apache.org/viewcvs?rev=164900&view=rev
Log:
Marked parts of the mojo parameter annotation processing that need to be 
removed when backward-compat is no longer an issue

Modified:
    
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java

Modified: 
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?rev=164900&r1=164899&r2=164900&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
 (original)
+++ 
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
 Tue Apr 26 15:18:16 2005
@@ -73,6 +73,7 @@
     protected void validateParameter( Parameter parameter, int i )
         throws InvalidParameterException
     {
+        // TODO: remove when backward compatibility is no longer an issue.
         String name = parameter.getName();
 
         if ( name == null )
@@ -80,6 +81,7 @@
             throw new InvalidParameterException( "name", i );
         }
 
+        // TODO: remove when backward compatibility is no longer an issue.
         String type = parameter.getType();
 
         if ( type == null )
@@ -94,6 +96,7 @@
             throw new InvalidParameterException( "expression", i );
         }
 
+        // TODO: remove when backward compatibility is no longer an issue.
         String description = parameter.getDescription();
 
         if ( description == null )
@@ -268,7 +271,7 @@
             Parameter pd = new Parameter();
 
             // if the field is null, then we're using a deprecated annotation 
pattern...
-            // TODO: Remove this check once we're clear of the 
annotation-compat issues.
+            // TODO: remove when backward compatibility is no longer an issue.
             if ( field == null )
             {
                 pd.setName( parameter.getNamedParameter( "name" ) );
@@ -276,12 +279,16 @@
                 pd.setType( parameter.getNamedParameter( "type" ) );
 
                 pd.setDefaultValue( parameter.getNamedParameter( "default" ) );
+                
+                pd.setDescription( parameter.getNamedParameter( "description" 
) );
             }
             else
             {
                 pd.setName( field.getName() );
 
                 pd.setType( field.getType().getValue() );
+                
+                pd.setDescription( field.getComment() );
             }
 
             String alias = parameter.getNamedParameter( "alias" );
@@ -294,8 +301,6 @@
             pd.setRequired( parameter.getNamedParameter( "required" ).equals( 
"true" ) ? true : false );
 
             pd.setExpression( parameter.getNamedParameter( "expression" ) );
-
-            pd.setDescription( parameter.getNamedParameter( "description" ) );
 
             pd.setDeprecated( parameter.getNamedParameter( "deprecated" ) );
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]