ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r992035 - /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java
Date Thu, 02 Sep 2010 17:51:55 GMT
Author: hibou
Date: Thu Sep  2 17:51:55 2010
New Revision: 992035

URL: http://svn.apache.org/viewvc?rev=992035&view=rev
Log:
Take into account the global settings

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java?rev=992035&r1=992034&r2=992035&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java
Thu Sep  2 17:51:55 2010
@@ -29,6 +29,7 @@ import org.apache.ivy.core.report.Artifa
 import org.apache.ivy.util.Message;
 import org.apache.ivyde.eclipse.resolve.IvyResolver;
 import org.apache.ivyde.eclipse.resolve.ResolveResult;
+import org.apache.ivyde.eclipse.retrieve.RetrieveSetup;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.IClasspathEntry;
 
@@ -47,10 +48,11 @@ public class IvyClasspathResolver extend
         this.ivycp = ivycp;
         this.conf = ivycp.getConf();
         setUsePreviousResolveIfExist(usePreviousResolveIfExist);
-        if (conf.isRetrievedClasspath()) {
-            setRetrievePattern(conf.getRetrievedClasspathSetup().getRetrievePattern());
-            setRetrieveSync(conf.getRetrievedClasspathSetup().isRetrieveSync());
-            setRetrieveTypes(conf.getRetrievedClasspathSetup().getRetrieveTypes());
+        if (conf.isInheritedRetrievedClasspath()) {
+            RetrieveSetup setup = conf.getInheritedRetrievedClasspathSetup();
+            setRetrievePattern(setup.getRetrievePattern());
+            setRetrieveSync(setup.isRetrieveSync());
+            setRetrieveTypes(setup.getRetrieveTypes());
         }
     }
 



Mime
View raw message