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/12/30 23:16:05 UTC
svn commit: r1054011 -
/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
Author: hboutemy
Date: Thu Dec 30 22:16:05 2010
New Revision: 1054011
URL: http://svn.apache.org/viewvc?rev=1054011&view=rev
Log:
code simplification
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java?rev=1054011&r1=1054010&r2=1054011&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java Thu Dec 30 22:16:05 2010
@@ -103,30 +103,27 @@ public class DefaultFilesetArchetypeGene
if ( !isArchetypeConfigured( archetypeDescriptor, request ) )
{
- if ( request.isInteractiveMode () )
+ if ( request.isInteractiveMode() )
{
- throw new ArchetypeNotConfigured ( "No archetype was chosen.", null );
+ throw new ArchetypeNotConfigured( "No archetype was chosen.", null );
}
- else
- {
- StringBuffer exceptionMessage = new StringBuffer();
- exceptionMessage.append( "Archetype " + request.getArchetypeGroupId() + ":"
- + request.getArchetypeArtifactId() + ":" + request.getArchetypeVersion()
- + " is not configured" );
- List<String> missingProperties = new ArrayList<String>( 0 );
- for ( RequiredProperty requiredProperty : archetypeDescriptor.getRequiredProperties() )
+ StringBuffer exceptionMessage =
+ new StringBuffer( "Archetype " + request.getArchetypeGroupId() + ":"
+ + request.getArchetypeArtifactId() + ":" + request.getArchetypeVersion() + " is not configured" );
+
+ List<String> missingProperties = new ArrayList<String>( 0 );
+ for ( RequiredProperty requiredProperty : archetypeDescriptor.getRequiredProperties() )
+ {
+ if ( StringUtils.isEmpty( request.getProperties().getProperty( requiredProperty.getKey() ) ) )
{
- if ( StringUtils.isEmpty( request.getProperties().getProperty( requiredProperty.getKey() ) ) )
- {
- exceptionMessage.append( "\n\tProperty " + requiredProperty.getKey() + " is missing." );
+ exceptionMessage.append( "\n\tProperty " + requiredProperty.getKey() + " is missing." );
- missingProperties.add( requiredProperty.getKey() );
- }
+ missingProperties.add( requiredProperty.getKey() );
}
-
- throw new ArchetypeNotConfigured( exceptionMessage.toString(), missingProperties );
}
+
+ throw new ArchetypeNotConfigured( exceptionMessage.toString(), missingProperties );
}
Context context = prepareVelocityContext( request );