You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/05/15 23:23:04 UTC
svn commit: r1483096 -
/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
Author: rfscholte
Date: Wed May 15 21:23:04 2013
New Revision: 1483096
URL: http://svn.apache.org/r1483096
Log:
extract getModuleFile, it is already used twice
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=1483096&r1=1483095&r2=1483096&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 Wed May 15 21:23:04 2013
@@ -60,11 +60,7 @@ public final class ProjectUtils
// (not) being a rootProject must never depend on reactor projects or active profiles
for ( String module : getAllModules( parent ).keySet() )
{
- File moduleFile = new File( parent.getBasedir(), module );
- if ( moduleFile.isDirectory() )
- {
- moduleFile = new File( moduleFile, "pom.xml" );
- }
+ File moduleFile = getModuleFile( parent, module );
if ( moduleFile.equals( project.getFile() ) )
{
@@ -116,12 +112,7 @@ public final class ProjectUtils
for ( String module : modules )
{
- File moduleFile = new File( project.getBasedir(), module );
-
- if ( moduleFile.isDirectory() )
- {
- moduleFile = new File( moduleFile, "pom.xml" );
- }
+ File moduleFile = getModuleFile( project, module );
FileReader moduleReader = null;
@@ -159,6 +150,17 @@ public final class ProjectUtils
}
return true;
}
+
+ private static File getModuleFile( MavenProject project, String module )
+ {
+ File moduleFile = new File( project.getBasedir(), module );
+
+ if ( moduleFile.isDirectory() )
+ {
+ moduleFile = new File( moduleFile, "pom.xml" );
+ }
+ return moduleFile;
+ }
/**
* Returns all modules of a project, including does specified in profiles, both active and inactive.