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 2011/08/30 18:20:56 UTC
svn commit: r1163274 -
/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
Author: hboutemy
Date: Tue Aug 30 16:20:56 2011
New Revision: 1163274
URL: http://svn.apache.org/viewvc?rev=1163274&view=rev
Log:
[ARCHETYPE-349] code simplification
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java?rev=1163274&r1=1163273&r2=1163274&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java (original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java Tue Aug 30 16:20:56 2011
@@ -130,22 +130,22 @@ public class DefaultArchetypeFactory
if ( properties.getProperty( key ) != null )
{
+ // using value defined in properties, which overrides any default
String value = properties.getProperty( key );
configuration.setProperty( key, value );
getLogger().debug( "Setting property " + key + "=" + value );
}
- else if ( properties.getProperty( key, defaultValue ) != null && !containsInnerProperty( defaultValue ) )
+ else if ( ( defaultValue != null ) && !containsInnerProperty( defaultValue ) )
{
- String value = properties.getProperty( key, defaultValue );
- configuration.setProperty( key, value );
- getLogger().debug( "Setting property " + key + "=" + value );
+ // using default value
+ configuration.setProperty( key, defaultValue );
+ getLogger().debug( "Setting property " + key + "=" + defaultValue );
}
- if ( requiredProperty.getDefaultValue() != null )
+ if ( defaultValue != null )
{
- String value = requiredProperty.getDefaultValue();
- configuration.setDefaultProperty( key, value );
- getLogger().debug( "Setting defaultProperty " + key + "=" + value );
+ configuration.setDefaultProperty( key, defaultValue );
+ getLogger().debug( "Setting defaultProperty " + key + "=" + defaultValue );
}
}