ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r898484 - in /ant/ivy/ivyde/trunk: CHANGES.txt org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
Date Tue, 12 Jan 2010 19:47:32 GMT
Author: hibou
Date: Tue Jan 12 19:47:32 2010
New Revision: 898484

URL: http://svn.apache.org/viewvc?rev=898484&view=rev
Log:
IVYDE-229:
 - make the code that search for containers more robust against closed projects

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

Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=898484&r1=898483&r2=898484&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Tue Jan 12 19:47:32 2010
@@ -28,6 +28,7 @@
 - FIX: The workspace resolver doesn't resolve conflicts correctly (IVYDE-212)
 - FIX: dependency order not preserved causing failed builds (IVYDE-170)
 - FIX: Can not add a project specific property file when adding a library (IVYDE-228)
+- FIX: IvyDE log errors while trying to get info on closed projects (IVYDE-229)
 
   version 2.0.0 final
 ==========================

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java?rev=898484&r1=898483&r2=898484&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
Tue Jan 12 19:47:32 2010
@@ -115,7 +115,7 @@
     public static List/* <IvyClasspathContainer> */getIvyClasspathContainers(
             IJavaProject javaProject) {
         List/* <IvyClasspathContainer> */containers = new ArrayList();
-        if (FakeProjectManager.isFake(javaProject)) {
+        if (FakeProjectManager.isFake(javaProject) || !javaProject.exists()) {
             return containers;
         }
         try {
@@ -142,6 +142,9 @@
     public static List/* <IvyClasspathContainer> */getIvyFileClasspathContainers(IFile
ivyfile) {
         IJavaProject javaProject = JavaCore.create(ivyfile.getProject());
         List/* <IvyClasspathContainer> */containers = new ArrayList();
+        if (FakeProjectManager.isFake(javaProject) || !javaProject.exists()) {
+            return containers;
+        }
         try {
             IClasspathEntry[] entries = javaProject.getRawClasspath();
             for (int i = 0; i < entries.length; i++) {
@@ -171,6 +174,9 @@
             IFile ivySettings) {
         IJavaProject javaProject = JavaCore.create(ivySettings.getProject());
         List/* <IvyClasspathContainer> */containers = new ArrayList();
+        if (FakeProjectManager.isFake(javaProject) || !javaProject.exists()) {
+            return containers;
+        }
         try {
             IClasspathEntry[] entries = javaProject.getRawClasspath();
             for (int i = 0; i < entries.length; i++) {
@@ -274,7 +280,7 @@
      */
     public static IClasspathEntry getIvyClasspathEntry(IPath containerPath,
             IJavaProject javaProject) {
-        if (FakeProjectManager.isFake(javaProject)) {
+        if (FakeProjectManager.isFake(javaProject) || !javaProject.exists()) {
             return null;
         }
         try {



Mime
View raw message