[Libreoffice-commits] core.git: external/jfreereport
rbuj
robert.buj at gmail.com
Wed Jul 23 01:00:43 PDT 2014
external/jfreereport/patches/libbase-1.1.6-deprecated.patch | 42 ++++++++++++
1 file changed, 42 insertions(+)
New commits:
commit 8f4cba868677a60ff8a9e9b3ea7a05bdc206bcc0
Author: rbuj <robert.buj at gmail.com>
Date: Tue Jul 22 18:13:52 2014 +0200
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/10467
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/external/jfreereport/patches/libbase-1.1.6-deprecated.patch b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch
index da28c30..e5cd38b 100644
--- a/external/jfreereport/patches/libbase-1.1.6-deprecated.patch
+++ b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch
@@ -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());
+ }
+ }
+ }
More information about the Libreoffice-commits
mailing list