You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/24 16:23:45 UTC
svn commit: r797479 -
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Author: bentmann
Date: Fri Jul 24 14:23:45 2009
New Revision: 797479
URL: http://svn.apache.org/viewvc?rev=797479&view=rev
Log:
o Refactored code
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=797479&r1=797478&r2=797479&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Fri Jul 24 14:23:45 2009
@@ -122,14 +122,7 @@
private void injectDefaultRepositories( MavenExecutionRequest request )
throws MavenEmbedderException
{
- Set<String> definedRepositories = new HashSet<String>();
- if ( request.getRemoteRepositories() != null )
- {
- for ( ArtifactRepository repository : request.getRemoteRepositories() )
- {
- definedRepositories.add( repository.getId() );
- }
- }
+ Set<String> definedRepositories = getRepoIds( request.getRemoteRepositories() );
if ( !definedRepositories.contains( RepositorySystem.DEFAULT_REMOTE_REPO_ID ) )
{
@@ -147,14 +140,7 @@
private void injectDefaultPluginRepositories( MavenExecutionRequest request )
throws MavenEmbedderException
{
- Set<String> definedRepositories = new HashSet<String>();
- if ( request.getPluginArtifactRepositories() != null )
- {
- for ( ArtifactRepository repository : request.getPluginArtifactRepositories() )
- {
- definedRepositories.add( repository.getId() );
- }
- }
+ Set<String> definedRepositories = getRepoIds( request.getPluginArtifactRepositories() );
if ( !definedRepositories.contains( RepositorySystem.DEFAULT_REMOTE_REPO_ID ) )
{
@@ -169,6 +155,21 @@
}
}
+ private Set<String> getRepoIds( List<ArtifactRepository> repositories )
+ {
+ Set<String> repoIds = new HashSet<String>();
+
+ if ( repositories != null )
+ {
+ for ( ArtifactRepository repository : repositories )
+ {
+ repoIds.add( repository.getId() );
+ }
+ }
+
+ return repoIds;
+ }
+
private void processRepositoriesInSettings( MavenExecutionRequest request )
throws MavenEmbedderException
{