svn commit: r880764 - /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java

[hibou]

Author: hibou
Date: Mon Nov 16 14:21:45 2009
New Revision: 880764

URL: http://svn.apache.org/viewvc?rev=880764&view=rev
Log:
IVYDE-220 : make IvyDE take into account the workspace-level ivy settings

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

Modified: 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java?rev=880764&r1=880763&r2=880764&view=diff
==============================================================================
--- 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
 (original)
+++ 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
 Mon Nov 16 14:21:45 2009
@@ -210,7 +210,7 @@
     }
 
     private Ivy getIvy(File file) throws IvyDEException {
-        String ivySettingsPath = 
conf.getIvySettingsSetup().getResolvedIvySettingsPath();
+        String ivySettingsPath = conf.getInheritedIvySettingsPath();
         if (!file.exists()) {
             IvyDEException ex = new IvyDEException("Ivy settings file not 
found",
                     "The Ivy settings file '" + ivySettingsPath + "' cannot be 
found", null);