svn commit: r418482 - in /maven/components/branches/maven-2.0.x/maven-artifact-manager: ./ src/main/java/org/apache/maven/artifact/manager/ src/main/java/org/apache/maven/artifact/repository/metadata/ src/main/java/org/apache/maven/artifact/transform/

[carlos]

Author: carlos
Date: Sat Jul  1 07:39:12 2006
New Revision: 418482

URL: http://svn.apache.org/viewvc?rev=418482&view=rev
Log:
Merging 418480 from trunk. Checkstyle fixes

Modified:
    maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml
    
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
    
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
    
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java

Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=418482&r1=418481&r2=418482&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml 
(original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Sat 
Jul  1 07:39:12 2006
@@ -38,4 +38,4 @@
       <artifactId>wagon-provider-api</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?rev=418482&r1=418481&r2=418482&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
 Sat Jul  1 07:39:12 2006
@@ -33,6 +33,8 @@
 import java.util.List;
 
 /**
+ * Manages <a href="http://maven.apache.org/wagon";>Wagon</a> related 
operations in Maven.
+ * 
  * @author <a href="[EMAIL PROTECTED]">Michal Maczka </a>
  * @version $Id$
  */

Modified: 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=418482&r1=418481&r2=418482&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
 Sat Jul  1 07:39:12 2006
@@ -156,13 +156,11 @@
             ArtifactRepositoryPolicy policy =
                 metadata.isSnapshot() ? repository.getSnapshots() : 
repository.getReleases();
 
-            if ( policy.isEnabled() && !repository.isBlacklisted() )
+            if ( ( policy.isEnabled() && !repository.isBlacklisted() )
+                && ( loadMetadata( metadata, repository, localRepository, 
previousMetadata ) ) )
             {
-                if ( loadMetadata( metadata, repository, localRepository, 
previousMetadata ) )
-                {
-                    metadata.setRepository( repository );
-                    selected = repository;
-                }
+                metadata.setRepository( repository );
+                selected = repository;
             }
         }
         if ( loadMetadata( metadata, localRepository, localRepository, 
previousMetadata ) )

Modified: 
maven/components/branches/maven-2.0.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.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=418482&r1=418481&r2=418482&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
 Sat Jul  1 07:39:12 2006
@@ -159,12 +159,10 @@
 
         int buildNumber = 0;
         Metadata repoMetadata = metadata.getMetadata();
-        if ( repoMetadata != null )
+        if ( ( repoMetadata != null )
+            && ( repoMetadata.getVersioning() != null && 
repoMetadata.getVersioning().getSnapshot() != null ) )
         {
-            if ( repoMetadata.getVersioning() != null && 
repoMetadata.getVersioning().getSnapshot() != null )
-            {
-                buildNumber = 
repoMetadata.getVersioning().getSnapshot().getBuildNumber();
-            }
+            buildNumber = 
repoMetadata.getVersioning().getSnapshot().getBuildNumber();
         }
         return buildNumber;
     }