cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact AbstractArtifactComponent.java

[brett]

brett       2005/03/22 23:43:38

  Modified:    maven-artifact/src/main/java/org/apache/maven/artifact/installer
                        DefaultArtifactInstaller.java
               maven-artifact/src/main/java/org/apache/maven/artifact/resolver
                        DefaultArtifactResolver.java
               maven-artifact/src/main/java/org/apache/maven/artifact
                        AbstractArtifactComponent.java
  Log:
  make method signatures consistent
  
  Revision  Changes    Path
  1.7       +1 -1      
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
  
  Index: DefaultArtifactInstaller.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultArtifactInstaller.java     23 Mar 2005 07:41:39 -0000      1.6
  +++ DefaultArtifactInstaller.java     23 Mar 2005 07:43:38 -0000      1.7
  @@ -52,7 +52,7 @@
       {
           try
           {
  -            artifact.setPath( getLocalRepositoryArtifactPath( 
localRepository, artifact ) );
  +            artifact.setPath( getLocalRepositoryArtifactPath( artifact, 
localRepository ) );
   
               if ( !artifact.getFile().getParentFile().exists() )
               {
  
  
  
  1.25      +2 -2      
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
  
  Index: DefaultArtifactResolver.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- DefaultArtifactResolver.java      23 Mar 2005 07:41:39 -0000      1.24
  +++ DefaultArtifactResolver.java      23 Mar 2005 07:43:38 -0000      1.25
  @@ -77,7 +77,7 @@
               logger.debug( "Resolving: " + artifact.getId() + " from:\n" + 
"{localRepository: " + localRepository +
                             "}\n" + "{remoteRepositories: " + 
remoteRepositories + "}" );
   
  -            artifact.setPath( getLocalRepositoryArtifactPath( 
localRepository, artifact ) );
  +            artifact.setPath( getLocalRepositoryArtifactPath( artifact, 
localRepository ) );
   
               if ( artifact.exists() )
               {
  @@ -294,7 +294,7 @@
   
               try
               {
  -                artifact.setPath( getLocalRepositoryArtifactPath( 
localRepository, artifact ) );
  +                artifact.setPath( getLocalRepositoryArtifactPath( artifact, 
localRepository ) );
               }
               catch ( ArtifactPathFormatException e )
               {
  
  
  
  1.9       +1 -1      
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/AbstractArtifactComponent.java
  
  Index: AbstractArtifactComponent.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/AbstractArtifactComponent.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractArtifactComponent.java    23 Mar 2005 07:41:39 -0000      1.8
  +++ AbstractArtifactComponent.java    23 Mar 2005 07:43:38 -0000      1.9
  @@ -52,7 +52,7 @@
           return remoteRepository.pathOf( artifact );
       }
   
  -    protected String getLocalRepositoryArtifactPath( ArtifactRepository 
localRepository, Artifact artifact )
  +    protected String getLocalRepositoryArtifactPath( Artifact artifact, 
ArtifactRepository localRepository )
           throws ArtifactPathFormatException
       {
           for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )