You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2012/08/22 14:38:24 UTC
svn commit: r1376019 - in
/ant/core/trunk/src/main/org/apache/tools/ant/launch: Launcher.java
Locator.java
Author: hibou
Date: Wed Aug 22 12:38:24 2012
New Revision: 1376019
URL: http://svn.apache.org/viewvc?rev=1376019&view=rev
Log:
Make Locator.fileToURL and replace its use by FileUtils.getFileUtils().getFileURL()
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java
ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java?rev=1376019&r1=1376018&r2=1376019&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java Wed Aug 22 12:38:24 2012
@@ -25,6 +25,8 @@ import java.util.StringTokenizer;
import java.util.List;
import java.util.ArrayList;
+import org.apache.tools.ant.util.FileUtils;
+
/**
@@ -150,7 +152,7 @@ public class Launcher {
}
}
- URL url = Locator.fileToURL(element);
+ URL url = FileUtils.getFileUtils().getFileURL(element);
if (launchDiag) { System.out.println("adding library URL: " + url) ;}
libPathURLs.add(url);
}
@@ -381,7 +383,7 @@ public class Launcher {
systemJars.length);
if (toolsJar != null) {
- jars[jars.length - 1] = Locator.fileToURL(toolsJar);
+ jars[jars.length - 1] = FileUtils.getFileUtils().getFileURL(toolsJar);
}
return jars;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java?rev=1376019&r1=1376018&r2=1376019&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/launch/Locator.java Wed Aug 22 12:38:24 2012
@@ -400,7 +400,9 @@ public final class Locator {
* @param file the file to convert
* @return URL the converted File
* @throws MalformedURLException on error
+ * @deprecated since 1.9, use {@link FileUtils#getFileURL(File)}
*/
+ @Deprecated
public static URL fileToURL(File file)
throws MalformedURLException {
return FileUtils.getFileUtils().getFileURL(file);
@@ -501,7 +503,7 @@ public final class Locator {
String littlePath = path.toLowerCase(Locale.ENGLISH);
for (int i = 0; i < extensions.length; ++i) {
if (littlePath.endsWith(extensions[i])) {
- urls[0] = fileToURL(location);
+ urls[0] = FileUtils.getFileUtils().getFileURL(location);
break;
}
}
@@ -521,7 +523,7 @@ public final class Locator {
});
urls = new URL[matches.length];
for (int i = 0; i < matches.length; ++i) {
- urls[i] = fileToURL(matches[i]);
+ urls[i] = FileUtils.getFileUtils().getFileURL(matches[i]);
}
return urls;
}
Re: svn commit: r1376019 - in /ant/core/trunk/src/main/org/apache/tools/ant/launch: Launcher.java Locator.java
Posted by Stefan Bodewig <bo...@apache.org>.
On 2012-08-23, Nicolas Lalevée wrote:
> Le 23 août 2012 à 06:27, Stefan Bodewig a écrit :
>> On 2012-08-22, <hi...@apache.org> wrote:
>>> Make Locator.fileToURL and replace its use by FileUtils.getFileUtils().getFileURL()
>> Doesn't this cause a dependency cycle between ant.jar and
>> ant-launcher.jar?
> Yes, and I fixed it just after, cf r1376031
Saw that later, sorry for the noise.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: svn commit: r1376019 - in /ant/core/trunk/src/main/org/apache/tools/ant/launch: Launcher.java Locator.java
Posted by Nicolas Lalevée <ni...@hibnet.org>.
Le 23 août 2012 à 06:27, Stefan Bodewig a écrit :
> On 2012-08-22, <hi...@apache.org> wrote:
>
>> Make Locator.fileToURL and replace its use by FileUtils.getFileUtils().getFileURL()
>
> Doesn't this cause a dependency cycle between ant.jar and
> ant-launcher.jar?
Yes, and I fixed it just after, cf r1376031
Nicolas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: svn commit: r1376019 - in /ant/core/trunk/src/main/org/apache/tools/ant/launch: Launcher.java Locator.java
Posted by Stefan Bodewig <bo...@apache.org>.
On 2012-08-22, <hi...@apache.org> wrote:
> Make Locator.fileToURL and replace its use by FileUtils.getFileUtils().getFileURL()
Doesn't this cause a dependency cycle between ant.jar and
ant-launcher.jar?
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org