/hg/icedtea: Remove EUCTW patch as class no longer uses java.uti...

[andrew at icedtea.classpath.org]

changeset 1529c5d1b41f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1529c5d1b41f
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu May 06 15:22:07 2010 +0100

	Remove EUCTW patch as class no longer uses java.util.Scanner.

	2010-05-06 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Remove euctw patch.
		* patches/boot/icedtea-euctw.patch, Removed; EUCTW class no
	longer uses java.util.Scanner.


diffstat:

3 files changed, 7 insertions(+), 34 deletions(-)
ChangeLog                        |    6 ++++++
Makefile.am                      |    3 +--
patches/boot/icedtea-euctw.patch |   32 --------------------------------

diffs (62 lines):

diff -r edb1a3766b13 -r 1529c5d1b41f ChangeLog
--- a/ChangeLog	Thu May 06 14:30:26 2010 +0100
+++ b/ChangeLog	Thu May 06 15:22:07 2010 +0100
@@ -1,3 +1,9 @@ 2009-10-22  Matthias Klose  <doko at ubuntu
+2010-05-06  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Remove euctw patch.
+	* patches/boot/icedtea-euctw.patch,
+	Removed; EUCTW class no longer uses java.util.Scanner.
+
 2009-10-22  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/no-precompiled.patch: Allow disabling of the
diff -r edb1a3766b13 -r 1529c5d1b41f Makefile.am
--- a/Makefile.am	Thu May 06 14:30:26 2010 +0100
+++ b/Makefile.am	Thu May 06 15:22:07 2010 +0100
@@ -423,8 +423,7 @@ SCANNER_PATCHES = patches/boot/icedtea-s
 	patches/boot/icedtea-dbcs.patch
 
 if LACKS_JAVA_UTIL_SCANNER
-ICEDTEA_BOOT_PATCHES += $(SCANNER_PATCHES) \
-	patches/boot/icedtea-euctw.patch
+ICEDTEA_BOOT_PATCHES += $(SCANNER_PATCHES)
 else
 if CP40630
 ICEDTEA_BOOT_PATCHES += $(SCANNER_PATCHES)
diff -r edb1a3766b13 -r 1529c5d1b41f patches/boot/icedtea-euctw.patch
--- a/patches/boot/icedtea-euctw.patch	Thu May 06 14:30:26 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java
---- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	2009-07-15 13:08:40.000000000 +0100
-+++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	2009-07-15 13:12:08.000000000 +0100
-@@ -27,7 +27,6 @@
- 
- import java.io.*;
- import java.util.ArrayList;
--import java.util.Scanner;
- import java.util.Formatter;
- import java.util.regex.*;
- import java.nio.charset.*;
-@@ -42,16 +41,16 @@
-     }
- 
-     private static String getCopyright(File f) throws IOException {
--        Scanner s = new Scanner(f, "ISO-8859-1");
-+        BufferedReader r =
-+            new BufferedReader(new InputStreamReader(new FileInputStream(f), "ISO-8859-1"));
-         StringBuilder sb = new StringBuilder();
--        while (s.hasNextLine()) {
--            String ln = s.nextLine();
-+        for (String ln = r.readLine(); ln != null; ln = r.readLine()) {
-             sb.append(ln + "\n");
-             // assume we have the copyright as the first comment
-             if (ln.matches("^\\s\\*\\/$"))
-                 break;
-         }
--        s.close();
-+        r.close();
-         return sb.toString();
-     }
-