svn commit: r1074380 - in /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype: mojos/ ui/

[hb...@apache.org]

Author: hboutemy
Date: Fri Feb 25 02:30:18 2011
New Revision: 1074380

URL: http://svn.apache.org/viewvc?rev=1074380&view=rev
Log:
o removed unused imports
o use more generics

Modified:
    maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
    maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
    maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationQueryer.java
    maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java

Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=1074380&r1=1074379&r2=1074380&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java (original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java Fri Feb 25 02:30:18 2011
@@ -35,8 +35,6 @@ import org.codehaus.plexus.util.Property
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java?rev=1074380&r1=1074379&r2=1074380&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java (original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java Fri Feb 25 02:30:18 2011
@@ -304,7 +304,7 @@ public class DefaultArchetypeCreationCon
 
         getLogger().debug( "Adding " + properties.size() + " properties" );
 
-        Iterator propertiesIterator = properties.keySet().iterator();
+        Iterator<?> propertiesIterator = properties.keySet().iterator();
         while ( propertiesIterator.hasNext() )
         {
             String propertyKey = (String) propertiesIterator.next();
@@ -349,7 +349,7 @@ public class DefaultArchetypeCreationCon
     {
         List<String> toRemove = new ArrayList<String>( 0 );
 
-        for ( Iterator keys = properties.keySet().iterator(); keys.hasNext(); )
+        for ( Iterator<?> keys = properties.keySet().iterator(); keys.hasNext(); )
         {
             String key = (String) keys.next();
             if ( key.indexOf( "." ) >= 0 )

Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationQueryer.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationQueryer.java?rev=1074380&r1=1074379&r2=1074380&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationQueryer.java (original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationQueryer.java Fri Feb 25 02:30:18 2011
@@ -93,7 +93,7 @@ public class DefaultArchetypeCreationQue
                 + archetypeConfiguration.getArtifactId() + "\n" + Constants.ARCHETYPE_VERSION + "="
                 + archetypeConfiguration.getVersion() + "\n" );
 
-        for ( Iterator propertiesIter = archetypeConfiguration.getProperties().keySet().iterator();
+        for ( Iterator<?> propertiesIter = archetypeConfiguration.getProperties().keySet().iterator();
             propertiesIter.hasNext(); )
         {
             String property = (String) propertiesIter.next();

Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java?rev=1074380&r1=1074379&r2=1074380&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java (original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java Fri Feb 25 02:30:18 2011
@@ -180,7 +180,7 @@ public class DefaultArchetypeFactory
 
         ArchetypeConfiguration configuration = createArchetypeConfiguration( properties );
 
-        for ( Iterator requiredProperties = properties.keySet().iterator(); requiredProperties.hasNext(); )
+        for ( Iterator<?> requiredProperties = properties.keySet().iterator(); requiredProperties.hasNext(); )
         {
             String requiredProperty = (String) requiredProperties.next();