You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/06/14 00:01:29 UTC
svn commit: r954321 [1/3] - in /maven/archetype/trunk: ./ archetype-common/
archetype-common/src/main/java/org/apache/maven/archetype/
archetype-common/src/main/java/org/apache/maven/archetype/common/
archetype-common/src/main/java/org/apache/maven/arc...
Author: hboutemy
Date: Sun Jun 13 22:01:28 2010
New Revision: 954321
URL: http://svn.apache.org/viewvc?rev=954321&view=rev
Log:
[ARCHETYPE-317] upgraded source code to Java 5 with generics
Modified:
maven/archetype/trunk/archetype-common/pom.xml
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/descriptor/ArchetypeDescriptor.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSink.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSink.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeCreationConfigurator.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeSelectionQueryer.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationQueryer.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
maven/archetype/trunk/pom.xml
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Sun Jun 13 22:01:28 2010
@@ -162,6 +162,7 @@ under the License.
<version>1.3</version>
<configuration>
<version>1.0.0</version>
+ <useJava5>true</useJava5>
<models>
<model>src/main/mdo/archetype-registry.mdo</model>
<model>src/main/mdo/archetype-descriptor.mdo</model>
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java Sun Jun 13 22:01:28 2010
@@ -36,9 +36,9 @@ public class ArchetypeCreationRequest
// private File propertyFile;
- private List languages = new ArrayList();
+ private List<String> languages = new ArrayList<String>();
- private List filtereds = new ArrayList();
+ private List<String> filtereds = new ArrayList<String>();
private String defaultEncoding = "UTF-8";
@@ -104,24 +104,24 @@ public class ArchetypeCreationRequest
// return this;
// }
- public List getLanguages()
+ public List<String> getLanguages()
{
return languages;
}
- public ArchetypeCreationRequest setLanguages( List languages )
+ public ArchetypeCreationRequest setLanguages( List<String> languages )
{
this.languages = languages;
return this;
}
- public List getFiltereds()
+ public List<String> getFiltereds()
{
return filtereds;
}
- public ArchetypeCreationRequest setFiltereds( List filtereds )
+ public ArchetypeCreationRequest setFiltereds( List<String> filtereds )
{
this.filtereds = filtereds;
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java Sun Jun 13 22:01:28 2010
@@ -43,13 +43,13 @@ public class ArchetypeGenerationRequest
private ArtifactRepository localRepository;
- private List remoteArtifactRepositories;
+ private List<ArtifactRepository> remoteArtifactRepositories;
private Proxy activeProxy;
- private List servers = new ArrayList();
+ private List<Server> servers = new ArrayList<Server>();
- private List mirrors = new ArrayList();
+ private List<Mirror> mirrors = new ArrayList<Mirror>();
// Archetype definition
private String archetypeName;
@@ -301,7 +301,7 @@ public class ArchetypeGenerationRequest
return this;
}
- public List getMirrors()
+ public List<Mirror> getMirrors()
{
return mirrors;
}
@@ -313,17 +313,17 @@ public class ArchetypeGenerationRequest
return this;
}
- public List getServers()
+ public List<Server> getServers()
{
return servers;
}
- public List getRemoteArtifactRepositories()
+ public List<ArtifactRepository> getRemoteArtifactRepositories()
{
return remoteArtifactRepositories;
}
- public ArchetypeGenerationRequest setRemoteArtifactRepositories( List remoteArtifactRepositories )
+ public ArchetypeGenerationRequest setRemoteArtifactRepositories( List<ArtifactRepository> remoteArtifactRepositories )
{
this.remoteArtifactRepositories = remoteArtifactRepositories;
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java Sun Jun 13 22:01:28 2010
@@ -53,7 +53,7 @@ public class DefaultArchetypeManager
private ArchetypeGenerator generator;
/** @plexus.requirement role="org.apache.maven.archetype.source.ArchetypeDataSource" */
- private Map archetypeSources;
+ private Map<String,ArchetypeDataSource> archetypeSources;
public ArchetypeCreationResult createArchetypeFromProject( ArchetypeCreationRequest request )
{
@@ -141,7 +141,7 @@ public class DefaultArchetypeManager
{
try
{
- ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( "internal-catalog" );
+ ArchetypeDataSource source = archetypeSources.get( "internal-catalog" );
return source.getArchetypeCatalog( new Properties() );
}
@@ -162,7 +162,7 @@ public class DefaultArchetypeManager
{
Properties properties = new Properties();
properties.setProperty( "file", path );
- ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( "catalog" );
+ ArchetypeDataSource source = archetypeSources.get( "catalog" );
return source.getArchetypeCatalog( properties );
}
@@ -183,7 +183,7 @@ public class DefaultArchetypeManager
{
Properties properties = new Properties();
properties.setProperty( "repository", url );
- ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( "remote-catalog" );
+ ArchetypeDataSource source = archetypeSources.get( "remote-catalog" );
return source.getArchetypeCatalog( properties );
}
@@ -204,7 +204,7 @@ public class DefaultArchetypeManager
{
Properties properties = new Properties();
properties.setProperty( "file", path );
- ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( "catalog" );
+ ArchetypeDataSource source = archetypeSources.get( "catalog" );
source.updateCatalog( properties, archetype );
}
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java Sun Jun 13 22:01:28 2010
@@ -43,7 +43,7 @@ public interface ArchetypeArtifactManage
*/
File getArchetypeFile( String groupId, String artifactId, String version,
ArtifactRepository archetypeRepository, ArtifactRepository localRepository,
- List repositories )
+ List<ArtifactRepository> repositories )
throws UnknownArchetype;
/**
@@ -64,7 +64,7 @@ public interface ArchetypeArtifactManage
*/
boolean isFileSetArchetype( String groupId, String artifactId, String version,
ArtifactRepository archetypeRepository, ArtifactRepository localRepository,
- List repositories );
+ List<ArtifactRepository> repositories );
/**
*/
@@ -73,12 +73,13 @@ public interface ArchetypeArtifactManage
/**
*/
boolean isOldArchetype( String groupId, String artifactId, String version, ArtifactRepository archetypeRepository,
- ArtifactRepository localRepository, List repositories );
+ ArtifactRepository localRepository, List<ArtifactRepository> repositories );
/**
*/
boolean exists( String archetypeGroupId, String archetypeArtifactId, String archetypeVersion,
- ArtifactRepository archetypeRepository, ArtifactRepository localRepository, List repos );
+ ArtifactRepository archetypeRepository, ArtifactRepository localRepository,
+ List<ArtifactRepository> repos );
/**
*/
@@ -89,12 +90,13 @@ public interface ArchetypeArtifactManage
*/
ArchetypeDescriptor getFileSetArchetypeDescriptor( String groupId, String artifactId, String version,
ArtifactRepository archetypeRepository,
- ArtifactRepository localRepository, List repositories )
+ ArtifactRepository localRepository,
+ List<ArtifactRepository> repositories )
throws UnknownArchetype;
/**
*/
- List getFilesetArchetypeResources( File archetypeFile )
+ List<String> getFilesetArchetypeResources( File archetypeFile )
throws UnknownArchetype;
/**
@@ -105,7 +107,7 @@ public interface ArchetypeArtifactManage
/**
*/
org.apache.maven.archetype.old.descriptor.ArchetypeDescriptor getOldArchetypeDescriptor(
- String groupId, String artifactId, String version,
- ArtifactRepository archetypeRepository, ArtifactRepository localRepository, List repositories )
+ String groupId, String artifactId, String version, ArtifactRepository archetypeRepository,
+ ArtifactRepository localRepository, List<ArtifactRepository> repositories )
throws UnknownArchetype;
}
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java Sun Jun 13 22:01:28 2010
@@ -30,32 +30,32 @@ public interface ArchetypeFilesResolver
{
String ROLE = ArchetypeFilesResolver.class.getName();
- List getFilesWithExtension( List files, String extension );
+ List<String> getFilesWithExtension( List<String> files, String extension );
- List getFilteredFiles( List files, String filtered );
+ List<String> getFilteredFiles( List<String> files, String filtered );
- List filterFiles( String moduleOffset, FileSet fileSet, List archetypeResources );
+ List<String> filterFiles( String moduleOffset, FileSet fileSet, List<String> archetypeResources );
- List findOtherResources( int level, List files, String languages );
+ List<String> findOtherResources( int level, List<String> files, String languages );
- List findOtherResources( int level, List files, List sourcesFiles, String languages );
+ List<String> findOtherResources( int level, List<String> files, List<String> sourcesFiles, String languages );
- List findOtherSources( int level, List files, String languages );
+ List<String> findOtherSources( int level, List<String> files, String languages );
- List findResourcesMainFiles( List files, String languages );
+ List<String> findResourcesMainFiles( List<String> files, String languages );
- List findResourcesTestFiles( List files, String languages );
+ List<String> findResourcesTestFiles( List<String> files, String languages );
- List findSiteFiles( List files, String languages );
+ List<String> findSiteFiles( List<String> files, String languages );
- List findSourcesMainFiles( List files, String languages );
+ List<String> findSourcesMainFiles( List<String> files, String languages );
- List findSourcesTestFiles( List files, String languages );
+ List<String> findSourcesTestFiles( List<String> files, String languages );
- List getPackagedFiles( List files, String packageName );
+ List<String> getPackagedFiles( List<String> files, String packageName );
- String resolvePackage( File file, List languages )
+ String resolvePackage( File file, List<String> languages )
throws IOException;
- List getUnpackagedFiles( List files, String packageName );
+ List<String> getUnpackagedFiles( List<String> files, String packageName );
}
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java Sun Jun 13 22:01:28 2010
@@ -32,10 +32,10 @@ public interface ArchetypeRegistryManage
{
String ROLE = ArchetypeRegistryManager.class.getName();
- List getFilteredExtensions( String archetypeFilteredExtentions, File archetypeRegistryFile )
+ List<String> getFilteredExtensions( String archetypeFilteredExtentions, File archetypeRegistryFile )
throws IOException;
- List getLanguages( String archetypeLanguages, File archetypeRegistryFile )
+ List<String> getLanguages( String archetypeLanguages, File archetypeRegistryFile )
throws IOException;
ArchetypeRegistry readArchetypeRegistry( Reader reader )
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java Sun Jun 13 22:01:28 2010
@@ -48,7 +48,7 @@ public interface Constants
String ARCHETYPE_LANGUAGES = "archetype.languages";
- List DEFAULT_FILTERED_EXTENSIONS =
+ List<String> DEFAULT_FILTERED_EXTENSIONS =
Arrays.asList(
new String[]
{
@@ -57,7 +57,7 @@ public interface Constants
}
);
- List DEFAULT_LANGUAGES =
+ List<String> DEFAULT_LANGUAGES =
Arrays.asList( new String[]{ "java", "groovy", "csharp", "aspectj" } );
String GROUP_ID = "groupId";
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java Sun Jun 13 22:01:28 2010
@@ -70,11 +70,11 @@ public class DefaultArchetypeArtifactMan
*/
private PomManager pomManager;
- private Map archetypeCache = new TreeMap();
+ private Map<String, File> archetypeCache = new TreeMap<String, File>();
public File getArchetypeFile( final String groupId, final String artifactId, final String version,
ArtifactRepository archetypeRepository, final ArtifactRepository localRepository,
- final List repositories )
+ final List<ArtifactRepository> repositories )
throws UnknownArchetype
{
try
@@ -126,7 +126,7 @@ public class DefaultArchetypeArtifactMan
{
String pomFileName = null;
zipFile = getArchetypeZipFile( jar );
- Enumeration enumeration = zipFile.entries();
+ Enumeration<? extends ZipEntry> enumeration = zipFile.entries();
while ( enumeration.hasMoreElements() )
{
ZipEntry el = (ZipEntry) enumeration.nextElement();
@@ -206,7 +206,7 @@ public class DefaultArchetypeArtifactMan
public boolean isFileSetArchetype( String groupId, String artifactId, String version,
ArtifactRepository archetypeRepository, ArtifactRepository localRepository,
- List repositories )
+ List<ArtifactRepository> repositories )
{
try
{
@@ -249,7 +249,7 @@ public class DefaultArchetypeArtifactMan
public boolean isOldArchetype( String groupId, String artifactId, String version,
ArtifactRepository archetypeRepository, ArtifactRepository localRepository,
- List repositories )
+ List<ArtifactRepository> repositories )
{
ZipFile zipFile = null;
try
@@ -280,7 +280,7 @@ public class DefaultArchetypeArtifactMan
public boolean exists( String archetypeGroupId, String archetypeArtifactId, String archetypeVersion,
ArtifactRepository archetypeRepository, ArtifactRepository localRepository,
- List remoteRepositories )
+ List<ArtifactRepository> remoteRepositories )
{
try
{
@@ -336,12 +336,8 @@ public class DefaultArchetypeArtifactMan
}
public org.apache.maven.archetype.metadata.ArchetypeDescriptor getFileSetArchetypeDescriptor(
- String groupId,
- String artifactId,
- String version,
- ArtifactRepository archetypeRepository,
- ArtifactRepository localRepository,
- List repositories )
+ String groupId, String artifactId, String version, ArtifactRepository archetypeRepository,
+ ArtifactRepository localRepository, List<ArtifactRepository> repositories )
throws UnknownArchetype
{
File archetypeFile =
@@ -350,18 +346,18 @@ public class DefaultArchetypeArtifactMan
return getFileSetArchetypeDescriptor( archetypeFile );
}
- public List getFilesetArchetypeResources( File archetypeFile )
+ public List<String> getFilesetArchetypeResources( File archetypeFile )
throws UnknownArchetype
{
getLogger().debug( "getFilesetArchetypeResources( \"" + archetypeFile.getAbsolutePath() + "\" )" );
- List archetypeResources = new ArrayList();
+ List<String> archetypeResources = new ArrayList<String>();
ZipFile zipFile = null;
try
{
zipFile = getArchetypeZipFile( archetypeFile );
- Enumeration enumeration = zipFile.entries();
+ Enumeration<? extends ZipEntry> enumeration = zipFile.entries();
while ( enumeration.hasMoreElements() )
{
ZipEntry entry = (ZipEntry) enumeration.nextElement();
@@ -412,12 +408,8 @@ public class DefaultArchetypeArtifactMan
}
public org.apache.maven.archetype.old.descriptor.ArchetypeDescriptor getOldArchetypeDescriptor(
- String groupId,
- String artifactId,
- String version,
- ArtifactRepository archetypeRepository,
- ArtifactRepository localRepository,
- List repositories )
+ String groupId, String artifactId, String version, ArtifactRepository archetypeRepository,
+ ArtifactRepository localRepository, List<ArtifactRepository> repositories )
throws UnknownArchetype
{
File archetypeFile =
@@ -434,7 +426,7 @@ public class DefaultArchetypeArtifactMan
{
getLogger().debug( "Found archetype " + key + " in cache: " + archetypeCache.get( key ) );
- return (File) archetypeCache.get( key );
+ return archetypeCache.get( key );
}
getLogger().debug( "Not found archetype " + key + " in cache" );
@@ -585,7 +577,7 @@ public class DefaultArchetypeArtifactMan
{
getLogger().debug( "Searching for " + searchString + " inside " + zipFile.getName() );
- Enumeration enu = zipFile.entries();
+ Enumeration<? extends ZipEntry> enu = zipFile.entries();
while ( enu.hasMoreElements() )
{
ZipEntry entryfound = (ZipEntry) enu.nextElement();
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java Sun Jun 13 22:01:28 2010
@@ -31,7 +31,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -40,7 +39,7 @@ public class DefaultArchetypeFilesResolv
extends AbstractLogEnabled
implements ArchetypeFilesResolver
{
- public List getFilesWithExtension( List files, String extension )
+ public List<String> getFilesWithExtension( List<String> files, String extension )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "" );
@@ -51,7 +50,7 @@ public class DefaultArchetypeFilesResolv
return scanner.scan( files );
}
- public List getFilteredFiles( List files, String filtered )
+ public List<String> getFilteredFiles( List<String> files, String filtered )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "" );
@@ -59,13 +58,13 @@ public class DefaultArchetypeFilesResolv
scanner.setIncludes( filtered );
scanner.setExcludes( "" );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug( "Scanned " + result.size() + " filtered files in " + files.size() + " files" );
return result;
}
- public List filterFiles( String moduleOffset, FileSet fileSet, List archetypeResources )
+ public List<String> filterFiles( String moduleOffset, FileSet fileSet, List<String> archetypeResources )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir(
@@ -79,7 +78,7 @@ public class DefaultArchetypeFilesResolv
return scanner.scan( archetypeResources );
}
- public List findOtherResources( int level, List files, String languages )
+ public List<String> findOtherResources( int level, List<String> files, String languages )
{
ListScanner scanner = new ListScanner();
@@ -94,7 +93,7 @@ public class DefaultArchetypeFilesResolv
scanner.setIncludes( includes + "**" );
scanner.setExcludes( languages );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug(
"Scanned " + result.size() + " other resources in " + files.size() + " files at level "
+ level );
@@ -102,21 +101,18 @@ public class DefaultArchetypeFilesResolv
return result;
}
- public List findOtherResources( int level, List files, List sourcesFiles, String languages )
+ public List<String> findOtherResources( int level, List<String> files, List<String> sourcesFiles, String languages )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "" );
- Set selectedDirectories = new HashSet();
+ Set<String> selectedDirectories = new HashSet<String>();
- List includes = new ArrayList();
+ List<String> includes = new ArrayList<String>();
- Iterator sourcesFilesIterator = sourcesFiles.iterator();
- while ( sourcesFilesIterator.hasNext() )
+ for ( String sourcesFile : sourcesFiles )
{
- String sourcesFile = (String) sourcesFilesIterator.next();
-
String directory = PathUtils.getDirectory( sourcesFile, level - 1 );
if ( !selectedDirectories.contains( directory ) )
{
@@ -128,7 +124,7 @@ public class DefaultArchetypeFilesResolv
scanner.setExcludes( languages );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug(
"Scanned " + result.size() + " other resources in " + files.size() + " files at level "
+ level );
@@ -136,7 +132,7 @@ public class DefaultArchetypeFilesResolv
return result;
}
- public List findOtherSources( int level, List files, String languages )
+ public List<String> findOtherSources( int level, List<String> files, String languages )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "" );
@@ -156,7 +152,7 @@ public class DefaultArchetypeFilesResolv
scanner.setIncludes( includes );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug(
"Scanned " + result.size() + " other sources in " + files.size() + " files at level "
+ level );
@@ -164,7 +160,7 @@ public class DefaultArchetypeFilesResolv
return result;
}
- public List findResourcesMainFiles( List files, String languages )
+ public List<String> findResourcesMainFiles( List<String> files, String languages )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "src/main" );
@@ -172,13 +168,13 @@ public class DefaultArchetypeFilesResolv
scanner.setIncludes( "**" );
scanner.setExcludes( languages );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug( "Scanned " + result.size() + " resources in " + files.size() + " files" );
return result;
}
- public List findResourcesTestFiles( List files, String languages )
+ public List<String> findResourcesTestFiles( List<String> files, String languages )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "src/test" );
@@ -186,13 +182,13 @@ public class DefaultArchetypeFilesResolv
scanner.setIncludes( "**" );
scanner.setExcludes( languages );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug( "Scanned " + result.size() + " test resources in " + files.size() + " files" );
return result;
}
- public List findSiteFiles( List files, String languages )
+ public List<String> findSiteFiles( List<String> files, String languages )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "src/site" );
@@ -200,46 +196,43 @@ public class DefaultArchetypeFilesResolv
scanner.setIncludes( "**" );
scanner.setExcludes( languages );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug( "Scanned " + result.size() + " site resources in " + files.size() + " files" );
return result;
}
- public List findSourcesMainFiles( List files, String languages )
+ public List<String> findSourcesMainFiles( List<String> files, String languages )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "src/main" );
scanner.setIncludes( languages );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug( "Scanned " + result.size() + " sources in " + files.size() + " files" );
return result;
}
- public List findSourcesTestFiles( List files, String languages )
+ public List<String> findSourcesTestFiles( List<String> files, String languages )
{
ListScanner scanner = new ListScanner();
scanner.setBasedir( "src/test" );
scanner.setIncludes( languages );
- List result = scanner.scan( files );
+ List<String> result = scanner.scan( files );
getLogger().debug( "Scanned " + result.size() + " test sources in " + files.size() + " files" );
return result;
}
- public List getPackagedFiles( List files, String packageName )
+ public List<String> getPackagedFiles( List<String> files, String packageName )
{
- List packagedFiles = new ArrayList();
- Iterator filesIterator = files.iterator();
- while ( filesIterator.hasNext() )
+ List<String> packagedFiles = new ArrayList<String>();
+ for ( String file : files )
{
- String file = (String) filesIterator.next();
-
if ( file.startsWith( packageName ) )
{
packagedFiles.add( file.substring( packageName.length() + 1 ) );
@@ -249,24 +242,21 @@ public class DefaultArchetypeFilesResolv
return packagedFiles;
}
- public String resolvePackage( File basedir, List languages )
+ public String resolvePackage( File basedir, List<String> languages )
throws IOException
{
getLogger().debug( "Resolving package in " + basedir + " using languages " + languages );
- List files = resolveFiles( basedir, languages );
+ List<String> files = resolveFiles( basedir, languages );
return resolvePackage( files );
}
- public List getUnpackagedFiles( List files, String packageName )
+ public List<String> getUnpackagedFiles( List<String> files, String packageName )
{
- List unpackagedFiles = new ArrayList();
- Iterator filesIterator = files.iterator();
- while ( filesIterator.hasNext() )
+ List<String> unpackagedFiles = new ArrayList<String>();
+ for ( String file : files )
{
- String file = (String) filesIterator.next();
-
if ( !file.startsWith( packageName ) )
{
unpackagedFiles.add( file );
@@ -302,10 +292,10 @@ public class DefaultArchetypeFilesResolv
return common;
}
- private List resolveFiles( File basedir, List languages )
+ private List<String> resolveFiles( File basedir, List<String> languages )
throws IOException
{
- String[] languagesArray = (String[]) languages.toArray( new String[languages.size()] );
+ String[] languagesArray = languages.toArray( new String[languages.size()] );
String[] languagesPathesArray = new String[languagesArray.length];
for ( int i = 0; i < languagesArray.length; i++ )
{
@@ -313,22 +303,19 @@ public class DefaultArchetypeFilesResolv
}
String excludes = "target";
- Iterator defaultExcludes = Arrays.asList( ListScanner.DEFAULTEXCLUDES ).iterator();
- while ( defaultExcludes.hasNext() )
+ for ( String defaultExclude : Arrays.asList( ListScanner.DEFAULTEXCLUDES ) )
{
- excludes += "," + (String) defaultExcludes.next() + "/**";
+ excludes += "," + defaultExclude + "/**";
}
- List absoluteFiles = FileUtils.getFiles( basedir, StringUtils.join( languagesPathesArray, "," ), excludes );
+ List<File> absoluteFiles = FileUtils.getFiles( basedir, StringUtils.join( languagesPathesArray, "," ), excludes );
getLogger().debug( "Found " + absoluteFiles.size() + " potential archetype files" );
- List files = new ArrayList( absoluteFiles.size() );
+ List<String> files = new ArrayList<String>( absoluteFiles.size() );
- Iterator filesIterator = absoluteFiles.iterator();
- while ( filesIterator.hasNext() )
+ for ( File file : absoluteFiles )
{
- File file = (File) filesIterator.next();
String filePath = StringUtils.prechomp( file.getAbsolutePath(), basedir.getAbsolutePath() + File.separator );
String minusSrc = StringUtils.prechomp( filePath, "src" + File.separator );
@@ -351,14 +338,11 @@ public class DefaultArchetypeFilesResolv
return files;
}
- private String resolvePackage( List files )
+ private String resolvePackage( List<String> files )
{
String packageName = null;
- Iterator minusLanguageIterator = files.iterator();
- while ( minusLanguageIterator.hasNext() )
+ for ( String minusLanguage : files )
{
- String minusLanguage = (String) minusLanguageIterator.next();
-
String filePackage;
if ( minusLanguage.indexOf( "/" ) >= 0 )
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java Sun Jun 13 22:01:28 2010
@@ -60,10 +60,10 @@ public class DefaultArchetypeRegistryMan
*/
private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
- public List getFilteredExtensions( String archetypeFilteredExtentions, File archetypeRegistryFile )
+ public List<String> getFilteredExtensions( String archetypeFilteredExtentions, File archetypeRegistryFile )
throws IOException
{
- List filteredExtensions = new ArrayList();
+ List<String> filteredExtensions = new ArrayList<String>();
if ( StringUtils.isNotEmpty( archetypeFilteredExtentions ) )
{
@@ -93,10 +93,10 @@ public class DefaultArchetypeRegistryMan
return filteredExtensions;
}
- public List getLanguages( String archetypeLanguages, File archetypeRegistryFile )
+ public List<String> getLanguages( String archetypeLanguages, File archetypeRegistryFile )
throws IOException
{
- List languages = new ArrayList();
+ List<String> languages = new ArrayList<String>();
if ( StringUtils.isNotEmpty( archetypeLanguages ) )
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java Sun Jun 13 22:01:28 2010
@@ -108,9 +108,9 @@ public class DefaultPomManager
project.addText( "\n" );
}
// TODO: change to while loop
- for ( Iterator i = modules.elementIterator( "module" ); i.hasNext() && !found; )
+ for ( Iterator<Element> i = modules.elementIterator( "module" ); i.hasNext() && !found; )
{
- Element module = (Element) i.next();
+ Element module = i.next();
if ( module.getText().equals( artifactId ) )
{
found = true;
@@ -119,9 +119,9 @@ public class DefaultPomManager
if ( !found )
{
Node lastTextNode = null;
- for ( Iterator i = modules.nodeIterator(); i.hasNext(); )
+ for ( Iterator<Node> i = modules.nodeIterator(); i.hasNext(); )
{
- Node node = (Node) i.next();
+ Node node = i.next();
if ( node.getNodeType() == Node.ELEMENT_NODE )
{
lastTextNode = null;
@@ -347,18 +347,12 @@ public class DefaultPomManager
}
}
- private Map createDependencyMap( List dependencies )
+ private Map<String, Dependency> createDependencyMap( List<Dependency> dependencies )
{
- Map dependencyMap = new HashMap();
- Iterator dependenciesIterator = dependencies.iterator();
- while ( dependenciesIterator.hasNext() )
- {
- Dependency dependency = (Dependency) dependenciesIterator.next();
-
- dependencyMap.put(
- dependency.getManagementKey(),
- dependency
- );
+ Map<String, Dependency> dependencyMap = new HashMap<String, Dependency>();
+ for ( Dependency dependency : dependencies )
+ {
+ dependencyMap.put( dependency.getManagementKey(), dependency );
}
return dependencyMap;
@@ -379,31 +373,27 @@ public class DefaultPomManager
private void mergeProfiles( Model model, Model generatedModel )
{
- List generatedProfiles = generatedModel.getProfiles();
+ List<Profile> generatedProfiles = generatedModel.getProfiles();
if ( generatedProfiles != null && generatedProfiles.size() > 0 )
{
- List modelProfiles = model.getProfiles();
- Map modelProfileIdMap = new HashMap();
+ List<Profile> modelProfiles = model.getProfiles();
+ Map<String,Profile> modelProfileIdMap = new HashMap<String,Profile>();
if ( modelProfiles == null )
{
- modelProfiles = new ArrayList();
+ modelProfiles = new ArrayList<Profile>();
model.setProfiles( modelProfiles );
}
else if ( modelProfiles.size() > 0 )
{
// add profile ids from the model for later lookups to the modelProfileIds set
- Iterator modelProfilesIterator = modelProfiles.iterator();
- while ( modelProfilesIterator.hasNext() )
+ for ( Profile modelProfile : modelProfiles )
{
- Profile modelProfile = (Profile) modelProfilesIterator.next();
modelProfileIdMap.put( modelProfile.getId(), modelProfile );
}
}
- Iterator generatedProfilesIterator = generatedProfiles.iterator();
- while ( generatedProfilesIterator.hasNext() )
+ for ( Profile generatedProfile : generatedProfiles )
{
- Profile generatedProfile = (Profile) generatedProfilesIterator.next();
String generatedProfileId = generatedProfile.getId();
if ( !modelProfileIdMap.containsKey( generatedProfileId ) )
{
@@ -436,19 +426,14 @@ public class DefaultPomManager
{
// ModelBase can be a Model or a Profile...
- Map dependenciesByIds = createDependencyMap( model.getDependencies() );
- Map generatedDependenciesByIds = createDependencyMap( generatedModel.getDependencies() );
+ Map<String, Dependency> dependenciesByIds = createDependencyMap( model.getDependencies() );
+ Map<String, Dependency> generatedDependenciesByIds = createDependencyMap( generatedModel.getDependencies() );
- Iterator generatedDependencyIds = generatedDependenciesByIds.keySet().iterator();
- while ( generatedDependencyIds.hasNext() )
+ for ( String generatedDependencyId : generatedDependenciesByIds.keySet() )
{
- String generatedDependencyId = (String) generatedDependencyIds.next();
-
if ( !dependenciesByIds.containsKey( generatedDependencyId ) )
{
- model.addDependency(
- (Dependency) generatedDependenciesByIds.get( generatedDependencyId )
- );
+ model.addDependency( (Dependency) generatedDependenciesByIds.get( generatedDependencyId ) );
}
else
{
@@ -471,20 +456,15 @@ public class DefaultPomManager
model.setReporting( new Reporting() );
}
- Map reportPluginsByIds = model.getReporting().getReportPluginsAsMap();
- Map generatedReportPluginsByIds =
+ Map<String, ReportPlugin> reportPluginsByIds = model.getReporting().getReportPluginsAsMap();
+ Map<String, ReportPlugin> generatedReportPluginsByIds =
generatedModel.getReporting().getReportPluginsAsMap();
- Iterator generatedReportPluginsIds = generatedReportPluginsByIds.keySet().iterator();
- while ( generatedReportPluginsIds.hasNext() )
+ for ( String generatedReportPluginsId : generatedReportPluginsByIds.keySet() )
{
- String generatedReportPluginsId = (String) generatedReportPluginsIds.next();
-
if ( !reportPluginsByIds.containsKey( generatedReportPluginsId ) )
{
- model.getReporting().addPlugin(
- (ReportPlugin) generatedReportPluginsByIds.get( generatedReportPluginsId )
- );
+ model.getReporting().addPlugin( generatedReportPluginsByIds.get( generatedReportPluginsId ) );
}
else
{
@@ -496,13 +476,11 @@ public class DefaultPomManager
private void mergeBuildPlugins( BuildBase modelBuild, BuildBase generatedModelBuild )
{
- Map pluginsByIds = modelBuild.getPluginsAsMap();
- List generatedPlugins = generatedModelBuild.getPlugins();
+ Map<String, Plugin> pluginsByIds = modelBuild.getPluginsAsMap();
+ List<Plugin> generatedPlugins = generatedModelBuild.getPlugins();
- Iterator generatedPluginsIterator = generatedPlugins.iterator();
- while ( generatedPluginsIterator.hasNext() )
+ for ( Plugin generatedPlugin : generatedPlugins )
{
- Plugin generatedPlugin = (Plugin) generatedPluginsIterator.next();
String generatedPluginsId = generatedPlugin.getKey();
if ( !pluginsByIds.containsKey( generatedPluginsId ) )
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java Sun Jun 13 22:01:28 2010
@@ -24,7 +24,6 @@ import org.codehaus.plexus.util.StringUt
import java.io.File;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -340,9 +339,9 @@ public class ListScanner
* files should be excluded. If a non-<code>null</code> list is given, all
* elements must be non-<code>null</code>.
*/
- public void setExcludes( List excludesList )
+ public void setExcludes( List<String> excludesList )
{
- String[] excludes = (String[]) excludesList.toArray( new String[excludesList.size()] );
+ String[] excludes = excludesList.toArray( new String[excludesList.size()] );
if ( excludes == null )
{
this.excludes = null;
@@ -376,9 +375,9 @@ public class ListScanner
* files should be included. If a non-<code>null</code> list is given, all
* elements must be non-<code>null</code>.
*/
- public void setIncludes( List includesList )
+ public void setIncludes( List<String> includesList )
{
- String[] includes = (String[]) includesList.toArray( new String[includesList.size()] );
+ String[] includes = includesList.toArray( new String[includesList.size()] );
if ( includes == null )
{
this.includes = null;
@@ -408,7 +407,7 @@ public class ListScanner
* @throws IllegalStateException if the base directory was set incorrectly (i.e. if it is
* <code>null</code>, doesn't exist, or isn't a directory).
*/
- public List scan( List files )
+ public List<String> scan( List<String> files )
throws
IllegalStateException
{
@@ -432,12 +431,10 @@ public class ListScanner
excludes = new String[0];
}
- List result = new ArrayList();
+ List<String> result = new ArrayList<String>();
- Iterator iterator = files.iterator();
- while ( iterator.hasNext() )
+ for ( String fileName : files )
{
- String fileName = (String) iterator.next();
// System.err.println("Checking "+(isIncluded ( fileName )?"I":"-")+(isExcluded ( fileName )?"E":"-")+fileName);
if ( isIncluded( fileName ) && !isExcluded( fileName ) )
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java Sun Jun 13 22:01:28 2010
@@ -40,16 +40,16 @@ class NamespaceStack
"@(#) $RCSfile: NamespaceStack.java,v $ $Revision: 1.13 $ $Date: 2004/02/06 09:28:32 $ $Name: jdom_1_0 $";
/** The prefixes available */
- private Stack prefixes;
+ private Stack<String> prefixes;
/** The URIs available */
- private Stack uris;
+ private Stack<String> uris;
/** This creates the needed storage. */
NamespaceStack()
{
- prefixes = new Stack();
- uris = new Stack();
+ prefixes = new Stack<String>();
+ uris = new Stack<String>();
}
/**
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java?rev=954321&r1=954320&r2=954321&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java Sun Jun 13 22:01:28 2010
@@ -45,14 +45,13 @@ public class PathUtils
file = convertPathForOS( file );
String[] fileAsArray = StringUtils.split( file, File.separator );
- List directoryAsArray = new ArrayList();
+ List<String> directoryAsArray = new ArrayList<String>();
for ( int i = 0; ( i < level ) && ( i < ( fileAsArray.length - 1 ) ); i++ )
{
directoryAsArray.add( fileAsArray[i] );
}
- return
- StringUtils.join( directoryAsArray.toArray( new String[directoryAsArray.size()] ), File.separator );
+ return StringUtils.join( directoryAsArray.iterator(), File.separator );
}
}