svn commit: r806542 - in /maven/components/trunk/maven-plugin-api/src: main/java/org/apache/maven/plugin/descriptor/ test/java/org/apache/maven/plugin/descriptor/

[be...@apache.org]

Author: bentmann
Date: Fri Aug 21 13:20:50 2009
New Revision: 806542

URL: http://svn.apache.org/viewvc?rev=806542&view=rev
Log:
o Added generics

Modified:
    maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
    maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
    maven/components/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java

Modified: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java?rev=806542&r1=806541&r2=806542&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java Fri Aug 21 13:20:50 2009
@@ -39,7 +39,7 @@
  * Why not just extend ComponentDescriptor here?
  */
 public class MojoDescriptor
-    extends ComponentDescriptor
+    extends ComponentDescriptor<Mojo>
     implements Cloneable
 {
     /** The Plexus component type */

Modified: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?rev=806542&r1=806541&r2=806542&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java Fri Aug 21 13:20:50 2009
@@ -90,9 +90,10 @@
     //
     // ----------------------------------------------------------------------
 
-    public List getMojos()
+    @SuppressWarnings( "unchecked" )
+    public List<MojoDescriptor> getMojos()
     {
-        return getComponents();
+        return (List) getComponents();
     }
 
     public void addMojo( MojoDescriptor mojoDescriptor )
@@ -102,13 +103,13 @@
         // this relies heavily on the equals() and hashCode() for ComponentDescriptor,
         // which uses role:roleHint for identity...and roleHint == goalPrefix:goal.
         // role does not vary for Mojos.
-        List mojos = getComponents();
+        List<MojoDescriptor> mojos = getMojos();
 
         if ( mojos != null && mojos.contains( mojoDescriptor ) )
         {
             int indexOf = mojos.indexOf( mojoDescriptor );
 
-            existing = (MojoDescriptor) mojos.get( indexOf );
+            existing = mojos.get( indexOf );
         }
 
         if ( existing != null )

Modified: maven/components/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java?rev=806542&r1=806541&r2=806542&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java (original)
+++ maven/components/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java Fri Aug 21 13:20:50 2009
@@ -62,7 +62,7 @@
         assertEquals( 1, pd.getMojos().size() );
         assertEquals( 1, pd.getDependencies().size() );
 
-        MojoDescriptor md = (MojoDescriptor) pd.getMojos().get( 0 );
+        MojoDescriptor md = pd.getMojos().get( 0 );
 
         assertEquals( "jar", md.getGoal() );
         assertEquals( "mojo-description", md.getDescription() );
@@ -104,7 +104,7 @@
         assertEquals( "parameter-description", mp.getDescription() );
         assertEquals( "deprecated-parameter", mp.getDeprecated() );
 
-        ComponentRequirement cr = (ComponentRequirement) md.getRequirements().get( 0 );
+        ComponentRequirement cr = md.getRequirements().get( 0 );
 
         assertEquals( "org.codehaus.plexus.archiver.Archiver", cr.getRole() );
         assertEquals( "jar", cr.getRoleHint() );