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

[hi...@apache.org]

Author: hibou
Date: Mon May 11 16:41:00 2009
New Revision: 773623

URL: http://svn.apache.org/viewvc?rev=773623&view=rev
Log:
IVYDE-181:
 - avoid to use the IFile which is managed by Eclipse and may not reflect the reality of the file system (cache and refresh job)

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/IvyClasspathContainerConfiguration.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=773623&r1=773622&r2=773623&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Mon May 11 16:41:00 2009
@@ -34,6 +34,7 @@
 - FIX: The sources/javadocs are not added for dependencies which don't have a fixed revision (IVYDE-174)
 - FIX: Refresh action is detaching javadoc and sources (IVYDE-176)
 - FIX: Add Ivy Library command adds classpath container even though it already exists (IVYDE-164)
+- FIX: Importing a project with Ivy configured with an embedded ivysettings fails (IVYDE-181)
 
   version 2.0.0 beta1
 ==========================

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java?rev=773623&r1=773622&r2=773623&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java Mon May 11 16:41:00 2009
@@ -491,14 +491,13 @@
             String projectName = settingsPath.substring(PROJECT_SCHEME_PREFIX_LENGTH, pathIndex);
             String path = settingsPath.substring(pathIndex + 1);
             if (projectName.equals("")) {
-                IFile f = javaProject.getProject().getFile(path);
-                if (!f.exists()) {
+                File file = javaProject.getProject().getFile(path).getLocation().toFile();
+                if (!file.exists()) {
                     IvyDEException ex = new IvyDEException("Ivy settings file not found",
                             "The Ivy settings file '" + settingsPath + "' cannot be found", null);
                     setConfStatus(ex);
                     throw ex;
                 }
-                File file = f.getLocation().toFile();
                 return getIvy(file);
             } else {
                 IResource p = ResourcesPlugin.getWorkspace().getRoot().findMember(projectName);
@@ -509,15 +508,14 @@
                     setConfStatus(ex);
                     throw ex;
                 }
-                IFile f = p.getProject().getFile(path);
-                if (!f.exists()) {
+                File file = p.getProject().getFile(path).getLocation().toFile();
+                if (!file.exists()) {
                     IvyDEException ex = new IvyDEException("Ivy settings file not found",
                             "The Ivy settings file '" + path + "' cannot be found in project '"
                                     + projectName + "'", null);
                     setConfStatus(ex);
                     throw ex;
                 }
-                File file = new File(f.getLocation().toOSString());
                 return getIvy(file);
             }
         }
@@ -786,7 +784,7 @@
         File file;
         if (javaProject != null) {
             IFile f = javaProject.getProject().getFile(ivyXmlPath);
-            file = new File(f.getLocation().toOSString());
+            file = f.getLocation().toFile();
         } else {
             file = new File(ivyXmlPath);
         }