Author: jdcasey
Date: Tue Apr 21 22:52:54 2009
New Revision: 767322
URL: http://svn.apache.org/viewvc?rev=767322&view=rev
Log:
update to java 1.5 syntax (partial)
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
Tue Apr 21 22:52:54 2009
@@ -48,7 +48,7 @@
protected WagonManager wagonManager;
- protected String resolveVersion( Artifact artifact, ArtifactRepository
localRepository, List remoteRepositories )
+ protected String resolveVersion( Artifact artifact, ArtifactRepository
localRepository, List<ArtifactRepository> remoteRepositories )
throws RepositoryMetadataResolutionException
{
RepositoryMetadata metadata;
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
Tue Apr 21 22:52:54 2009
@@ -28,32 +28,30 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-import java.util.Iterator;
import java.util.List;
public class DefaultArtifactTransformationManager
implements ArtifactTransformationManager, Initializable
{
- private List artifactTransformations;
+ private List<ArtifactTransformation> artifactTransformations;
public void initialize() throws InitializationException {
// TODO this is a hack until plexus can fix the ordering of the
arrays
- Object obj[] = artifactTransformations.toArray();
- for (int x = 0; x < obj.length; x++)
+ ArtifactTransformation transforms[] =
artifactTransformations.toArray( new ArtifactTransformation[]{} );
+ for (int x = 0; x < transforms.length; x++)
{
- if (obj[x].getClass().getName().indexOf("Snapshot") !=
-1) {
- artifactTransformations.remove(obj[x]);
- artifactTransformations.add(obj[x]);
+ if
(transforms[x].getClass().getName().indexOf("Snapshot") != -1) {
+ artifactTransformations.remove(transforms[x]);
+ artifactTransformations.add(transforms[x]);
}
}
}
- public void transformForResolve( Artifact artifact, List
remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact,
List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository
)
throws ArtifactResolutionException, ArtifactNotFoundException
{
- for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
+ for ( ArtifactTransformation transform : artifactTransformations )
{
- ArtifactTransformation transform = (ArtifactTransformation)
i.next();
transform.transformForResolve( artifact, remoteRepositories,
localRepository );
}
}
@@ -61,9 +59,8 @@
public void transformForInstall( Artifact artifact, ArtifactRepository
localRepository )
throws ArtifactInstallationException
{
- for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
+ for ( ArtifactTransformation transform : artifactTransformations )
{
- ArtifactTransformation transform = (ArtifactTransformation)
i.next();
transform.transformForInstall( artifact, localRepository );
}
}
@@ -72,9 +69,8 @@
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
- for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
+ for ( ArtifactTransformation transform : artifactTransformations )
{
- ArtifactTransformation transform = (ArtifactTransformation)
i.next();
transform.transformForDeployment( artifact, remoteRepository,
localRepository );
}
}
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
Tue Apr 21 22:52:54 2009
@@ -31,7 +31,7 @@
public class LatestArtifactTransformation
extends AbstractVersionTransformation
{
- public void transformForResolve( Artifact artifact, List
remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact,
List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository
)
throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( Artifact.LATEST_VERSION.equals( artifact.getVersion() ) )
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
Tue Apr 21 22:52:54 2009
@@ -39,7 +39,7 @@
public class ReleaseArtifactTransformation
extends AbstractVersionTransformation
{
- public void transformForResolve( Artifact artifact, List
remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact,
List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository
)
throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( Artifact.RELEASE_VERSION.equals( artifact.getVersion() ) )
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Tue Apr 21 22:52:54 2009
@@ -52,7 +52,7 @@
private static final String UTC_TIMESTAMP_PATTERN = "yyyyMMdd.HHmmss";
- public void transformForResolve( Artifact artifact, List
remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact,
List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository
)
throws ArtifactResolutionException
{
// Only select snapshots that are unresolved (eg 1.0-SNAPSHOT, not
1.0-20050607.123456)
Modified:
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
Tue Apr 21 22:52:54 2009
@@ -39,7 +39,7 @@
* @todo get rid of the multiple states we can have (project, parent, etc
artifacts, file == null, snapshot, etc) - construct subclasses and use
accordingly?
*/
public interface Artifact
- extends Comparable
+ extends Comparable<Artifact>
{
String LATEST_VERSION = "LATEST";
@@ -105,9 +105,9 @@
void addMetadata( ArtifactMetadata metadata );
- ArtifactMetadata getMetadata( Class metadataClass );
+ ArtifactMetadata getMetadata( Class<?> metadataClass );
- Collection getMetadataList();
+ Collection<ArtifactMetadata> getMetadataList();
void setRepository( ArtifactRepository remoteRepository );
@@ -128,12 +128,12 @@
/**
* @return {...@link List} < {...@link String} > with artifact ids
*/
- List getDependencyTrail();
+ List<String> getDependencyTrail();
/**
* @param dependencyTrail {...@link List} < {...@link String} > with
artifact ids
*/
- void setDependencyTrail( List dependencyTrail );
+ void setDependencyTrail( List<String> dependencyTrail );
void setScope( String scope );
@@ -164,9 +164,9 @@
void setRelease( boolean release );
- List getAvailableVersions();
+ List<ArtifactVersion> getAvailableVersions();
- void setAvailableVersions( List versions );
+ void setAvailableVersions( List<ArtifactVersion> versions );
boolean isOptional();
Modified:
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Tue Apr 21 22:52:54 2009
@@ -32,7 +32,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -72,7 +71,7 @@
private ArtifactHandler artifactHandler;
- private List dependencyTrail;
+ private List<String> dependencyTrail;
private String version;
@@ -82,9 +81,9 @@
private boolean release;
- private List availableVersions;
+ private List<ArtifactVersion> availableVersions;
- private Map metadataMap;
+ private Map<Object, ArtifactMetadata> metadataMap;
private boolean optional;
@@ -251,7 +250,7 @@
{
if ( metadataMap == null )
{
- metadataMap = new HashMap();
+ metadataMap = new HashMap<Object, ArtifactMetadata>();
}
ArtifactMetadata m = (ArtifactMetadata) metadataMap.get(
metadata.getKey() );
@@ -265,15 +264,14 @@
}
}
- public ArtifactMetadata getMetadata( Class metadataClass )
+ public ArtifactMetadata getMetadata( Class<?> metadataClass )
{
- Collection metadata = getMetadataList();
+ Collection<ArtifactMetadata> metadata = getMetadataList();
if ( metadata != null )
{
- for ( Iterator it = metadata.iterator(); it.hasNext(); )
+ for ( ArtifactMetadata m : metadata )
{
- ArtifactMetadata m = (ArtifactMetadata) it.next();
if ( metadataClass.isAssignableFrom( m.getClass() ) )
{
return m;
@@ -284,9 +282,19 @@
return null;
}
- public Collection getMetadataList()
+ public Collection<ArtifactMetadata> getMetadataList()
{
- return metadataMap == null ? Collections.EMPTY_LIST :
metadataMap.values();
+ Collection<ArtifactMetadata> result;
+ if ( metadataMap == null )
+ {
+ result = Collections.emptyList();
+ }
+ else
+ {
+ result = metadataMap.values();
+ }
+
+ return result;
}
// ----------------------------------------------------------------------
@@ -414,10 +422,8 @@
}
}
- public int compareTo( Object o )
+ public int compareTo( Artifact a )
{
- Artifact a = (Artifact) o;
-
int result = groupId.compareTo( a.getGroupId() );
if ( result == 0 )
{
@@ -487,12 +493,12 @@
return artifactHandler;
}
- public List getDependencyTrail()
+ public List<String> getDependencyTrail()
{
return dependencyTrail;
}
- public void setDependencyTrail( List dependencyTrail )
+ public void setDependencyTrail( List<String> dependencyTrail )
{
this.dependencyTrail = dependencyTrail;
}
@@ -594,12 +600,12 @@
return release;
}
- public List getAvailableVersions()
+ public List<ArtifactVersion> getAvailableVersions()
{
return availableVersions;
}
- public void setAvailableVersions( List availableVersions )
+ public void setAvailableVersions( List<ArtifactVersion> availableVersions )
{
this.availableVersions = availableVersions;
}
Modified:
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
Tue Apr 21 22:52:54 2009
@@ -45,7 +45,7 @@
* @param remoteRepositories the repositories to check
* @param localRepository the local repository
*/
- void transformForResolve( Artifact artifact, List remoteRepositories,
ArtifactRepository localRepository )
+ void transformForResolve( Artifact artifact, List<ArtifactRepository>
remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
Modified:
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java?rev=767322&r1=767321&r2=767322&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
Tue Apr 21 22:52:54 2009
@@ -43,7 +43,7 @@
* @param remoteRepositories the repositories to check
* @param localRepository the local repository
*/
- void transformForResolve( Artifact artifact, List remoteRepositories,
ArtifactRepository localRepository )
+ void transformForResolve( Artifact artifact, List<ArtifactRepository>
remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
