[Libreoffice-commits] core.git: external/jfreereport

rbuj robert.buj at gmail.com
Sat Jul 26 08:50:57 PDT 2014


 external/jfreereport/patches/librepository-1.1.6-deprecated.patch |   26 ++++++++++
 1 file changed, 26 insertions(+)

New commits:
commit 02085703db494183b75da3ae59d25b907d6bea54
Author: rbuj <robert.buj at gmail.com>
Date:   Fri Jul 25 11:34:36 2014 +0200

    jfreereport_librepository: [deprecation] toURL() in File has been deprecated
    
    http://docs.oracle.com/javase/6/docs/api/java/io/File.html#toURL()
    
    Change-Id: I27d67f930ab15b69319a733b4bdedde834aba48d
    Reviewed-on: https://gerrit.libreoffice.org/10530
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/external/jfreereport/patches/librepository-1.1.6-deprecated.patch b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch
index a266efc..324a8f4 100644
--- a/external/jfreereport/patches/librepository-1.1.6-deprecated.patch
+++ b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch
@@ -9,3 +9,29 @@
    }
  
    /**
+--- misc/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/file/FileRepository.java	2010-04-27 16:04:50.000000000 +0200
++++ misc/build/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/file/FileRepository.java	2014-07-25 11:21:51.000000000 +0200
+@@ -19,7 +19,9 @@
+ 
+ import java.io.File;
+ import java.io.Serializable;
++import java.lang.SecurityException;
+ import java.net.MalformedURLException;
++import java.net.URI;
+ import java.net.URL;
+ 
+ import org.pentaho.reporting.libraries.repository.ContentIOException;
+@@ -104,6 +106,11 @@
+    */
+   public URL getURL() throws MalformedURLException
+   {
+-    return root.getBackend().toURL();
++    try {
++      URI uri = root.getBackend().toURI();
++      return uri.toURL();
++    } catch (SecurityException e) {
++      throw new MalformedURLException("impossible" + e);
++    }
+   }
+ }
+


More information about the Libreoffice-commits mailing list