From cb6669bf9e0c86c7beae8dce56738b1f621dba34 Mon Sep 17 00:00:00 2001 From: Johann Werner Date: Wed, 15 Jan 2014 09:52:54 +0100 Subject: [PATCH] remove Java 1.6 dependencies --- .../er/extensions/foundation/ERXFileUtilities.java | 8 ++++---- .../Sources/er/jasperreports/ERJRReportTaskFromEO.java | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java index f323ea65fba..18bfa44b173 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java @@ -428,7 +428,7 @@ public static void stringToGZippedFile(String s, File f) throws IOException { if (s == null) throw new NullPointerException("string argument cannot be null"); if (f == null) throw new NullPointerException("file argument cannot be null"); - byte[] bytes = s.getBytes(charset()); + byte[] bytes = s.getBytes(charset().name()); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); writeInputStreamToGZippedFile(bais, f); } @@ -536,7 +536,7 @@ public static void remoteCopyFile(String srcHost, String srcPath, File dstFile) * @throws IOException if things go wrong */ public static String stringFromGZippedFile(File f) throws IOException { - return new String(bytesFromGZippedFile(f), charset()); + return new String(bytesFromGZippedFile(f), charset().name()); } /** @@ -547,7 +547,7 @@ public static String stringFromGZippedFile(File f) throws IOException { * @throws IOException if things go wrong */ public static String stringFromFile(File f) throws IOException { - return new String(bytesFromFile(f), charset()); + return new String(bytesFromFile(f), charset().name()); } /** @@ -560,7 +560,7 @@ public static String stringFromFile(File f) throws IOException { */ public static String stringFromFile(File f, String encoding) throws IOException { if (encoding == null) { - return new String(bytesFromFile(f), charset()); + return new String(bytesFromFile(f), charset().name()); } return new String(bytesFromFile(f), encoding); } diff --git a/Frameworks/Reporting/ERJasperReports/Sources/er/jasperreports/ERJRReportTaskFromEO.java b/Frameworks/Reporting/ERJasperReports/Sources/er/jasperreports/ERJRReportTaskFromEO.java index fd044dfbabb..987555f300e 100644 --- a/Frameworks/Reporting/ERJasperReports/Sources/er/jasperreports/ERJRReportTaskFromEO.java +++ b/Frameworks/Reporting/ERJasperReports/Sources/er/jasperreports/ERJRReportTaskFromEO.java @@ -132,14 +132,8 @@ public File file() { return reportFile; } - - - @Override public Double percentComplete() { // TODO Auto-generated method stub return null; } - - - }