svn commit: r588011 - /maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java

[ca...@apache.org]

Author: carlos
Date: Wed Oct 24 13:48:34 2007
New Revision: 588011

URL: http://svn.apache.org/viewvc?rev=588011&view=rev
Log:
Strong type add*Exception methods, fix error in addCircularDependencyException, still one problem to fix in addVersionRangeViolation

Modified:
    maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java

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=588011&r1=588010&r2=588011&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 Oct 24 13:48:34 2007
@@ -37,7 +37,10 @@
  * - missing artifacts
  * - network/transfer errors
  * - file system errors: permissions
- *
+ * 
+ * @TODO carlos: all these possible has*Exceptions and get*Exceptions methods make the clients too
+ *       complex requiring a long list of checks, need to create a parent/interfact/encapsulation
+ *       for the types of exceptions
  * @author Jason van Zyl
  * @version $Id$
  */
@@ -116,10 +119,7 @@
 
     public ArtifactResolutionResult addMissingArtifact( Artifact artifact )
     {
-        if ( missingArtifacts == null )
-        {
-            missingArtifacts = new ArrayList();
-        }
+        initList( missingArtifacts );
 
         missingArtifacts.add( artifact );
 
@@ -142,12 +142,14 @@
         return versionRangeViolations != null;
     }
 
+    /**
+     * @TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
+     *       {@link #getVersionRangeViolation(int)} but it's not used like that in
+     *       {@link DefaultArtifactCollector}
+     */
     public ArtifactResolutionResult addVersionRangeViolation( Exception e )
     {
-        if ( versionRangeViolations == null )
-        {
-            versionRangeViolations = new ArrayList();
-        }
+        initList( versionRangeViolations );
 
         versionRangeViolations.add( e );
 
@@ -173,12 +175,9 @@
         return metadataResolutionExceptions != null;
     }
 
-    public ArtifactResolutionResult addMetadataResolutionException( Exception e )
+    public ArtifactResolutionResult addMetadataResolutionException( ArtifactResolutionException e )
     {
-        if ( metadataResolutionExceptions == null )
-        {
-            metadataResolutionExceptions = new ArrayList();
-        }
+        initList( metadataResolutionExceptions );
 
         metadataResolutionExceptions.add( e );
 
@@ -204,12 +203,9 @@
         return errorArtifactExceptions != null;
     }
 
-    public ArtifactResolutionResult addErrorArtifactException( Exception e )
+    public ArtifactResolutionResult addErrorArtifactException( ArtifactResolutionException e )
     {
-        if ( errorArtifactExceptions == null )
-        {
-            errorArtifactExceptions = new ArrayList();
-        }
+        initList( errorArtifactExceptions );
 
         errorArtifactExceptions.add( e );
 
@@ -230,14 +226,11 @@
         return circularDependencyExceptions != null;
     }
 
-    public ArtifactResolutionResult addCircularDependencyException( Exception e )
+    public ArtifactResolutionResult addCircularDependencyException( CyclicDependencyException e )
     {
-        if ( circularDependencyExceptions == null )
-        {
-            circularDependencyExceptions = new ArrayList();
-        }
+        initList( circularDependencyExceptions );
 
-        errorArtifactExceptions.add( e );
+        circularDependencyExceptions.add( e );
 
         return this;
     }
@@ -270,5 +263,11 @@
         return this;
     }
 
-
+    private void initList( List l )
+    {
+        if ( l == null )
+        {
+            l = new ArrayList();
+        }
+    }
 }