ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r993298 - /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
Date Tue, 07 Sep 2010 09:28:51 GMT
Author: hibou
Date: Tue Sep  7 09:28:51 2010
New Revision: 993298

URL: http://svn.apache.org/viewvc?rev=993298&view=rev
Log:
Remove the path update as it breaks the java launcher: it needs a better fix

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

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java?rev=993298&r1=993297&r2=993298&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
Tue Sep  7 09:28:51 2010
@@ -92,14 +92,18 @@ public class IvyClasspathInitializer ext
                     }
                 }
 
+                // FIXME : this breaks the java launcher. IvyDERuntimeClasspathEntryResolver
gets an
+                // unconfigured container. The culprit may be the resolver which doesn't
handle properly
+                // project less container.
+
                 // recompute the path as it may have been "upgraded"
-                IPath updatedPath = IvyClasspathContainerConfAdapter.getPath(ivycp.getConf());
-                if (!updatedPath.equals(containerPath)) {
-                    updateIvyDEContainerPath(project, entry, attributes, exported, updatedPath);
-                    return;
-                }
+                // IPath updatedPath = IvyClasspathContainerConfAdapter.getPath(ivycp.getConf());
+                // if (!updatedPath.equals(containerPath)) {
+                // updateIvyDEContainerPath(project, entry, attributes, exported, updatedPath);
+                // return;
+                // }
 
-                JavaCore.setClasspathContainer(updatedPath, new IJavaProject[] {project},
+                JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {project},
                     new IClasspathContainer[] {ivycp}, null);
 
                 int startupMode = IvyPlugin.getPreferenceStoreHelper().getResolveOnStartup();



Mime
View raw message