svn commit: r532415 - /incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java

[xavier]

Author: xavier
Date: Wed Apr 25 10:30:13 2007
New Revision: 532415

URL: http://svn.apache.org/viewvc?view=rev&rev=532415
Log:
workaround for IVY-430 related issue

Modified:
    
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java

Modified: 
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?view=diff&rev=532415&r1=532414&r2=532415
==============================================================================
--- 
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
 (original)
+++ 
incubator/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
 Wed Apr 25 10:30:13 2007
@@ -329,6 +329,7 @@
 
                private File getSourcesArtifact(Artifact artifact, Collection 
all)
                {
+               _monitor.subTask("searching sources for "+artifact);
             for (Iterator iter = all.iterator(); iter.hasNext();) {
                 Artifact a = (Artifact)iter.next();
                 if (a.getName().equals(artifact.getName()) &&
@@ -347,6 +348,7 @@
 
                private File getJavadocArtifact(Artifact artifact, Collection 
all)
                {
+               _monitor.subTask("searching javadoc for "+artifact);
                        for (Iterator iter = all.iterator(); iter.hasNext();) {
                                Artifact a = (Artifact)iter.next();
                                if (a.getName().equals(artifact.getName()) &&
@@ -377,7 +379,11 @@
                                        "jar",
                                        extraAtt
                        );
-                       File metaArtifactFile = 
_cacheMgr.getArchiveFileInCache(metaArtifact);
+                       // we search archive file in cache with origin == null, 
to be sure we don't use
+                       // a badly saved artifact origin
+                       // we could go back to 
_cacheMgr.getArchiveFileInCache(metaArtifact)
+                       // when IVY-430 is resolved
+                       File metaArtifactFile = 
_cacheMgr.getArchiveFileInCache(metaArtifact, null);
                        File attempt = new 
File(metaArtifactFile.getAbsolutePath()+".notfound");
                        if (metaArtifactFile.exists()) {
                                return metaArtifactFile;