formatting

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@542736 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/java/org/apache/maven/lifecycle/binding/LegacyLifecycleMappingParser.java

@@ -17,8 +17,8 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 /**
- * Responsible for parsing the Maven-2.0.x lifecycle-definition syntaxes. This class is partitioned
+ * Responsible for parsing the Maven-2.0.x lifecycle-definition syntaxes. This class is partitioned from the others,
- * from the others, because this syntax should be deprecated and removed from support, eventually.
+ * because this syntax should be deprecated and removed from support, eventually.
  * 
  * @author jdcasey
  * 
@@ -30,7 +30,7 @@ public class LegacyLifecycleMappingParser
 
     private MojoBindingFactory mojoBindingFactory;
 
-    public LifecycleBindings parseDefaultMappings( List lifecycles )
+    public LifecycleBindings parseDefaultMappings( final List lifecycles )
         throws LifecycleSpecificationException
     {
         LifecycleBindings bindings = new LifecycleBindings();
@@ -64,14 +64,17 @@ public class LegacyLifecycleMappingParser
         return bindings;
     }
 
-    public LifecycleBindings parseMappings( LifecycleMapping mapping, String packaging )
+    public LifecycleBindings parseMappings( final LifecycleMapping mapping, final String packaging )
         throws LifecycleSpecificationException
     {
         LifecycleBindings bindings = new LifecycleBindings();
         bindings.setPackaging( packaging );
 
         bindings.setCleanBinding( parseCleanBindings( mapping.getPhases( "clean" ), mapping.getOptionalMojos( "clean" ) ) );
-        bindings.setBuildBinding( parseBuildBindings( mapping.getPhases( "default" ), mapping.getOptionalMojos( "default" ) ) );
+
+        bindings.setBuildBinding( parseBuildBindings( mapping.getPhases( "default" ),
+                                                      mapping.getOptionalMojos( "default" ) ) );
+
         bindings.setSiteBinding( parseSiteBindings( mapping.getPhases( "site" ), mapping.getOptionalMojos( "site" ) ) );
 
         LifecycleUtils.setOrigin( bindings, "packaging: " + packaging );
@@ -79,7 +82,7 @@ public class LegacyLifecycleMappingParser
         return bindings;
     }
 
-    private BuildBinding parseBuildBindings( Map phases, List optionalKeys )
+    private BuildBinding parseBuildBindings( final Map phases, final List optionalKeys )
         throws LifecycleSpecificationException
     {
         BuildBinding binding = new BuildBinding();
@@ -87,34 +90,63 @@ public class LegacyLifecycleMappingParser
         if ( phases != null )
         {
             binding.setValidate( parsePhaseBindings( (String) phases.get( "validate" ), optionalKeys ) );
+
             binding.setInitialize( parsePhaseBindings( (String) phases.get( "initialize" ), optionalKeys ) );
+
             binding.setGenerateSources( parsePhaseBindings( (String) phases.get( "generate-sources" ), optionalKeys ) );
+
             binding.setProcessSources( parsePhaseBindings( (String) phases.get( "process-sources" ), optionalKeys ) );
+
             binding.setGenerateResources( parsePhaseBindings( (String) phases.get( "generate-resources" ), optionalKeys ) );
+
             binding.setProcessResources( parsePhaseBindings( (String) phases.get( "process-resources" ), optionalKeys ) );
+
             binding.setCompile( parsePhaseBindings( (String) phases.get( "compile" ), optionalKeys ) );
+
             binding.setProcessClasses( parsePhaseBindings( (String) phases.get( "process-classes" ), optionalKeys ) );
-            binding.setGenerateTestSources( parsePhaseBindings( (String) phases.get( "generate-test-sources" ), optionalKeys ) );
+
-            binding.setProcessTestSources( parsePhaseBindings( (String) phases.get( "process-test-sources" ), optionalKeys ) );
+            binding.setGenerateTestSources( parsePhaseBindings( (String) phases.get( "generate-test-sources" ),
-            binding.setGenerateTestResources( parsePhaseBindings( (String) phases.get( "generate-test-resources" ), optionalKeys ) );
+                                                                optionalKeys ) );
-            binding.setProcessTestResources( parsePhaseBindings( (String) phases.get( "process-test-resources" ), optionalKeys ) );
+
+            binding.setProcessTestSources( parsePhaseBindings( (String) phases.get( "process-test-sources" ),
+                                                               optionalKeys ) );
+
+            binding.setGenerateTestResources( parsePhaseBindings( (String) phases.get( "generate-test-resources" ),
+                                                                  optionalKeys ) );
+
+            binding.setProcessTestResources( parsePhaseBindings( (String) phases.get( "process-test-resources" ),
+                                                                 optionalKeys ) );
+
             binding.setTestCompile( parsePhaseBindings( (String) phases.get( "test-compile" ), optionalKeys ) );
-            binding.setProcessTestClasses( parsePhaseBindings( (String) phases.get( "process-test-classes" ), optionalKeys ) );
+
+            binding.setProcessTestClasses( parsePhaseBindings( (String) phases.get( "process-test-classes" ),
+                                                               optionalKeys ) );
+
             binding.setTest( parsePhaseBindings( (String) phases.get( "test" ), optionalKeys ) );
+
             binding.setPreparePackage( parsePhaseBindings( (String) phases.get( "prepare-package" ), optionalKeys ) );
+
             binding.setCreatePackage( parsePhaseBindings( (String) phases.get( "package" ), optionalKeys ) );
-            binding.setPreIntegrationTest( parsePhaseBindings( (String) phases.get( "pre-integration-test" ), optionalKeys ) );
+
+            binding.setPreIntegrationTest( parsePhaseBindings( (String) phases.get( "pre-integration-test" ),
+                                                               optionalKeys ) );
+
             binding.setIntegrationTest( parsePhaseBindings( (String) phases.get( "integration-test" ), optionalKeys ) );
-            binding.setPostIntegrationTest( parsePhaseBindings( (String) phases.get( "post-integration-test" ), optionalKeys ) );
+
+            binding.setPostIntegrationTest( parsePhaseBindings( (String) phases.get( "post-integration-test" ),
+                                                                optionalKeys ) );
+
             binding.setVerify( parsePhaseBindings( (String) phases.get( "verify" ), optionalKeys ) );
+
             binding.setInstall( parsePhaseBindings( (String) phases.get( "install" ), optionalKeys ) );
+
             binding.setDeploy( parsePhaseBindings( (String) phases.get( "deploy" ), optionalKeys ) );
         }
 
         return binding;
     }
 
-    private CleanBinding parseCleanBindings( Map phaseMappings, List optionalKeys )
+    private CleanBinding parseCleanBindings( final Map phaseMappings, final List optionalKeys )
         throws LifecycleSpecificationException
     {
         CleanBinding binding = new CleanBinding();
@@ -122,14 +154,16 @@ public class LegacyLifecycleMappingParser
         if ( phaseMappings != null )
         {
             binding.setPreClean( parsePhaseBindings( (String) phaseMappings.get( "pre-clean" ), optionalKeys ) );
+
             binding.setClean( parsePhaseBindings( (String) phaseMappings.get( "clean" ), optionalKeys ) );
+
             binding.setPostClean( parsePhaseBindings( (String) phaseMappings.get( "post-clean" ), optionalKeys ) );
         }
 
         return binding;
     }
 
-    private Phase parsePhaseBindings( String bindingList, List optionalKeys )
+    private Phase parsePhaseBindings( final String bindingList, final List optionalKeys )
         throws LifecycleSpecificationException
     {
         Phase phase = new Phase();
@@ -141,7 +175,7 @@ public class LegacyLifecycleMappingParser
                 String rawBinding = tok.nextToken().trim();
 
                 MojoBinding binding = mojoBindingFactory.parseMojoBinding( rawBinding );
-                if ( optionalKeys != null && optionalKeys.contains( rawBinding ) )
+                if ( ( optionalKeys != null ) && optionalKeys.contains( rawBinding ) )
                 {
                     binding.setOptional( true );
                 }
@@ -158,7 +192,7 @@ public class LegacyLifecycleMappingParser
         return phase;
     }
 
-    private SiteBinding parseSiteBindings( Map phases, List optionalKeys )
+    private SiteBinding parseSiteBindings( final Map phases, final List optionalKeys )
         throws LifecycleSpecificationException
     {
         SiteBinding binding = new SiteBinding();
@@ -166,8 +200,11 @@ public class LegacyLifecycleMappingParser
         if ( phases != null )
         {
             binding.setPreSite( parsePhaseBindings( (String) phases.get( "pre-site" ), optionalKeys ) );
+
             binding.setSite( parsePhaseBindings( (String) phases.get( "site" ), optionalKeys ) );
+
             binding.setPostSite( parsePhaseBindings( (String) phases.get( "post-site" ), optionalKeys ) );
+
             binding.setSiteDeploy( parsePhaseBindings( (String) phases.get( "site-deploy" ), optionalKeys ) );
         }