ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1021290 - /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
Date Mon, 11 Oct 2010 09:40:53 GMT
Author: hibou
Date: Mon Oct 11 09:40:53 2010
New Revision: 1021290

URL: http://svn.apache.org/viewvc?rev=1021290&view=rev
Log:
IVYDE-260 : make the retrieve happen during the refresh too

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java?rev=1021290&r1=1021289&r2=1021290&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
Mon Oct 11 09:40:53 2010
@@ -265,8 +265,7 @@ public class IvyResolver {
 
     private void maybeRetrieve(Ivy ivy, ModuleDescriptor md, ResolveResult result,
             IProgressMonitor monitor) throws IOException {
-        if (result.isPreviousUsed() || retrievePattern == null
-                || FakeProjectManager.isFake(project)) {
+        if (retrievePattern == null || FakeProjectManager.isFake(project)) {
             return;
         }
 
@@ -274,7 +273,9 @@ public class IvyResolver {
         monitor.setTaskName("retrieving dependencies in " + pattern);
         RetrieveOptions options = new RetrieveOptions();
         options.setSync(retrieveSync);
-        options.setResolveId(result.getReport().getResolveId());
+        if (!result.isPreviousUsed()) {
+            options.setResolveId(result.getReport().getResolveId());
+        }
         options.setConfs(confs);
         if (retrieveTypes != null && !retrieveTypes.equals("*")) {
             List typeList = IvyClasspathUtil.split(retrieveTypes);



Mime
View raw message