You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2008/04/11 01:06:40 UTC
svn commit: r647000 - in /commons/proper/io/trunk/src:
java/org/apache/commons/io/FileUtils.java
test/org/apache/commons/io/FileUtilsTestCase.java
Author: niallp
Date: Thu Apr 10 16:06:38 2008
New Revision: 647000
URL: http://svn.apache.org/viewvc?rev=647000&view=rev
Log:
IO-163 Change FileUtils.toURLs() to use File.toURI().toURL() rather than File.toURL() - thanks to Alex Miller for the suggestion
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java
Modified: commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java?rev=647000&r1=646999&r2=647000&view=diff
==============================================================================
--- commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java (original)
+++ commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java Thu Apr 10 16:06:38 2008
@@ -532,7 +532,7 @@
URL[] urls = new URL[files.length];
for (int i = 0; i < urls.length; i++) {
- urls[i] = files[i].toURL();
+ urls[i] = files[i].toURI().toURL();
}
return urls;
Modified: commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java?rev=647000&r1=646999&r2=647000&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java (original)
+++ commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java Thu Apr 10 16:06:38 2008
@@ -328,6 +328,7 @@
File[] files = new File[] {
new File(getTestDirectory(), "file1.txt"),
new File(getTestDirectory(), "file2.txt"),
+ new File(getTestDirectory(), "test file.txt"),
};
URL[] urls = FileUtils.toURLs(files);
@@ -336,6 +337,10 @@
assertEquals(true, urls[0].toExternalForm().indexOf("file1.txt") >= 0);
assertEquals(true, urls[1].toExternalForm().startsWith("file:"));
assertEquals(true, urls[1].toExternalForm().indexOf("file2.txt") >= 0);
+
+ // Test escaped char
+ assertEquals(true, urls[2].toExternalForm().startsWith("file:"));
+ assertEquals(true, urls[2].toExternalForm().indexOf("test%20file.txt") >= 0);
}
// public void testToURLs2() throws Exception {
Re: svn commit: r647000 - in /commons/proper/io/trunk/src: java/org/apache/commons/io/FileUtils.java test/org/apache/commons/io/FileUtilsTestCase.java
Posted by Niall Pemberton <ni...@gmail.com>.
On Sat, Apr 12, 2008 at 10:22 AM, Stephen Colebourne
<sc...@btopenworld.com> wrote:
> I believe that this is a Java 1.4 specific method. Are we OK with that?
Yes the current trunk requires a minimum of JDK 1.5
Niall
> Stephen
>
>
> niallp@apache.org wrote:
>
> > - urls[i] = files[i].toURL();
> > + urls[i] = files[i].toURI().toURL();
> >
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r647000 - in /commons/proper/io/trunk/src: java/org/apache/commons/io/FileUtils.java
test/org/apache/commons/io/FileUtilsTestCase.java
Posted by Stephen Colebourne <sc...@btopenworld.com>.
I believe that this is a Java 1.4 specific method. Are we OK with that?
Stephen
niallp@apache.org wrote:
> - urls[i] = files[i].toURL();
> + urls[i] = files[i].toURI().toURL();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org