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:02:32 UTC
svn commit: r987791 - in
/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui:
ArchetypeDefinition.java DefaultArchetypeGenerationConfigurator.java
DefaultArchetypeSelector.java
Author: hboutemy
Date: Sat Aug 21 17:02:32 2010
New Revision: 987791
URL: http://svn.apache.org/viewvc?rev=987791&view=rev
Log:
code factorization
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/DefaultArchetypeGenerationConfigurator.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=987791&r1=987790&r2=987791&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:02:32 2010
@@ -19,6 +19,7 @@ package org.apache.maven.archetype.ui;
* under the License.
*/
+import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.codehaus.plexus.util.StringUtils;
public class ArchetypeDefinition
@@ -35,6 +36,17 @@ public class ArchetypeDefinition
private String goals;
+ public ArchetypeDefinition()
+ {
+ }
+
+ public ArchetypeDefinition( ArchetypeGenerationRequest request )
+ {
+ setGroupId( request.getArchetypeGroupId() );
+ setArtifactId( request.getArchetypeArtifactId() );
+ setVersion( request.getArchetypeVersion() );
+ }
+
public String getArtifactId()
{
return this.artifactId;
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java?rev=987791&r1=987790&r2=987791&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java Sat Aug 21 17:02:32 2010
@@ -93,13 +93,7 @@ public class DefaultArchetypeGenerationC
Properties properties = new Properties( executionProperties );
- ArchetypeDefinition ad = new ArchetypeDefinition();
-
- ad.setGroupId( request.getArchetypeGroupId() );
-
- ad.setArtifactId( request.getArchetypeArtifactId() );
-
- ad.setVersion( request.getArchetypeVersion() );
+ ArchetypeDefinition ad = new ArchetypeDefinition( request );
if ( !ad.isDefined() )
{
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=987791&r1=987790&r2=987791&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:02:32 2010
@@ -57,11 +57,7 @@ public class DefaultArchetypeSelector
throws ArchetypeNotDefined, UnknownArchetype, UnknownGroup, IOException, PrompterException,
ArchetypeSelectionFailure
{
- ArchetypeDefinition definition = new ArchetypeDefinition();
-
- definition.setGroupId( request.getArchetypeGroupId() );
- definition.setArtifactId( request.getArchetypeArtifactId() );
- definition.setVersion( request.getArchetypeVersion() );
+ ArchetypeDefinition definition = new ArchetypeDefinition( request );
Map<String, List<Archetype>> archetypes = getArchetypesByCatalog( catalogs );