You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/05/21 17:23:32 UTC
svn commit: r658725 [1/2] - in
/maven/artifact/trunk/src/main/java/org/apache/maven/artifact: ./ manager/
repository/ repository/layout/ repository/metadata/ resolver/
resolver/conflict/ resolver/filter/ transform/ versioning/
Author: jvanzyl
Date: Wed May 21 08:23:31 2008
New Revision: 658725
URL: http://svn.apache.org/viewvc?rev=658725&view=rev
Log:
MARTIFACT-17: Add generics details to collections
Submitted by: Jason Dillon
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java Wed May 21 08:23:31 2008
@@ -104,7 +104,7 @@
void addMetadata( ArtifactMetadata metadata );
- Collection getMetadataList();
+ Collection<ArtifactMetadata> getMetadataList();
void setRepository( ArtifactRepository remoteRepository );
@@ -126,12 +126,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 );
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java Wed May 21 08:23:31 2008
@@ -24,14 +24,12 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
public final class ArtifactUtils
{
-
private ArtifactUtils()
{
}
@@ -93,34 +91,28 @@
baseVersion;
}
- public static Map artifactMapByVersionlessId( Collection artifacts )
+ public static Map<String,Artifact> artifactMapByVersionlessId( Collection<Artifact> artifacts )
{
- Map artifactMap = new HashMap();
+ Map<String,Artifact> artifactMap = new HashMap<String,Artifact>();
if ( artifacts != null )
{
- for ( Iterator it = artifacts.iterator(); it.hasNext(); )
- {
- Artifact artifact = (Artifact) it.next();
-
- artifactMap.put( versionlessKey( artifact ), artifact );
+ for (Artifact artifact : artifacts) {
+ artifactMap.put(versionlessKey(artifact), artifact);
}
}
return artifactMap;
}
- public static Map artifactMapByArtifactId( Collection artifacts )
+ public static Map<String,Artifact> artifactMapByArtifactId( Collection<Artifact> artifacts )
{
- Map artifactMap = new HashMap();
+ Map<String,Artifact> artifactMap = new HashMap<String,Artifact>();
if ( artifacts != null )
{
- for ( Iterator it = artifacts.iterator(); it.hasNext(); )
- {
- Artifact artifact = (Artifact) it.next();
-
- artifactMap.put( artifact.getId(), artifact );
+ for (Artifact artifact : artifacts) {
+ artifactMap.put(artifact.getId(), artifact);
}
}
@@ -169,13 +161,13 @@
return clone;
}
- private static List copyList( List original )
+ private static <T> List<T> copyList( List<T> original )
{
- List copy = null;
+ List<T> copy = null;
if ( original != null )
{
- copy = new ArrayList();
+ copy = new ArrayList<T>();
if ( !original.isEmpty() )
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Wed May 21 08:23:31 2008
@@ -72,7 +72,7 @@
private ArtifactHandler artifactHandler;
- private List dependencyTrail;
+ private List<String> dependencyTrail;
private String version;
@@ -84,7 +84,7 @@
private List availableVersions;
- private Map metadataMap;
+ private Map<Object,ArtifactMetadata> metadataMap;
private boolean optional;
@@ -262,10 +262,10 @@
{
if ( metadataMap == null )
{
- metadataMap = new HashMap();
+ metadataMap = new HashMap<Object,ArtifactMetadata>();
}
- ArtifactMetadata m = (ArtifactMetadata) metadataMap.get( metadata.getKey() );
+ ArtifactMetadata m = metadataMap.get( metadata.getKey() );
if ( m != null )
{
m.merge( metadata );
@@ -276,9 +276,13 @@
}
}
- public Collection getMetadataList()
+ public Collection<ArtifactMetadata> getMetadataList()
{
- return metadataMap == null ? Collections.EMPTY_LIST : metadataMap.values();
+ if (metadataMap == null) {
+ return Collections.emptyList();
+ }
+
+ return metadataMap.values();
}
// ----------------------------------------------------------------------
@@ -481,12 +485,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;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java Wed May 21 08:23:31 2008
@@ -1,5 +1,24 @@
package org.apache.maven.artifact.manager;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.wagon.authentication.AuthenticationInfo;
public class CredentialsChangeRequest
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java Wed May 21 08:23:31 2008
@@ -1,5 +1,24 @@
package org.apache.maven.artifact.manager;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.wagon.authentication.AuthenticationInfo;
/**
@@ -29,14 +48,7 @@
* set, if not found, prompt and create Authentication info
* for a given resource. This one uses the old password
* member of AuthenticationInfo
- *
- * @param resourceId resource ID for which authentication is required
- * @param authInfo authentication info to set for the given resource ID
- * @param oldPassword old password if one exists or <code>null</code> if not needed
- * - you know for sure that it's a new auth of the existing auth
- * does not have a password, associated with the resource, or you want the
- * old password to be prompted
- * @return
+ *
* @throws CredentialsDataSourceException
*/
void set( CredentialsChangeRequest req )
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java Wed May 21 08:23:31 2008
@@ -1,5 +1,24 @@
package org.apache.maven.artifact.manager;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
public class CredentialsDataSourceException
extends Exception
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java Wed May 21 08:23:31 2008
@@ -1,5 +1,24 @@
package org.apache.maven.artifact.manager;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java Wed May 21 08:23:31 2008
@@ -1,5 +1,24 @@
package org.apache.maven.artifact.manager;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.File;
import org.apache.maven.artifact.Artifact;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java Wed May 21 08:23:31 2008
@@ -131,7 +131,7 @@
else if ( updatePolicy.startsWith( UPDATE_POLICY_INTERVAL ) )
{
String s = updatePolicy.substring( UPDATE_POLICY_INTERVAL.length() + 1 );
- int minutes = Integer.valueOf( s ).intValue();
+ int minutes = Integer.valueOf(s);
Calendar cal = Calendar.getInstance();
cal.add( Calendar.MINUTE, -minutes );
if ( cal.getTime().after( lastModified ) )
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java Wed May 21 08:23:31 2008
@@ -41,15 +41,15 @@
private String globalChecksumPolicy;
// FIXME: This is a non-ThreadLocal cache!!
- private final Map artifactRepositories = new HashMap();
+ private final Map<String,ArtifactRepository> artifactRepositories = new HashMap<String,ArtifactRepository>();
/** @plexus.requirement role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout" */
- private Map repositoryLayouts;
+ private Map<String,ArtifactRepositoryLayout> repositoryLayouts;
public ArtifactRepositoryLayout getLayout( String layoutId )
throws UnknownRepositoryLayoutException
{
- return (ArtifactRepositoryLayout) repositoryLayouts.get( layoutId );
+ return repositoryLayouts.get( layoutId );
}
public ArtifactRepository createDeploymentArtifactRepository( String id,
@@ -58,7 +58,7 @@
boolean uniqueVersion )
throws UnknownRepositoryLayoutException
{
- ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) repositoryLayouts.get( layoutId );
+ ArtifactRepositoryLayout layout = repositoryLayouts.get( layoutId );
checkLayout( id, layoutId, layout );
@@ -91,7 +91,7 @@
ArtifactRepositoryPolicy releases )
throws UnknownRepositoryLayoutException
{
- ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) repositoryLayouts.get( layoutId );
+ ArtifactRepositoryLayout layout = repositoryLayouts.get( layoutId );
checkLayout( id, layoutId, layout );
@@ -107,7 +107,7 @@
boolean blacklisted = false;
if ( artifactRepositories.containsKey( id ) )
{
- ArtifactRepository repository = (ArtifactRepository) artifactRepositories.get( id );
+ ArtifactRepository repository = artifactRepositories.get( id );
// TODO: this should be an if there are duplicates?
if ( repository.getUrl().equals( url ) )
{
@@ -137,8 +137,7 @@
releases.setChecksumPolicy( globalChecksumPolicy );
}
- DefaultArtifactRepository repository = new DefaultArtifactRepository( id, url, repositoryLayout, snapshots,
- releases );
+ DefaultArtifactRepository repository = new DefaultArtifactRepository( id, url, repositoryLayout, snapshots, releases );
repository.setBlacklisted( blacklisted );
artifactRepositories.put( id, repository );
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java Wed May 21 08:23:31 2008
@@ -4,7 +4,6 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
/**
* The code in this class is taken from DefaultRepositorylayout, located at:
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Wed May 21 08:23:31 2008
@@ -68,68 +68,55 @@
}
public void resolve( RepositoryMetadata metadata,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws RepositoryMetadataResolutionException
{
- for ( Iterator i = remoteRepositories.iterator(); i.hasNext(); )
- {
- ArtifactRepository repository = (ArtifactRepository) i.next();
-
+ for (ArtifactRepository repository : remoteRepositories) {
ArtifactRepositoryPolicy policy =
- metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
+ metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
- File file = new File( localRepository.getBasedir(),
- localRepository.pathOfLocalRepositoryMetadata( metadata, repository ) );
+ File file = new File(localRepository.getBasedir(),
+ localRepository.pathOfLocalRepositoryMetadata(metadata, repository));
- if ( wagonManager.isOnline() )
- {
- if ( updateCheckManager.isUpdateRequired( metadata, repository, file ) )
- {
- getLogger().info( metadata.getKey() + ": checking for updates from " + repository.getId() );
- try
- {
- wagonManager.getArtifactMetadata( metadata, repository, file, policy.getChecksumPolicy() );
+ if (wagonManager.isOnline()) {
+ if (updateCheckManager.isUpdateRequired(metadata, repository, file)) {
+ getLogger().info(metadata.getKey() + ": checking for updates from " + repository.getId());
+ try {
+ wagonManager.getArtifactMetadata(metadata, repository, file, policy.getChecksumPolicy());
}
- catch ( ResourceDoesNotExistException e )
- {
- getLogger().debug( metadata + " could not be found on repository: " + repository.getId() );
+ catch (ResourceDoesNotExistException e) {
+ getLogger().debug(metadata + " could not be found on repository: " + repository.getId());
// delete the local copy so the old details aren't used.
- if ( file.exists() )
- {
+ if (file.exists()) {
file.delete();
}
}
- catch ( TransferFailedException e )
- {
- getLogger().warn( metadata + " could not be retrieved from repository: " + repository.getId() +
- " due to an error: " + e.getMessage() );
- getLogger().debug( "Exception", e );
+ catch (TransferFailedException e) {
+ getLogger().warn(metadata + " could not be retrieved from repository: " + repository.getId() +
+ " due to an error: " + e.getMessage());
+ getLogger().debug("Exception", e);
- getLogger().info( "Repository '" + repository.getId() + "' will be blacklisted" );
- repository.setBlacklisted( true );
+ getLogger().info("Repository '" + repository.getId() + "' will be blacklisted");
+ repository.setBlacklisted(true);
// TODO: [jc; 08-Nov-2005] revisit this for 2.1
// suppressing logging to avoid logging this error twice.
}
- finally
- {
- updateCheckManager.touch( metadata, repository, file );
+ finally {
+ updateCheckManager.touch(metadata, repository, file);
}
}
- }
- else
- {
+ } else {
getLogger().debug(
- "System is offline. Cannot resolve metadata:\n" + metadata.extendedToString() + "\n\n" );
+ "System is offline. Cannot resolve metadata:\n" + metadata.extendedToString() + "\n\n");
}
// TODO: should this be inside the above check?
// touch file so that this is not checked again until interval has passed
- if ( file.exists() )
- {
- file.setLastModified( System.currentTimeMillis() );
+ if (file.exists()) {
+ file.setLastModified(System.currentTimeMillis());
}
}
try
@@ -149,7 +136,7 @@
}
private void mergeMetadata( RepositoryMetadata metadata,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws RepositoryMetadataStoreException, RepositoryMetadataReadException
{
@@ -160,17 +147,13 @@
Map previousMetadata = new HashMap();
ArtifactRepository selected = null;
- for ( Iterator i = remoteRepositories.iterator(); i.hasNext(); )
- {
- ArtifactRepository repository = (ArtifactRepository) i.next();
-
+ for (ArtifactRepository repository : remoteRepositories) {
ArtifactRepositoryPolicy policy =
- metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
+ metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
- if ( ( policy.isEnabled() && !repository.isBlacklisted() )
- && ( loadMetadata( metadata, repository, localRepository, previousMetadata ) ) )
- {
- metadata.setRepository( repository );
+ if ((policy.isEnabled() && !repository.isBlacklisted())
+ && (loadMetadata(metadata, repository, localRepository, previousMetadata))) {
+ metadata.setRepository(repository);
selected = repository;
}
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java Wed May 21 08:23:31 2008
@@ -27,7 +27,7 @@
public interface RepositoryMetadataManager
{
void resolve( RepositoryMetadata repositoryMetadata,
- List repositories,
+ List<ArtifactRepository> repositories,
ArtifactRepository localRepository )
throws RepositoryMetadataResolutionException;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java Wed May 21 08:23:31 2008
@@ -23,6 +23,7 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.conflict.ConflictResolver;
import java.util.List;
import java.util.Map;
@@ -45,33 +46,33 @@
String ROLE = ArtifactCollector.class.getName();
// TODO: deprecate since conflict resolvers should always be specified
- ArtifactResolutionResult collect( Set artifacts,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts,
Artifact originatingArtifact,
ArtifactRepository localRepository,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter,
- List listeners );
+ List<ResolutionListener> listeners );
// TODO: deprecate since conflict resolvers should always be specified
- ArtifactResolutionResult collect( Set artifacts,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
ArtifactRepository localRepository,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter,
- List listeners );
+ List<ResolutionListener> listeners );
/** @since 3.0 */
- ArtifactResolutionResult collect( Set artifacts,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
ArtifactRepository localRepository,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter,
- List listeners,
- List conflictResolvers )
+ List<ResolutionListener> listeners,
+ List<ConflictResolver> conflictResolvers )
throws ArtifactResolutionException;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java Wed May 21 08:23:31 2008
@@ -20,6 +20,7 @@
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import java.util.List;
@@ -35,7 +36,7 @@
protected ArtifactNotFoundException( String message,
Artifact artifact,
- List remoteRepositories )
+ List<ArtifactRepository> remoteRepositories )
{
super( message, artifact, remoteRepositories );
}
@@ -49,7 +50,7 @@
protected ArtifactNotFoundException( String message,
Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ResourceDoesNotExistException cause )
{
this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
@@ -63,7 +64,7 @@
String version,
String type,
String classifier,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
String downloadUrl,
List path,
ResourceDoesNotExistException cause )
@@ -81,7 +82,7 @@
String version,
String type,
String classifier,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
String downloadUrl,
List path )
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java Wed May 21 08:23:31 2008
@@ -22,6 +22,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.TransferFailedException;
import java.io.IOException;
@@ -40,7 +41,7 @@
String version,
String type,
String classifier,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
List path,
Throwable t )
{
@@ -66,7 +67,7 @@
public ArtifactResolutionException( String message,
Artifact artifact,
- List remoteRepositories )
+ List<ArtifactRepository> remoteRepositories )
{
super( message, artifact, remoteRepositories );
}
@@ -80,7 +81,7 @@
protected ArtifactResolutionException( String message,
Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataRetrievalException cause )
{
super( message, artifact, remoteRepositories, cause );
@@ -88,7 +89,7 @@
protected ArtifactResolutionException( String message,
Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
TransferFailedException cause )
{
super( message, artifact, remoteRepositories, cause );
@@ -96,7 +97,7 @@
protected ArtifactResolutionException( String message,
Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
IOException cause )
{
super( message, artifact, remoteRepositories, cause );
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java Wed May 21 08:23:31 2008
@@ -4,6 +4,7 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.conflict.ConflictResolver;
import java.util.ArrayList;
import java.util.List;
@@ -30,18 +31,18 @@
private ArtifactRepository localRepository;
- private List remoteRepostories;
+ private List<ArtifactRepository> remoteRepostories;
private ArtifactFilter filter;
- private List listeners = new ArrayList();
+ private List<ResolutionListener> listeners = new ArrayList<ResolutionListener>();
// This should really be a component. Different impls can can be composed to account for different forms of metadata.
private ArtifactMetadataSource metadataSource;
private Map managedVersionMap;
- private List conflictResolvers;
+ private List<ConflictResolver> conflictResolvers;
public Artifact getArtifact()
{
@@ -140,7 +141,7 @@
return remoteRepostories;
}
- public ArtifactResolutionRequest setRemoteRepostories( List remoteRepostories )
+ public ArtifactResolutionRequest setRemoteRepostories( List<ArtifactRepository> remoteRepostories )
{
this.remoteRepostories = remoteRepostories;
@@ -199,12 +200,12 @@
return this;
}
- public List getConflictResolvers()
+ public List<ConflictResolver> getConflictResolvers()
{
return conflictResolvers;
}
- public ArtifactResolutionRequest setConflictResolvers( List conflictResolvers )
+ public ArtifactResolutionRequest setConflictResolvers( List<ConflictResolver> conflictResolvers )
{
this.conflictResolvers = conflictResolvers;
@@ -214,9 +215,9 @@
public String toString()
{
StringBuffer sb = new StringBuffer()
- .append( "groupId = " + getGroupId() )
- .append( "artifactId = " + getArtifactId() )
- .append( "version = " + getVersion() );
+ .append("groupId = ").append(getGroupId())
+ .append("artifactId = ").append(getArtifactId())
+ .append("version = ").append(getVersion());
return sb.toString();
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java Wed May 21 08:23:31 2008
@@ -20,11 +20,11 @@
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -49,70 +49,56 @@
{
private Artifact originatingArtifact;
- private List versionRangeViolations;
+ private List<Exception> versionRangeViolations;
- private List metadataResolutionExceptions;
+ private List<ArtifactResolutionException> metadataResolutionExceptions;
- private List missingArtifacts;
+ private List<Artifact> missingArtifacts;
- private List circularDependencyExceptions;
+ private List<CyclicDependencyException> circularDependencyExceptions;
- private List errorArtifactExceptions;
+ private List<ArtifactResolutionException> errorArtifactExceptions;
// file system errors
- private List repositories;
+ private List<ArtifactRepository> repositories;
- private Set resolutionNodes;
+ private Set<ResolutionNode> resolutionNodes;
- private Set artifacts;
-
- //
+ private Set<Artifact> artifacts;
public Artifact getOriginatingArtifact()
{
return originatingArtifact;
}
- public ArtifactResolutionResult ListOriginatingArtifact( Artifact originatingArtifact )
+ public ArtifactResolutionResult ListOriginatingArtifact( final Artifact originatingArtifact )
{
this.originatingArtifact = originatingArtifact;
return this;
}
- /**
- *
- * @return set of Artifact instances
- */
-
- public Set getArtifacts()
+ public Set<Artifact> getArtifacts()
{
if ( artifacts == null )
{
- artifacts = new LinkedHashSet();
-
- for ( Iterator i = resolutionNodes.iterator(); i.hasNext(); )
- {
- ResolutionNode node = (ResolutionNode) i.next();
+ artifacts = new LinkedHashSet<Artifact>();
- artifacts.add( node.getArtifact() );
+ for (ResolutionNode node : resolutionNodes) {
+ artifacts.add(node.getArtifact());
}
}
return artifacts;
}
- /**
- *
- * @return Set of ResolutionNode instances
- */
public Set getArtifactResolutionNodes()
{
return resolutionNodes == null ? Collections.EMPTY_SET : resolutionNodes;
}
- public ArtifactResolutionResult setArtifactResolutionNodes( Set resolutionNodes )
+ public ArtifactResolutionResult setArtifactResolutionNodes( final Set<ResolutionNode> resolutionNodes )
{
this.resolutionNodes = resolutionNodes;
@@ -136,7 +122,7 @@
return this;
}
- public ArtifactResolutionResult setUnresolvedArtifacts( List unresolvedArtifacts )
+ public ArtifactResolutionResult setUnresolvedArtifacts( final List<Artifact> unresolvedArtifacts )
{
this.missingArtifacts = unresolvedArtifacts;
@@ -196,7 +182,7 @@
public ArtifactResolutionException getMetadataResolutionException( int i )
{
- return (ArtifactResolutionException) metadataResolutionExceptions.get( i );
+ return metadataResolutionExceptions.get( i );
}
public List getMetadataResolutionExceptions()
@@ -222,9 +208,13 @@
return this;
}
- public List getErrorArtifactExceptions()
+ public List<ArtifactResolutionException> getErrorArtifactExceptions()
{
- return errorArtifactExceptions == null ? Collections.EMPTY_LIST : errorArtifactExceptions;
+ if (errorArtifactExceptions == null) {
+ return Collections.emptyList();
+ }
+
+ return errorArtifactExceptions;
}
// ------------------------------------------------------------------------
@@ -247,37 +237,47 @@
public CyclicDependencyException getCircularDependencyException( int i )
{
- return (CyclicDependencyException) circularDependencyExceptions.get( i );
+ return circularDependencyExceptions.get( i );
}
- public List getCircularDependencyExceptions()
+ public List<CyclicDependencyException> getCircularDependencyExceptions()
{
- return circularDependencyExceptions == null ? Collections.EMPTY_LIST : circularDependencyExceptions;
+ if (circularDependencyExceptions == null) {
+ return Collections.emptyList();
+ }
+
+ return circularDependencyExceptions;
}
// ------------------------------------------------------------------------
- //
- // ------------------------------------------------------------------------
-
// Repositories
+ // ------------------------------------------------------------------------
- public List getRepositories()
+ public List<ArtifactRepository> getRepositories()
{
- return repositories == null ? Collections.EMPTY_LIST : repositories;
+ if (repositories == null) {
+ return Collections.emptyList();
+ }
+
+ return repositories;
}
- public ArtifactResolutionResult setRepositories( List repositories )
+ public ArtifactResolutionResult setRepositories( final List<ArtifactRepository> repositories )
{
this.repositories = repositories;
return this;
}
- private List initList( List l )
+ //
+ // Internal
+ //
+
+ private <T> List<T> initList( final List<T> l )
{
if ( l == null )
{
- return new ArrayList();
+ return new ArrayList<T>();
}
return l;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java Wed May 21 08:23:31 2008
@@ -23,6 +23,7 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.conflict.ConflictResolver;
import java.util.List;
import java.util.Map;
@@ -48,79 +49,79 @@
throws ArtifactResolutionException, ArtifactNotFoundException;
/** @deprecated use {@link #resolve(ArtifactResolutionRequest)} */
- ArtifactResolutionResult resolveTransitively( Set artifacts,
+ ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts,
Artifact originatingArtifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException;
/** @deprecated use {@link #resolve(ArtifactResolutionRequest)} */
- ArtifactResolutionResult resolveTransitively( Set artifacts,
+ ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts,
Artifact originatingArtifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
ArtifactMetadataSource source,
- List listeners )
+ List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException;
/** @deprecated use {@link #resolve(ArtifactResolutionRequest)} */
- ArtifactResolutionResult resolveTransitively( Set artifacts,
+ ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts,
Artifact originatingArtifact,
ArtifactRepository localRepository,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException;
/** @deprecated use {@link #resolve(ArtifactResolutionRequest)} */
- ArtifactResolutionResult resolveTransitively( Set artifacts,
+ ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
ArtifactRepository localRepository,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException;
/** @deprecated use {@link #resolve(ArtifactResolutionRequest)} */
- ArtifactResolutionResult resolveTransitively( Set artifacts,
+ ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
ArtifactRepository localRepository,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException;
/** @deprecated use {@link #resolve(ArtifactResolutionRequest)} */
- ArtifactResolutionResult resolveTransitively( Set artifacts,
+ ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
ArtifactRepository localRepository,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter,
- List listeners )
+ List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
* @since 3.0
* @deprecated use {@link #resolve(ArtifactResolutionRequest)}
*/
- ArtifactResolutionResult resolveTransitively( Set artifacts,
+ ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
ArtifactRepository localRepository,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter,
- List listeners,
- List conflictResolvers )
+ List<ResolutionListener> listeners,
+ List<ConflictResolver> conflictResolvers )
throws ArtifactResolutionException, ArtifactNotFoundException;
/** @deprecated use {@link #resolve(ArtifactResolutionRequest)} */
void resolveAlways( Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java Wed May 21 08:23:31 2008
@@ -40,7 +40,7 @@
private String indent = "";
- private static Set ignoredArtifacts = new HashSet();
+ private static Set<Artifact> ignoredArtifacts = new HashSet<Artifact>();
public DebugResolutionListener( Logger logger )
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java Wed May 21 08:23:31 2008
@@ -20,6 +20,7 @@
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
@@ -35,9 +36,9 @@
{
private final Artifact artifact;
- private List children;
+ private List<ResolutionNode> children;
- private final List parents;
+ private final List<Object> parents;
private final int depth;
@@ -47,7 +48,7 @@
private boolean active = true;
- private List trail;
+ private List<Artifact> trail;
public ResolutionNode( Artifact artifact,
List remoteRepositories )
@@ -55,7 +56,7 @@
this.artifact = artifact;
this.remoteRepositories = remoteRepositories;
depth = 0;
- parents = Collections.EMPTY_LIST;
+ parents = Collections.emptyList();
parent = null;
}
@@ -66,7 +67,7 @@
this.artifact = artifact;
this.remoteRepositories = remoteRepositories;
depth = parent.depth + 1;
- parents = new ArrayList();
+ parents = new ArrayList<Object>();
parents.addAll( parent.parents );
parents.add( parent.getKey() );
this.parent = parent;
@@ -82,32 +83,28 @@
return artifact.getDependencyConflictId();
}
- public void addDependencies( Set artifacts,
- List remoteRepositories,
+ public void addDependencies( Set<Artifact> artifacts,
+ List<ArtifactRepository> remoteRepositories,
ArtifactFilter filter )
throws CyclicDependencyException, OverConstrainedVersionException
{
if ( !artifacts.isEmpty() )
{
- children = new ArrayList( artifacts.size() );
+ children = new ArrayList<ResolutionNode>( artifacts.size() );
- for ( Iterator i = artifacts.iterator(); i.hasNext(); )
- {
- Artifact a = (Artifact) i.next();
-
- if ( parents.contains( a.getDependencyConflictId() ) )
- {
- a.setDependencyTrail( getDependencyTrail() );
+ for (Artifact a : artifacts) {
+ if (parents.contains(a.getDependencyConflictId())) {
+ a.setDependencyTrail(getDependencyTrail());
- throw new CyclicDependencyException( "A dependency has introduced a cycle", a );
+ throw new CyclicDependencyException("A dependency has introduced a cycle", a);
}
- children.add( new ResolutionNode( a, remoteRepositories, this ) );
+ children.add(new ResolutionNode(a, remoteRepositories, this));
}
}
else
{
- children = Collections.EMPTY_LIST;
+ children = Collections.emptyList();
}
trail = null;
}
@@ -116,26 +113,26 @@
* @return {@link List} < {@link String} > with artifact ids
* @throws OverConstrainedVersionException
*/
- public List getDependencyTrail()
+ public List<String> getDependencyTrail()
throws OverConstrainedVersionException
{
- List trial = getTrail();
+ List<Artifact> trial = getTrail();
- List ret = new ArrayList( trial.size() );
- for ( Iterator i = trial.iterator(); i.hasNext(); )
- {
- Artifact artifact = (Artifact) i.next();
- ret.add( artifact.getId() );
+ List<String> ret = new ArrayList<String>( trial.size() );
+
+ for (Artifact artifact : trial) {
+ ret.add(artifact.getId());
}
+
return ret;
}
- private List getTrail()
+ private List<Artifact> getTrail()
throws OverConstrainedVersionException
{
if ( trail == null )
{
- List ids = new LinkedList();
+ List<Artifact> ids = new LinkedList<Artifact>();
ResolutionNode node = this;
while ( node != null )
{
@@ -170,8 +167,7 @@
}
/**
- * test whether the node is direct or transitive dependency.
- * @return
+ * Test whether the node is direct or transitive dependency.
*/
public boolean isChildOfRootNode()
{
@@ -201,12 +197,11 @@
public void enable()
{
active = true;
+
// TODO: if it was null, we really need to go find them now... or is this taken care of by the ordering?
if ( children != null )
{
- for ( Iterator i = children.iterator(); i.hasNext(); )
- {
- ResolutionNode node = (ResolutionNode) i.next();
+ for (ResolutionNode node : children) {
node.enable();
}
}
@@ -217,9 +212,7 @@
active = false;
if ( children != null )
{
- for ( Iterator i = children.iterator(); i.hasNext(); )
- {
- ResolutionNode node = (ResolutionNode) i.next();
+ for (ResolutionNode node : children) {
node.disable();
}
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java Wed May 21 08:23:31 2008
@@ -1,6 +1,7 @@
package org.apache.maven.artifact.resolver;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import java.util.List;
@@ -14,13 +15,13 @@
{
private Artifact originatingArtifact;
- private List artifacts;
+ private List<Artifact> artifacts;
- private List remoteRepositories;
+ private List<ArtifactRepository> remoteRepositories;
public UnresolvedArtifacts( Artifact originatingArtifact,
- List artifacts,
- List remoteRepositories )
+ List<Artifact> artifacts,
+ List<ArtifactRepository> remoteRepositories )
{
this.originatingArtifact = originatingArtifact;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java Wed May 21 08:23:31 2008
@@ -19,20 +19,16 @@
* under the License.
*/
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
import org.apache.maven.artifact.resolver.metadata.MetadataResolutionException;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeSet;
/**
* Default conflict resolver.Implements closer newer first policy
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java Wed May 21 08:23:31 2008
@@ -10,9 +10,6 @@
public class GraphConflictResolutionException
extends Exception
{
- /**
- *
- */
private static final long serialVersionUID = 2677613140287940255L;
public GraphConflictResolutionException()
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java Wed May 21 08:23:31 2008
@@ -34,7 +34,7 @@
public class AndArtifactFilter
implements ArtifactFilter
{
- private final List filters = new ArrayList();
+ private final List<ArtifactFilter> filters = new ArrayList<ArtifactFilter>();
public boolean include( Artifact artifact )
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java Wed May 21 08:23:31 2008
@@ -33,7 +33,7 @@
public class ExcludesArtifactFilter
extends IncludesArtifactFilter
{
- public ExcludesArtifactFilter( List patterns )
+ public ExcludesArtifactFilter( List<String> patterns )
{
super( patterns );
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java Wed May 21 08:23:31 2008
@@ -32,25 +32,20 @@
public class ExclusionSetFilter
implements ArtifactFilter
{
- private Set excludes;
+ private Set<String> excludes;
public ExclusionSetFilter( String[] excludes )
{
- this.excludes = new HashSet( Arrays.asList( excludes ) );
+ this.excludes = new HashSet<String>( Arrays.asList( excludes ) );
}
- public ExclusionSetFilter( Set excludes )
+ public ExclusionSetFilter( Set<String> excludes )
{
this.excludes = excludes;
}
public boolean include( Artifact artifact )
{
- if ( excludes.contains( artifact.getArtifactId() ) )
- {
- return false;
- }
-
- return true;
+ return !excludes.contains(artifact.getArtifactId());
}
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java Wed May 21 08:23:31 2008
@@ -33,9 +33,9 @@
public class IncludesArtifactFilter
implements ArtifactFilter
{
- private final List patterns;
+ private final List<String> patterns;
- public IncludesArtifactFilter( List patterns )
+ public IncludesArtifactFilter( List<String> patterns )
{
this.patterns = patterns;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java Wed May 21 08:23:31 2008
@@ -24,7 +24,6 @@
public class InversionArtifactFilter
implements ArtifactFilter
{
-
private final ArtifactFilter toInvert;
public InversionArtifactFilter( ArtifactFilter toInvert )
@@ -36,5 +35,4 @@
{
return !toInvert.include( artifact );
}
-
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java Wed May 21 08:23:31 2008
@@ -52,7 +52,7 @@
protected String resolveVersion( Artifact artifact,
ArtifactRepository localRepository,
- List remoteRepositories )
+ List<ArtifactRepository> remoteRepositories )
throws RepositoryMetadataResolutionException
{
RepositoryMetadata metadata;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java Wed May 21 08:23:31 2008
@@ -46,7 +46,7 @@
* @param localRepository the local repository
*/
void transformForResolve( Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java Wed May 21 08:23:31 2008
@@ -43,7 +43,7 @@
* @param localRepository the local repository
*/
void transformForResolve( Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java Wed May 21 08:23:31 2008
@@ -41,17 +41,14 @@
* role="org.apache.maven.artifact.transform.ArtifactTransformation"
* role-hints="release,latest,snapshot"
*/
- private List artifactTransformations;
+ private List<ArtifactTransformation> artifactTransformations;
public void transformForResolve( Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
- {
- ArtifactTransformation transform = (ArtifactTransformation) i.next();
-
+ for (ArtifactTransformation transform : artifactTransformations) {
transform.transformForResolve( artifact, remoteRepositories, localRepository );
}
}
@@ -60,9 +57,7 @@
ArtifactRepository localRepository )
throws ArtifactInstallationException
{
- for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
- {
- ArtifactTransformation transform = (ArtifactTransformation) i.next();
+ for (ArtifactTransformation transform : artifactTransformations) {
transform.transformForInstall( artifact, localRepository );
}
}
@@ -72,9 +67,7 @@
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
- for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
- {
- ArtifactTransformation transform = (ArtifactTransformation) i.next();
+ for (ArtifactTransformation transform : artifactTransformations) {
transform.transformForDeployment( artifact, remoteRepository, localRepository );
}
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java Wed May 21 08:23:31 2008
@@ -4,8 +4,6 @@
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.apache.maven.artifact.resolver.conflict.GraphConflictResolutionException;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java Wed May 21 08:23:31 2008
@@ -33,7 +33,7 @@
extends AbstractVersionTransformation
{
public void transformForResolve( Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java Wed May 21 08:23:31 2008
@@ -5,12 +5,8 @@
*
*/
public class MetadataGraphTransformationException
-extends Exception
+ extends Exception
{
-
- /**
- *
- */
private static final long serialVersionUID = -4029897098314019152L;
public MetadataGraphTransformationException()
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java Wed May 21 08:23:31 2008
@@ -41,7 +41,7 @@
extends AbstractVersionTransformation
{
public void transformForResolve( Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java Wed May 21 08:23:31 2008
@@ -54,7 +54,7 @@
public void transformForResolve( Artifact artifact,
- List remoteRepositories,
+ List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java Wed May 21 08:23:31 2008
@@ -77,14 +77,14 @@
public boolean isNull()
{
- return ( value.intValue() == 0 );
+ return (value == 0 );
}
public int compareTo( Item item )
{
if ( item == null )
{
- return value.intValue() == 0 ? 0 : 1; // 1.0 == 1, 1.1 > 1
+ return value == 0 ? 0 : 1; // 1.0 == 1, 1.1 > 1
}
switch ( item.getType() )
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java Wed May 21 08:23:31 2008
@@ -67,22 +67,22 @@
public int getMajorVersion()
{
- return majorVersion != null ? majorVersion.intValue() : 0;
+ return majorVersion != null ? majorVersion : 0;
}
public int getMinorVersion()
{
- return minorVersion != null ? minorVersion.intValue() : 0;
+ return minorVersion != null ? minorVersion : 0;
}
public int getIncrementalVersion()
{
- return incrementalVersion != null ? incrementalVersion.intValue() : 0;
+ return incrementalVersion != null ? incrementalVersion : 0;
}
public int getBuildNumber()
{
- return buildNumber != null ? buildNumber.intValue() : 0;
+ return buildNumber != null ? buildNumber : 0;
}
public String getQualifier()
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java?rev=658725&r1=658724&r2=658725&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java Wed May 21 08:23:31 2008
@@ -20,6 +20,7 @@
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import java.util.List;
@@ -41,7 +42,7 @@
public OverConstrainedVersionException( String msg,
Artifact artifact,
- List remoteRepositories )
+ List<ArtifactRepository> remoteRepositories )
{
super( msg, artifact, remoteRepositories );
}