Author: hboutemy
Date: Sat Dec 10 22:31:48 2011
New Revision: 1212905
URL: http://svn.apache.org/viewvc?rev=1212905&view=rev
Log:
more Java 5 use
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java?rev=1212905&r1=1212904&r2=1212905&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
Sat Dec 10 22:31:48 2011
@@ -171,9 +171,8 @@ public abstract class AbstractScriptedMo
String[] relativePaths = scanner.getIncludedFiles();
- for ( int i = 0; i < relativePaths.length; i++ )
+ for ( String relativePath : relativePaths )
{
- String relativePath = relativePaths[i];
File scriptFile = new File( dir, relativePath
).getAbsoluteFile();
if ( scriptFile.isFile() && relativePath.endsWith(
scriptFileExtension ) )
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java?rev=1212905&r1=1212904&r2=1212905&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
Sat Dec 10 22:31:48 2011
@@ -316,7 +316,7 @@ public class PluginDescriptorGenerator
extendedMojoDescriptor.getDependencyCollectionRequired() );
}
- PluginUtils.element( w, "threadSafe", "" +
extendedMojoDescriptor.isThreadSafe() );
+ PluginUtils.element( w, "threadSafe", String.valueOf(
extendedMojoDescriptor.isThreadSafe() ) );
}
//
----------------------------------------------------------------------
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java?rev=1212905&r1=1212904&r2=1212905&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
Sat Dec 10 22:31:48 2011
@@ -91,7 +91,7 @@ public class DefaultMojoScanner
for ( String language : activeExtractorsInternal )
{
- MojoDescriptorExtractor extractor = (MojoDescriptorExtractor)
mojoDescriptorExtractors.get( language );
+ MojoDescriptorExtractor extractor = mojoDescriptorExtractors.get(
language );
if ( extractor == null )
{
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java?rev=1212905&r1=1212904&r2=1212905&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
Sat Dec 10 22:31:48 2011
@@ -62,7 +62,7 @@ public interface MojoScanner
* <p/>
* Only the specified extractors will be used, all others will be skipped.
*
- * @param extractors The names of the sctive extractors. If this parameter
is <code>null</code>,
+ * @param extractors The names of the active extractors. If this parameter
is <code>null</code>,
* all the scanner's extractors are considered active. Set entries that
are <code>null</code> or
* empty ("") will be ignored.
*/
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java?rev=1212905&r1=1212904&r2=1212905&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
Sat Dec 10 22:31:48 2011
@@ -31,7 +31,6 @@ import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Stack;
@@ -113,11 +112,10 @@ public final class PluginUtils
{
w.startElement( "dependencies" );
- for ( @SuppressWarnings( "unchecked" )
- Iterator<ComponentDependency> it =
pluginDescriptor.getDependencies().iterator(); it.hasNext(); )
+ @SuppressWarnings( "unchecked" )
+ List<ComponentDependency> deps = pluginDescriptor.getDependencies();
+ for ( ComponentDependency dep : deps )
{
- ComponentDependency dep = it.next();
-
w.startElement( "dependency" );
PluginUtils.element( w, "groupId", dep.getGroupId() );
@@ -205,42 +203,35 @@ public final class PluginUtils
}
catch ( DependencyResolutionRequiredException e )
{
- throw (RuntimeException) new
IllegalArgumentException().initCause( e );
+ throw new IllegalArgumentException( e );
}
List<URL> urls = new ArrayList<URL>( classPathStrings.size() );
- for ( Iterator<String> it = classPathStrings.iterator();
it.hasNext(); )
+ for ( String classPathString : classPathStrings )
{
try
{
- urls.add( new File( ( (String) it.next() ) ).toURL() );
+ urls.add( new File( classPathString ).toURL() );
}
catch ( MalformedURLException e )
{
- throw (RuntimeException) new
IllegalArgumentException().initCause( e );
+ throw new IllegalArgumentException( e );
}
}
- classLoader = new URLClassLoader( (URL[]) urls.toArray( new
URL[urls.size()] ),
-
classLoader );
+ classLoader = new URLClassLoader( urls.toArray( new
URL[urls.size()] ), classLoader );
}
- Class<?> clazz = null;
try
{
- clazz = Class.forName( impl, false, classLoader );
+ Class<?> clazz = Class.forName( impl, false, classLoader );
+
+ return MavenReport.class.isAssignableFrom( clazz );
}
catch ( ClassNotFoundException e )
{
return false;
}
-
- if ( MavenReport.class.isAssignableFrom( clazz ) )
- {
- return true;
- }
-
- return false;
}
/**
@@ -447,11 +438,8 @@ public final class PluginUtils
Collections.sort( parameters, new Comparator<Parameter>()
{
/** {@inheritDoc} */
- public int compare( Parameter arg0, Parameter arg1 )
+ public int compare( Parameter parameter1, Parameter parameter2
)
{
- Parameter parameter1 = (Parameter) arg0;
- Parameter parameter2 = (Parameter) arg1;
-
return parameter1.getName().compareToIgnoreCase(
parameter2.getName() );
}
} );
@@ -587,7 +575,7 @@ public final class PluginUtils
}
else if ( HTML.Tag.LI.equals( t ) )
{
- Counter counter = (Counter) numbering.peek();
+ Counter counter = numbering.peek();
if ( counter == null )
{
text( "-\t" );
