You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2009/04/24 15:13:00 UTC

svn commit: r768297 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse: CHANGES.txt src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java

Author: hibou
Date: Fri Apr 24 13:13:00 2009
New Revision: 768297

URL: http://svn.apache.org/viewvc?rev=768297&view=rev
Log:
IVYDE-174: use of the resolve id rather than the requested one

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=768297&r1=768296&r2=768297&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Fri Apr 24 13:13:00 2009
@@ -31,6 +31,7 @@
 - FIX: The resolve in workspace is being evicted by transitive dependencies (IVYDE-169)
 - FIX: Error messages when setting path to ivy settings file covers what is being typed in (IVYDE-172)
 - FIX: ResolveAllAction does not resolve multiple IvyDE containers in a single project (IVYDE-175)
+- FIX: The sources/javadocs are not added for dependencies which don't have a fixed revision (IVYDE-174)
 
   version 2.0.0 beta1
 ==========================

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=768297&r1=768296&r2=768297&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java Fri Apr 24 13:13:00 2009
@@ -172,11 +172,11 @@
         }
     }
 
-    private Map dependenciesAsMap(ResolveReport r) {
+    private Map/* <ModuleRevisionId, IvyNode> */dependenciesAsMap(ResolveReport r) {
         Map result = new HashMap();
         for (Iterator it = r.getDependencies().iterator(); it.hasNext();) {
             IvyNode node = (IvyNode) it.next();
-            result.put(node.getId(), node);
+            result.put(node.getResolvedId(), node);
         }
         return result;
     }