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 2010/08/02 22:19:36 UTC
svn commit: r981672 - in
/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant: ./ util/
Author: hboutemy
Date: Mon Aug 2 20:19:35 2010
New Revision: 981672
URL: http://svn.apache.org/viewvc?rev=981672&view=rev
Log:
code cleanup
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Mvn.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/SpecificScopesArtifactFilter.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/WritePomTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntBuildWriter.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntTaskModified.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java Mon Aug 2 20:19:35 2010
@@ -32,7 +32,7 @@ import org.apache.tools.ant.BuildExcepti
import org.apache.tools.ant.Project;
/**
- * Base class for atifact tasks that are able to download artifact from repote repositories.
+ * Base class for artifact tasks that are able to download artifact from remote repositories.
* @version $Id$
*/
public abstract class AbstractArtifactWithRepositoryTask
@@ -72,7 +72,7 @@ public abstract class AbstractArtifactWi
/**
* Create the list of ArtifactRepository-ies where artifacts can be downloaded. If
* no remote repository has been configured, adds central repository.
- * @param pomRepositories additionnal repositories defined in pom (or null if none)
+ * @param pomRepositories additional repositories defined in pom (or null if none)
* @return the list of ArtifactRepository-ies
* @see #createRemoteArtifactRepository(RemoteRepository)
*/
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Mon Aug 2 20:19:35 2010
@@ -283,7 +283,7 @@ public class DependenciesTask
for ( Iterator<Artifact> i = result.getArtifacts().iterator(); i.hasNext(); )
{
- Artifact artifact = (Artifact) i.next();
+ Artifact artifact = i.next();
addArtifactToResult( localRepo, artifact, dependencyFileSet, dependencyPath );
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java Mon Aug 2 20:19:35 2010
@@ -128,7 +128,7 @@ public class InstallWagonProviderTask
{
for ( Iterator<Artifact> i = result.getArtifacts().iterator(); i.hasNext(); )
{
- Artifact a = (Artifact) i.next();
+ Artifact a = i.next();
getContainer().addJarResource( a.getFile() );
}
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Mvn.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Mvn.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Mvn.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Mvn.java Mon Aug 2 20:19:35 2010
@@ -52,7 +52,8 @@ public class Mvn
private LocalRepository localRepository;
- public void execute() throws BuildException
+ public void execute()
+ throws BuildException
{
if ( batchMode )
{
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/SpecificScopesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/SpecificScopesArtifactFilter.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/SpecificScopesArtifactFilter.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/SpecificScopesArtifactFilter.java Mon Aug 2 20:19:35 2010
@@ -50,26 +50,28 @@ public class SpecificScopesArtifactFilte
public SpecificScopesArtifactFilter( String scopes )
{
String [] scopeList = scopes.split( "," );
-
- for ( int i=0; i<scopeList.length; ++i )
+
+ for ( int i = 0; i < scopeList.length; ++i )
{
- if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_COMPILE) )
+ String scope = scopeList[i].trim();
+
+ if ( scope.equals( DefaultArtifact.SCOPE_COMPILE ) )
{
compileScope = true;
}
- else if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_PROVIDED) )
+ else if ( scope.equals( DefaultArtifact.SCOPE_PROVIDED ) )
{
providedScope = true;
}
- else if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_RUNTIME) )
+ else if ( scope.equals( DefaultArtifact.SCOPE_RUNTIME ) )
{
runtimeScope = true;
}
- else if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_SYSTEM) )
+ else if ( scope.equals( DefaultArtifact.SCOPE_SYSTEM ) )
{
systemScope = true;
}
- else if ( scopeList[i].trim().equals( DefaultArtifact.SCOPE_TEST) )
+ else if ( scope.equals( DefaultArtifact.SCOPE_TEST ) )
{
testScope = true;
}
@@ -98,9 +100,6 @@ public class SpecificScopesArtifactFilte
{
return systemScope;
}
- else
- {
- return true;
- }
+ return true;
}
}
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/WritePomTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/WritePomTask.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/WritePomTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/WritePomTask.java Mon Aug 2 20:19:35 2010
@@ -87,7 +87,6 @@ public class WritePomTask
{
fw = WriterFactory.newXmlWriter( outputFile );
new MavenXpp3Writer().write( fw, model );
-
}
catch ( IOException e )
{
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntBuildWriter.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntBuildWriter.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntBuildWriter.java Mon Aug 2 20:19:35 2010
@@ -1,20 +1,5 @@
package org.apache.maven.artifact.ant.util;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.types.FileList;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
-import org.codehaus.plexus.util.xml.XMLWriter;
-import org.codehaus.plexus.util.xml.XmlWriterUtil;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -34,6 +19,21 @@ import org.codehaus.plexus.util.xml.XmlW
* under the License.
*/
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.FileList;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
+import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.XmlWriterUtil;
+
/**
* Utility class for writing an Ant build file.
*/
@@ -92,7 +92,6 @@ public class AntBuildWriter
XmlWriterUtil.writeLineBreak( writer );
IOUtil.close( outputStreamWriter );
-
}
/**
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntTaskModified.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntTaskModified.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntTaskModified.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntTaskModified.java Mon Aug 2 20:19:35 2010
@@ -30,9 +30,9 @@ import org.apache.tools.ant.taskdefs.Ant
* new sub project.
*
* @author pgier
- *
*/
-public class AntTaskModified extends Ant
+public class AntTaskModified
+ extends Ant
{
/**
@@ -59,8 +59,8 @@ public class AntTaskModified extends Ant
{
Field newProjectField = Ant.class.getDeclaredField( "newProject" );
newProjectField.setAccessible( true );
- Project newProjectObj = (Project) newProjectField.get( this );
- return newProjectObj;
+
+ return (Project) newProjectField.get( this );
}
catch ( Exception e )
{
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java?rev=981672&r1=981671&r2=981672&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java Mon Aug 2 20:19:35 2010
@@ -1,10 +1,5 @@
package org.apache.maven.artifact.ant.util;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.apache.tools.ant.Project;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,6 +19,11 @@ import org.apache.tools.ant.Project;
* under the License.
*/
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.apache.tools.ant.Project;
+
/**
* Utility stuff for dealing with Ant.
*/
@@ -51,21 +51,20 @@ public class AntUtil
*/
public static void copyProperties( Hashtable<String,String> props, Project project )
{
- for ( Enumeration<String> e = props.keys(); e.hasMoreElements(); )
+ for ( Map.Entry<String, String> entry : props.entrySet() )
{
- String key = e.nextElement();
+ String key = entry.getKey();
if ( "basedir".equals( key ) || "ant.file".equals( key ) )
{
// basedir and ant.file get special treatment in execute()
continue;
}
- String value = props.get( key ).toString();
// don't re-set user properties, avoid the warning message
if ( project.getProperty( key ) == null )
{
// no user property
- project.setNewProperty( key, value );
+ project.setNewProperty( key, entry.getValue() );
}
}
}
@@ -90,13 +89,13 @@ public class AntUtil
*/
public static void copyReferences( Hashtable<String,String> refs, Project project )
{
- for ( Enumeration<String> e = refs.keys(); e.hasMoreElements(); )
+ for ( Map.Entry<String, String> entry : refs.entrySet() )
{
- String key = e.nextElement();
+ String key = entry.getKey();
// don't overwrite existing references
if ( project.getReference( key ) == null )
{
- project.addReference( key, refs.get( key ) );
+ project.addReference( key, entry.getValue() );
}
}
}