svn commit: r1053926 - /maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java

[hboutemy]

Author: hboutemy
Date: Thu Dec 30 16:17:18 2010
New Revision: 1053926

URL: http://svn.apache.org/viewvc?rev=1053926&view=rev
Log:
code simplification

Modified:
    
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java

Modified: 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java?rev=1053926&r1=1053925&r2=1053926&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
 Thu Dec 30 16:17:18 2010
@@ -139,27 +139,20 @@ public class DefaultOldArchetype
         // 
---------------------------------------------------------------------
         if ( getLogger().isInfoEnabled() )
         {
-            if ( !parameters.isEmpty() )
-            {
-                getLogger().info( 
"----------------------------------------------------------------------------" 
);
+            getLogger().info( 
"----------------------------------------------------------------------------" 
);
 
-                getLogger().info( "Using following parameters for creating 
project from Old (1.x) Archetype: "
-                                      + request.getArchetypeArtifactId() + ":" 
+ request.getArchetypeVersion() );
+            getLogger().info( "Using following parameters for creating project 
from Old (1.x) Archetype: "
+                                  + request.getArchetypeArtifactId() + ":" + 
request.getArchetypeVersion() );
 
-                getLogger().info( 
"----------------------------------------------------------------------------" 
);
+            getLogger().info( 
"----------------------------------------------------------------------------" 
);
 
-                for ( Map.Entry<String, String> entry : parameters.entrySet() )
-                {
-                    String parameterName = entry.getKey();
+            for ( Map.Entry<String, String> entry : parameters.entrySet() )
+            {
+                String parameterName = entry.getKey();
 
-                    String parameterValue = entry.getValue();
+                String parameterValue = entry.getValue();
 
-                    getLogger().info( "Parameter: " + parameterName + ", 
Value: " + parameterValue );
-                }
-            }
-            else
-            {
-                getLogger().info( "No Parameters found for creating project 
from Old (1.x) Archetype" );
+                getLogger().info( "Parameter: " + parameterName + ", Value: " 
+ parameterValue );
             }
         }
 
@@ -188,12 +181,11 @@ public class DefaultOldArchetype
             if ( is == null )
             {
                 is = getStream( ARCHETYPE_OLD_DESCRIPTOR, archetypeJarLoader );
+            }
 
-                if ( is == null )
-                {
-                    throw new ArchetypeDescriptorException(
-                        "The " + ARCHETYPE_DESCRIPTOR + " descriptor cannot be 
found." );
-                }
+            if ( is == null )
+            {
+                throw new ArchetypeDescriptorException( "The " + 
ARCHETYPE_DESCRIPTOR + " descriptor cannot be found." );
             }
 
             descriptor = builder.build( new InputStreamReader( is ) );