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

[hibou]

Author: hibou
Date: Sun Sep 20 18:05:34 2009
New Revision: 817069

URL: http://svn.apache.org/viewvc?rev=817069&view=rev
Log:
IVYDE-203: fix the bug in changin the way the path is resolve: use IPath.append 
rather than try to use project related path

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

Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=817069&r1=817068&r2=817069&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Sun Sep 20 18:05:34 2009
@@ -14,6 +14,7 @@
 - FIX: The gui wizard crash when adding a IvyDE Managed Dependencies library 
to a .launch file's classpath (IVYDE-200)
 - FIX: Ivy Library removed from the list of Java EE Module Dependencies after 
changing its properties (IVYDE-178)
 - FIX: Ivy Classpath Contributed to Dependent Projects When not Exported 
(IVYDE-193)
+- FIX: Incorrect project:// path in the ivysettings configuration make the UI 
crash (IVYDE-203)
 
   version 2.0.0 final
 ==========================

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=817069&r1=817068&r2=817069&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
 Sun Sep 20 18:05:34 2009
@@ -185,7 +185,7 @@
                     setConfStatus(ex);
                     throw ex;
                 }
-                File file = 
conf.getJavaProject().getProject().getFile(path).getLocation().toFile();
+                File file = 
conf.getJavaProject().getProject().getLocation().append(path).toFile();
                 if (!file.exists()) {
                     IvyDEException ex = new IvyDEException("Ivy settings file 
not found",
                             "The Ivy settings file '" + settingsPath + "' 
cannot be found", null);
@@ -319,8 +319,8 @@
                 Path p = new Path(file);
                 if (conf.getJavaProject() != null && !p.isAbsolute()) {
                     try {
-                        is = new 
FileInputStream(conf.getJavaProject().getProject().getFile(file)
-                                .getFullPath().toFile());
+                        is = new 
FileInputStream(conf.getJavaProject().getProject().getLocation()
+                                .append(file).toFile());
                     } catch (FileNotFoundException e) {
                         IvyDEException ex = new IvyDEException("Property file 
not found",
                                 "The property file '" + file + "' could not be 
found", e);
@@ -366,7 +366,7 @@
     public File getIvyFile() {
         File file = new File(conf.getIvyXmlPath());
         if (!file.isAbsolute() && 
!FakeProjectManager.isFake(conf.getJavaProject())) {
-            file = 
conf.getJavaProject().getProject().getFile(conf.getIvyXmlPath()).getLocation()
+            file = 
conf.getJavaProject().getProject().getLocation().append(conf.getIvyXmlPath())
                     .toFile();
         }
         return file;
@@ -415,4 +415,8 @@
         }
     }
 
+    public String toString() {
+        return conf.toString();
+    }
+
 }