From 0a5d22e8dd8aa03b516766ada0d54990bc9cba66 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Mon, 7 Jun 2010 12:04:23 -0500 Subject: [PATCH] Adapt translations to new EncodingSupport wrapper class - Encoding is now a wrapper class, not translated directly to coding string --- CS2JLibrary/NetTranslations/System/IO/StreamReader.xml | 3 ++- CS2JLibrary/src/RusticiSoftware/System/IO/StreamReader.java | 6 ++++-- .../src/RusticiSoftware/System/Text/EncodingSupport.java | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CS2JLibrary/NetTranslations/System/IO/StreamReader.xml b/CS2JLibrary/NetTranslations/System/IO/StreamReader.xml index e53667d..b2f3494 100755 --- a/CS2JLibrary/NetTranslations/System/IO/StreamReader.xml +++ b/CS2JLibrary/NetTranslations/System/IO/StreamReader.xml @@ -67,9 +67,10 @@ RusticiSoftware.System.IO.StreamReader + RusticiSoftware.System.Text.EncodingSupport java.io.* - new BufferedReader(StreamReader.make(new BufferedInputStream(${stream}), "UTF-8")) + new BufferedReader(StreamReader.make(new BufferedInputStream(${stream}), new EncodingSupport("UTF-8"))) diff --git a/CS2JLibrary/src/RusticiSoftware/System/IO/StreamReader.java b/CS2JLibrary/src/RusticiSoftware/System/IO/StreamReader.java index 0361597..1c1a17e 100755 --- a/CS2JLibrary/src/RusticiSoftware/System/IO/StreamReader.java +++ b/CS2JLibrary/src/RusticiSoftware/System/IO/StreamReader.java @@ -23,6 +23,8 @@ package RusticiSoftware.System.IO; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; + +import RusticiSoftware.System.Text.EncodingSupport; public class StreamReader { @@ -91,13 +93,13 @@ public class StreamReader { return retISR; } - public static InputStreamReader make(InputStream is, String cs) throws IOException + public static InputStreamReader make(InputStream is, EncodingSupport cs) throws IOException { String enc = getEncoding(is); if (enc != null) return new InputStreamReader(is, enc); else - return new InputStreamReader(is, cs); + return new InputStreamReader(is, cs.getString()); } } diff --git a/CS2JLibrary/src/RusticiSoftware/System/Text/EncodingSupport.java b/CS2JLibrary/src/RusticiSoftware/System/Text/EncodingSupport.java index 6904cd1..05a7a6a 100644 --- a/CS2JLibrary/src/RusticiSoftware/System/Text/EncodingSupport.java +++ b/CS2JLibrary/src/RusticiSoftware/System/Text/EncodingSupport.java @@ -12,4 +12,8 @@ public class EncodingSupport { public byte[] getBytes(String input) throws UnsupportedEncodingException { return input.getBytes(coding); } + + public String getString() { + return coding; + } }