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/04/25 15:38:10 UTC
svn commit: r1096478 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc:
AbstractFixJavadocMojo.java AbstractJavadocMojo.java
TestFixJavadocMojo.java TestJavadocReport.java
Author: hboutemy
Date: Mon Apr 25 13:38:09 2011
New Revision: 1096478
URL: http://svn.apache.org/viewvc?rev=1096478&view=rev
Log:
little code improvements
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=1096478&r1=1096477&r2=1096478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Mon Apr 25 13:38:09 2011
@@ -431,7 +431,7 @@ public abstract class AbstractFixJavadoc
*/
protected List<String> getProjectSourceRoots( MavenProject p )
{
- return ( p.getCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ return ( p.getCompileSourceRoots() == null ? Collections.<String>emptyList()
: new LinkedList<String>( p.getCompileSourceRoots() ) );
}
@@ -443,7 +443,7 @@ public abstract class AbstractFixJavadoc
protected List<String> getCompileClasspathElements( MavenProject p )
throws DependencyResolutionRequiredException
{
- return ( p.getCompileClasspathElements() == null ? Collections.EMPTY_LIST
+ return ( p.getCompileClasspathElements() == null ? Collections.<String>emptyList()
: new LinkedList<String>( p.getCompileClasspathElements() ) );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1096478&r1=1096477&r2=1096478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Mon Apr 25 13:38:09 2011
@@ -43,7 +43,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -1729,8 +1728,8 @@ public abstract class AbstractJavadocMoj
return Collections.emptyList();
}
- return ( p.getExecutionProject().getCompileSourceRoots() == null ? Collections.EMPTY_LIST
- : new LinkedList( p.getExecutionProject().getCompileSourceRoots() ) );
+ return ( p.getExecutionProject().getCompileSourceRoots() == null ? Collections.<String>emptyList()
+ : new LinkedList<String>( p.getExecutionProject().getCompileSourceRoots() ) );
}
/**
@@ -1739,7 +1738,7 @@ public abstract class AbstractJavadocMoj
*/
protected List<Artifact> getProjectArtifacts( MavenProject p )
{
- return ( p.getCompileArtifacts() == null ? Collections.EMPTY_LIST
+ return ( p.getCompileArtifacts() == null ? Collections.<Artifact>emptyList()
: new LinkedList<Artifact>( p.getCompileArtifacts() ) );
}
@@ -2252,16 +2251,7 @@ public abstract class AbstractJavadocMoj
if ( StringUtils.isNotEmpty( subpackages ) && excludedNames != null )
{
// add the excludedpackage names
- for ( Iterator<String> it = excludedNames.iterator(); it.hasNext(); )
- {
- String str = it.next();
- excludeArg = excludeArg + str;
-
- if ( it.hasNext() )
- {
- excludeArg = excludeArg + ":";
- }
- }
+ excludeArg = StringUtils.join( excludedNames.iterator(), ":" );
}
return excludeArg;
@@ -3218,9 +3208,8 @@ public abstract class AbstractJavadocMoj
Map<String, Artifact> compileArtifactMap = new HashMap<String, Artifact>();
populateCompileArtifactMap( compileArtifactMap, artifacts );
- for ( String key : compileArtifactMap.keySet() )
+ for ( Artifact a : compileArtifactMap.values() )
{
- Artifact a = compileArtifactMap.get( key );
path.add( a.getFile().getAbsolutePath() );
}
}
@@ -5052,10 +5041,9 @@ public abstract class AbstractJavadocMoj
}
classPath.clear();
- for ( Iterator<Resource> it = project.getBuild().getResources().iterator(); it.hasNext(); )
+ List<Resource> resources = project.getBuild().getResources();
+ for ( Resource resource : resources )
{
- Resource resource = it.next();
-
classPath.add( resource.getDirectory() );
}
resourceURL = getResource( classPath, inputResourceName );
@@ -5082,10 +5070,9 @@ public abstract class AbstractJavadocMoj
Plugin javadocPlugin = getPlugin( project, pluginId );
if ( javadocPlugin != null && javadocPlugin.getDependencies() != null )
{
- for ( Iterator<Dependency> it = javadocPlugin.getDependencies().iterator(); it.hasNext(); )
+ List<Dependency> dependencies = javadocPlugin.getDependencies();
+ for ( Dependency dependency : dependencies )
{
- Dependency dependency = it.next();
-
JavadocPathArtifact javadocPathArtifact = new JavadocPathArtifact();
javadocPathArtifact.setGroupId( dependency.getGroupId() );
javadocPathArtifact.setArtifactId( dependency.getArtifactId() );
@@ -5231,9 +5218,9 @@ public abstract class AbstractJavadocMoj
getLog().debug( "Trying to add links for modules..." );
Set<String> dependencyArtifactIds = new HashSet<String>();
- for ( Iterator<Artifact> it = project.getDependencyArtifacts().iterator(); it.hasNext(); )
+ final Set<Artifact> dependencyArtifacts = project.getDependencyArtifacts();
+ for ( Artifact artifact : dependencyArtifacts )
{
- Artifact artifact = it.next();
dependencyArtifactIds.add( artifact.getId() );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java?rev=1096478&r1=1096477&r2=1096478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java Mon Apr 25 13:38:09 2011
@@ -45,7 +45,7 @@ public class TestFixJavadocMojo
/** {@inheritDoc} */
protected List<String> getProjectSourceRoots( MavenProject p )
{
- return ( p.getTestCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ return ( p.getTestCompileSourceRoots() == null ? Collections.<String>emptyList()
: new LinkedList<String>( p.getTestCompileSourceRoots() ) );
}
@@ -53,7 +53,7 @@ public class TestFixJavadocMojo
protected List<String> getCompileClasspathElements( MavenProject p )
throws DependencyResolutionRequiredException
{
- return ( p.getTestClasspathElements() == null ? Collections.EMPTY_LIST
+ return ( p.getTestClasspathElements() == null ? Collections.<String>emptyList()
: new LinkedList<String>( p.getTestClasspathElements() ) );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java?rev=1096478&r1=1096477&r2=1096478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java Mon Apr 25 13:38:09 2011
@@ -259,7 +259,7 @@ public class TestJavadocReport
return Collections.emptyList();
}
- return ( p.getTestCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ return ( p.getTestCompileSourceRoots() == null ? Collections.<String>emptyList()
: new LinkedList<String>( p.getTestCompileSourceRoots() ) );
}
@@ -271,14 +271,14 @@ public class TestJavadocReport
return Collections.emptyList();
}
- return ( p.getExecutionProject().getTestCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ return ( p.getExecutionProject().getTestCompileSourceRoots() == null ? Collections.<String>emptyList()
: new LinkedList<String>( p.getExecutionProject().getTestCompileSourceRoots() ) );
}
@Override
protected List<Artifact> getProjectArtifacts( MavenProject p )
{
- return ( p.getTestArtifacts() == null ? Collections.EMPTY_LIST
+ return ( p.getTestArtifacts() == null ? Collections.<Artifact>emptyList()
: new LinkedList<Artifact>( p.getTestArtifacts() ) );
}