Kaydet (Commit) 8f4cba86 authored tarafından rbuj's avatar rbuj Kaydeden (comit) Caolán McNamara

jfreereport_libbase: [deprecation] toURL() in File has been deprecated

http://docs.oracle.com/javase/6/docs/api/java/io/File.html#toURL()

Change-Id: I4322254d04e3ccf894acebf8b71de6f51e0a110a
Reviewed-on: https://gerrit.libreoffice.org/10467Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 3a6d0f22
...@@ -9,3 +9,45 @@ ...@@ -9,3 +9,45 @@
} }
/** /**
--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java 2010-04-27 15:58:46.000000000 +0200
+++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java 2014-07-22 17:53:13.000000000 +0200
@@ -173,7 +173,7 @@
final File file = directoryOrJar.getAbsoluteFile();
if (file.isDirectory() && file.exists() && file.canRead())
{
- allURLs.add(file.toURL());
+ allURLs.add(file.toURI().toURL());
directoryURLs.add(file);
continue;
}
@@ -186,8 +186,8 @@
final String fileName = file.getName();
if (fileName.endsWith(".jar") || fileName.endsWith(".zip"))
{
- allURLs.add(file.toURL());
- jarURLs.add(file.toURL());
+ allURLs.add(file.toURI().toURL());
+ jarURLs.add(file.toURI().toURL());
}
}
@@ -199,7 +199,7 @@
final File file = driverFiles[i];
if (file.isDirectory() && file.exists() && file.canRead())
{
- allURLs.add(file.toURL());
+ allURLs.add(file.toURI().toURL());
directoryURLs.add(file);
continue;
}
@@ -212,8 +212,8 @@
final String fileName = file.getName();
if (fileName.endsWith(".jar") || fileName.endsWith(".zip"))
{
- allURLs.add(file.toURL());
- jarURLs.add(file.toURL());
+ allURLs.add(file.toURI().toURL());
+ jarURLs.add(file.toURI().toURL());
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment