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/09/11 23:49:45 UTC
svn commit: r996212 -
/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java
Author: hboutemy
Date: Sat Sep 11 21:49:44 2010
New Revision: 996212
URL: http://svn.apache.org/viewvc?rev=996212&view=rev
Log:
[ARCHETYPE-324] avoid "(null)" message when there is no description for an archetype
Modified:
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java?rev=996212&r1=996211&r2=996212&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java Sat Sep 11 21:49:44 2010
@@ -52,34 +52,6 @@ public class DefaultArchetypeSelectionQu
return "Y".equalsIgnoreCase( answer );
}
- public Archetype selectArchetype( List<Archetype> archetypes )
- throws PrompterException
- {
- StringBuilder query = new StringBuilder( "Choose archetype:\n" );
-
- Map<String, Archetype> answerMap = new HashMap<String, Archetype>();
- List<String> answers = new ArrayList<String>();
- int counter = 1;
-
- for ( Archetype archetype : archetypes )
- {
- String mapKey = String.valueOf( counter );
- answerMap.put( mapKey, archetype );
- answers.add( mapKey );
-
- query.append( mapKey + ": " + archetype.getArtifactId() + " ("
- + archetype.getDescription() + ":" + archetype.getArtifactId() + ")\n" );
-
- counter++;
- }
-
- query.append( "Choose a number: " );
-
- String answer = prompter.prompt( query.toString(), answers );
-
- return answerMap.get( answer );
- }
-
public Archetype selectArchetype( Map<String, List<Archetype>> catalogs )
throws PrompterException
{
@@ -119,8 +91,14 @@ public class DefaultArchetypeSelectionQu
archetypeAnswerMap.put( mapKey, archetypeVersions );
reversedArchetypeAnswerMap.put( archetypeKey, mapKey );
+ String description = archetype.getDescription();
+ if ( description == null )
+ {
+ description = "-";
+ }
+
query.append( mapKey + ": " + catalog + " -> " + archetype.getArtifactId() + " ("
- + archetype.getDescription() + ")\n" );
+ + description + ")\n" );
answers.add( mapKey );