diff options
| author | rbuj <robert.buj@gmail.com> | 2014-07-22 18:13:52 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-23 08:00:15 +0000 |
| commit | 8f4cba868677a60ff8a9e9b3ea7a05bdc206bcc0 (patch) | |
| tree | e45beecf1697e06e23d8898adca2dcdcae982c4b /external/jfreereport | |
| parent | OSX: change CXXFLAGS_CXX11 to be used not only with clang (diff) | |
| download | core-8f4cba868677a60ff8a9e9b3ea7a05bdc206bcc0.tar.gz core-8f4cba868677a60ff8a9e9b3ea7a05bdc206bcc0.zip | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/jfreereport')
| -rw-r--r-- | external/jfreereport/patches/libbase-1.1.6-deprecated.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/external/jfreereport/patches/libbase-1.1.6-deprecated.patch b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch index da28c30eb70e..e5cd38bd8a14 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()); + } + } + } |