svn commit: r1500534 - /maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java

[rfscholte]

Author: rfscholte
Date: Sun Jul  7 20:35:29 2013
New Revision: 1500534

URL: http://svn.apache.org/r1500534
Log:
Refactor code

Modified:
    
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java

Modified: 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java?rev=1500534&r1=1500533&r2=1500534&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
 (original)
+++ 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
 Sun Jul  7 20:35:29 2013
@@ -1,7 +1,6 @@
 package org.apache.maven.shared.project.utils;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Collections;
@@ -122,23 +121,10 @@ public final class ProjectUtils
         {
             File moduleFile = getModuleFile( project, module );
 
-            FileReader moduleReader = null; 
-            
+            Model model = null;
             try
             {
-                moduleReader = new FileReader( moduleFile );
-                
-                Model model = reader.read( moduleReader );
-                
-                if ( model.getParent() != null && 
model.getParent().getId().equals( project.getId() ) )
-                {
-                    return false;
-                }
-            }
-            catch ( FileNotFoundException e )
-            {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                model = readModel( reader, moduleFile );
             }
             catch ( IOException e )
             {
@@ -150,15 +136,36 @@ public final class ProjectUtils
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }
-            finally
+
+            if ( model.getParent() != null && 
model.getParent().getId().equals( project.getId() ) )
             {
-                IOUtil.close( moduleReader );
+                return false;
             }
-            
+
         }
         return true;
     }
 
+    private static Model readModel( MavenXpp3Reader reader, File moduleFile ) 
throws IOException, XmlPullParserException
+    {
+        FileReader moduleReader = null;
+        
+        Model model = null;
+        
+        try
+        {
+            moduleReader = new FileReader( moduleFile );
+            
+            model = reader.read( moduleReader );
+        }
+        finally
+        {
+            IOUtil.close( moduleReader );
+        }
+        
+        return model;
+    }
+
     public static File getModuleFile( MavenProject project, String module )
     {
         File moduleFile = new File( project.getBasedir(), module );
@@ -179,21 +186,30 @@ public final class ProjectUtils
      */
     public static Map<String, String> getAllModules( MavenProject project )
     {
-        Map<String, String> modules = new LinkedHashMap<String, String>();
+        Model model = project.getModel();
+        
+        Map<String, String> modules = getAllModules( model );
+        
+        return Collections.unmodifiableMap( modules );
+    }
 
-        for ( String module : project.getModel().getModules() )
+    private static Map<String, String> getAllModules( Model model )
+    {
+        Map<String, String> modules = new LinkedHashMap<String, String>();
+        
+        for ( String module : model.getModules() )
         {
             modules.put( module, "project" ); // id?
         }
 
-        for ( Profile profile : project.getModel().getProfiles() )
+        for ( Profile profile : model.getProfiles() )
         {
             for ( String module : profile.getModules() )
             {
                 modules.put( module, "profile(id:" + profile.getId() + ")" );
             }
         }
-        return Collections.unmodifiableMap( modules );
+        return modules;
     }
     
     // Don't make this method public, it has nothing to do with a MavenProject.