From 73c3b12dd409d6aefa512d55beaeb8b886d91a8e Mon Sep 17 00:00:00 2001 From: Mark Davis Date: Thu, 25 Oct 2001 20:32:38 +0000 Subject: [PATCH] some additional file utilities X-SVN-Rev: 6433 --- .../ibm/text/utility/UTF8StreamReader.java | 6 +- .../ibm/text/utility/UTF8StreamWriter.java | 12 ++- .../com/ibm/text/utility/Utility.java | 77 ++++++++++++++++--- 3 files changed, 79 insertions(+), 16 deletions(-) diff --git a/tools/unicodetools/com/ibm/text/utility/UTF8StreamReader.java b/tools/unicodetools/com/ibm/text/utility/UTF8StreamReader.java index 1a5bee1330d..1c51895357b 100644 --- a/tools/unicodetools/com/ibm/text/utility/UTF8StreamReader.java +++ b/tools/unicodetools/com/ibm/text/utility/UTF8StreamReader.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/text/utility/UTF8StreamReader.java,v $ -* $Date: 2001/08/31 00:19:16 $ -* $Revision: 1.2 $ +* $Date: 2001/10/25 20:32:38 $ +* $Revision: 1.3 $ * ******************************************************************************* */ @@ -35,7 +35,7 @@ public final class UTF8StreamReader extends Reader { private InputStream input; private boolean checkIrregular = true; - UTF8StreamReader(InputStream stream, int buffersize) { + public UTF8StreamReader(InputStream stream, int buffersize) { if (buffersize < 1) { throw new IllegalArgumentException("UTF8StreamReader buffersize must be >= 1"); } diff --git a/tools/unicodetools/com/ibm/text/utility/UTF8StreamWriter.java b/tools/unicodetools/com/ibm/text/utility/UTF8StreamWriter.java index 1c8a03170bd..97c81fa79d7 100644 --- a/tools/unicodetools/com/ibm/text/utility/UTF8StreamWriter.java +++ b/tools/unicodetools/com/ibm/text/utility/UTF8StreamWriter.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/text/utility/UTF8StreamWriter.java,v $ -* $Date: 2001/09/19 23:33:52 $ -* $Revision: 1.3 $ +* $Date: 2001/10/25 20:32:38 $ +* $Revision: 1.4 $ * ******************************************************************************* */ @@ -35,8 +35,13 @@ public final class UTF8StreamWriter extends Writer { private int bEnd; private int bIndex = 0; private int highSurrogate = 0; + private boolean removeCR; public UTF8StreamWriter(OutputStream stream, int buffersize) { + this(stream, buffersize, true); + } + + public UTF8StreamWriter(OutputStream stream, int buffersize, boolean removeCR) { if (buffersize < 5) { throw new IllegalArgumentException("UTF8StreamWriter buffersize must be >= 5"); } @@ -44,6 +49,7 @@ public final class UTF8StreamWriter extends Writer { bBuffer = new byte[buffersize]; bEnd = buffersize; bSafeEnd = buffersize - 4; + this.removeCR = removeCR; } private static final int @@ -72,7 +78,7 @@ public final class UTF8StreamWriter extends Writer { int utf32 = buffer[cStart++]; - if (utf32 == 0x0D) continue; // skip write + if (utf32 == 0x0D && removeCR) continue; // skip write // special check for surrogates diff --git a/tools/unicodetools/com/ibm/text/utility/Utility.java b/tools/unicodetools/com/ibm/text/utility/Utility.java index e05b43a65de..548b43ab054 100644 --- a/tools/unicodetools/com/ibm/text/utility/Utility.java +++ b/tools/unicodetools/com/ibm/text/utility/Utility.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/text/utility/Utility.java,v $ -* $Date: 2001/09/19 23:33:52 $ -* $Revision: 1.4 $ +* $Date: 2001/10/25 20:32:38 $ +* $Revision: 1.5 $ * ******************************************************************************* */ @@ -45,23 +45,23 @@ public final class Utility { // COMMON UTILITIES } } - public static int setBits(int source, int start, int end) { + public static long setBits(long source, int start, int end) { if (start < end) { int temp = start; start = end; end = temp; } - int bmstart = (1 << (start+1)) - 1; - int bmend = (1 << end) - 1; + long bmstart = (1L << (start+1)) - 1; + long bmend = (1L << end) - 1; bmstart &= ~bmend; return source |= bmstart; } - public static int setBit(int source, int start) { + public static long setBit(long source, int start) { return setBits(source, start, start); } - public static int clearBits(int source, int start, int end) { + public static long clearBits(long source, int start, int end) { if (start < end) { int temp = start; start = end; @@ -73,7 +73,7 @@ public final class Utility { // COMMON UTILITIES return source &= ~bmstart; } - public static int clearBit(int source, int start) { + public static long clearBit(long source, int start) { return clearBits(source, start, start); } @@ -424,9 +424,58 @@ public final class Utility { // COMMON UTILITIES private static final String DATA_DIR = "C:\\DATA"; public static PrintWriter openPrintWriter(String filename) throws IOException { + return openPrintWriter(filename, true); + } + + public static PrintWriter openPrintWriter(String filename, boolean removeCR) throws IOException { return new PrintWriter( - new UTF8StreamWriter(new FileOutputStream(DATA_DIR + File.separator + "GEN" + File.separator + filename), - 32*1024)); + new UTF8StreamWriter( + new FileOutputStream(DATA_DIR + File.separator + "GEN" + File.separator + filename), + 32*1024, + removeCR)); + } + + public static void print(PrintWriter pw, Collection c, String separator) { + print(pw, c, separator, null); + } + + public interface Breaker { + public String get(Object current, Object old); + } + + public static void print(PrintWriter pw, Collection c, String separator, Breaker b) { + Iterator it = c.iterator(); + boolean first = true; + Object last = null; + while (it.hasNext()) { + Object obj = it.next(); + if (first) { + first = false; + } + else pw.print(separator); + if (b != null) { + pw.print(b.get(obj, last)); + } + pw.print(obj); + last = obj; + } + } + + public static void appendFile(String filename, boolean utf8, PrintWriter output) throws IOException { + FileInputStream fis = new FileInputStream(filename); + InputStreamReader isr = utf8 ? new InputStreamReader(fis, "UTF8") : new InputStreamReader(fis); + BufferedReader br = new BufferedReader(isr, 32*1024); + while (true) { + String line = br.readLine(); + if (line == null) break; + output.println(line); + } + } + + public static void copyTextFile(String filename, boolean utf8, String newName) throws IOException { + PrintWriter out = Utility.openPrintWriter(newName); + appendFile(filename, utf8, out); + out.close(); } public static BufferedReader openUnicodeFile(String filename, String version) throws IOException { @@ -466,4 +515,12 @@ public final class Utility { // COMMON UTILITIES log.println("-->"); log.println(""); } + + public static String replace(String source, String piece, String replacement) { + while (true) { + int pos = source.indexOf(piece); + if (pos < 0) return source; + source = source.substring(0,pos) + source.substring(pos + piece.length()); + } + } } \ No newline at end of file