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/16 19:37:05 UTC
svn commit: r986071 -
/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
Author: hboutemy
Date: Mon Aug 16 17:37:05 2010
New Revision: 986071
URL: http://svn.apache.org/viewvc?rev=986071&view=rev
Log:
code simplification
Modified:
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/DefaultArchetypeSelector.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java?rev=986071&r1=986070&r2=986071&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 Mon Aug 16 17:37:05 2010
@@ -89,7 +89,7 @@ public class DefaultArchetypeSelector
{
found = true;
- Archetype foundArchetype = (Archetype) catalog.get( catalog.indexOf( example ) );
+ Archetype foundArchetype = catalog.get( catalog.indexOf( example ) );
definition.setName( foundArchetype.getArtifactId() );
if ( StringUtils.isNotEmpty( foundArchetype.getRepository() ) )
{
@@ -191,32 +191,29 @@ public class DefaultArchetypeSelector
definition.setArtifactId( DEFAULT_ARCHETYPE_ARTIFACTID );
}
- if ( interactiveMode.booleanValue() )
+ if ( interactiveMode.booleanValue() && ( archetypes.size() > 0 ) )
{
- if ( archetypes.size() > 0 )
- {
- Archetype selectedArchetype = archetypeSelectionQueryer.selectArchetype( archetypes, definition );
+ Archetype selectedArchetype = archetypeSelectionQueryer.selectArchetype( archetypes, definition );
- definition.setGroupId( selectedArchetype.getGroupId() );
- definition.setArtifactId( selectedArchetype.getArtifactId() );
- definition.setVersion( selectedArchetype.getVersion() );
- definition.setName( selectedArchetype.getArtifactId() );
- String catalogKey = getCatalogKey( archetypes, selectedArchetype );
- String[] keySplitted = catalogKey.split( ":", 2 );
- if ( StringUtils.isNotEmpty( selectedArchetype.getRepository() ) )
- {
- definition.setRepository( selectedArchetype.getRepository() );
- }
- else if ( keySplitted.length > 1 )
- {
- int lastIndex = catalogKey.lastIndexOf( "/" );
- String catalogBase =
- catalogKey.substring( 0, ( lastIndex > 7 ? lastIndex : catalogKey.length() ) );
- definition.setRepository( catalogBase );
- }
- String goals = StringUtils.join( selectedArchetype.getGoals().iterator(), "," );
- definition.setGoals( goals );
+ definition.setGroupId( selectedArchetype.getGroupId() );
+ definition.setArtifactId( selectedArchetype.getArtifactId() );
+ definition.setVersion( selectedArchetype.getVersion() );
+ definition.setName( selectedArchetype.getArtifactId() );
+ String catalogKey = getCatalogKey( archetypes, selectedArchetype );
+ String[] keySplitted = catalogKey.split( ":", 2 );
+ if ( StringUtils.isNotEmpty( selectedArchetype.getRepository() ) )
+ {
+ definition.setRepository( selectedArchetype.getRepository() );
+ }
+ else if ( keySplitted.length > 1 )
+ {
+ int lastIndex = catalogKey.lastIndexOf( "/" );
+ String catalogBase =
+ catalogKey.substring( 0, ( lastIndex > 7 ? lastIndex : catalogKey.length() ) );
+ definition.setRepository( catalogBase );
}
+ String goals = StringUtils.join( selectedArchetype.getGoals().iterator(), "," );
+ definition.setGoals( goals );
}
}