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/08/21 19:25:26 UTC
svn commit: r987797 - in
/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui:
ArchetypeDefinition.java DefaultArchetypeSelector.java
Author: hboutemy
Date: Sat Aug 21 17:25:25 2010
New Revision: 987797
URL: http://svn.apache.org/viewvc?rev=987797&view=rev
Log:
code cleanup
Modified:
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java?rev=987797&r1=987796&r2=987797&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java Sat Aug 21 17:25:25 2010
@@ -139,4 +139,21 @@ public class ArchetypeDefinition
return StringUtils.isNotEmpty( getVersion() );
}
+ public void updateRequest( ArchetypeGenerationRequest request )
+ {
+ request.setArchetypeGroupId( getGroupId() );
+
+ request.setArchetypeArtifactId( getArtifactId() );
+
+ request.setArchetypeVersion( getVersion() );
+
+ request.setArchetypeGoals( getGoals() );
+
+ request.setArchetypeName( getName() );
+
+ if ( StringUtils.isNotEmpty( getRepository() ) )
+ {
+ request.setArchetypeRepository( getRepository() );
+ }
+ }
}
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java?rev=987797&r1=987796&r2=987797&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java Sat Aug 21 17:25:25 2010
@@ -153,20 +153,8 @@ public class DefaultArchetypeSelector
throw new ArchetypeSelectionFailure( "No valid archetypes could be found to choose." );
}
- request.setArchetypeGroupId( definition.getGroupId() );
-
- request.setArchetypeArtifactId( definition.getArtifactId() );
-
- request.setArchetypeVersion( definition.getVersion() );
-
- request.setArchetypeGoals( definition.getGoals() );
-
- request.setArchetypeName( definition.getName() );
-
- if ( StringUtils.isNotEmpty( definition.getRepository() ) )
- {
- request.setArchetypeRepository( definition.getRepository() );
- }
+ // finally update the request with gathered information
+ definition.updateRequest( request );
}
private Map<String, List<Archetype>> getArchetypesByCatalog( String catalogs )