Author: hibou
Date: Sat May 30 08:10:34 2009
New Revision: 780201
URL: http://svn.apache.org/viewvc?rev=780201&view=rev
Log:
IVYDE-182:
- avoid using the Eclipse API to get file contents
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=780201&r1=780200&r2=780201&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Sat May 30
08:10:34 2009
@@ -35,6 +35,7 @@
- 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)
+- FIX: Importing a project with Ivy fails if properties files are specified in
settings (IVYDE-182)
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=780201&r1=780200&r2=780201&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
Sat May 30 08:10:34 2009
@@ -623,10 +623,11 @@
Path p = new Path(file);
if (javaProject != null && !p.isAbsolute()) {
try {
- is =
javaProject.getProject().getFile(file).getContents();
- } catch (CoreException e) {
- IvyDEException ex = new IvyDEException("Unreadable
property file",
- "The property file '" + file + "' could not be
read", e);
+ is = new
FileInputStream(javaProject.getProject().getFile(file)
+ .getFullPath().toFile());
+ } catch (FileNotFoundException e) {
+ IvyDEException ex = new IvyDEException("Property file
not found",
+ "The property file '" + file + "' could not be
found", e);
setConfStatus(ex);
throw ex;
}
