This patch implements java/io/Console and adds a console() method to
java/lang/System. The implementation is lame but it works reasonably well.
2012-01-06 Pekka Enberg
* include/Makefile.am:
Add java_io_VMConsole.h.
* java/io/Console:
Add Java 1.6 java/io/Console API.
* java/lang/System.java:
(console): Add Java 1.6 console() API.
* vm/reference/java/io/VMConsole:
Add new class.
* native/jni/java-io/Makefile.am:
Add java_io_VMConsole.c.
* native/jni/java-io/java_io_VMConsole.c:
Add native helpers for java/io/Console.
Signed-off-by: Pekka Enberg
---
include/Makefile.am|3 +
java/io/Console.java | 122
java/lang/System.java | 11 +++-
native/jni/java-io/Makefile.am |3 +-
native/jni/java-io/java_io_VMConsole.c | 88 +++
vm/reference/java/io/VMConsole.java| 44
6 files changed, 269 insertions(+), 2 deletions(-)
create mode 100644 java/io/Console.java
create mode 100644 native/jni/java-io/java_io_VMConsole.c
create mode 100644 vm/reference/java/io/VMConsole.java
diff --git a/include/Makefile.am b/include/Makefile.am
index 1656c5c..37be91d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -144,6 +144,7 @@ gnu_java_nio_VMSelector.h \
gnu_java_nio_charset_iconv_IconvEncoder.h \
gnu_java_nio_charset_iconv_IconvDecoder.h \
gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h \
+java_io_VMConsole.h \
java_io_VMFile.h \
java_io_VMObjectInputStream.h \
java_io_VMObjectStreamClass.h \
@@ -384,6 +385,8 @@ gnu_java_nio_VMSelector.h:
$(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.ja
$(JAVAH) -o $@ gnu.java.nio.VMSelector
gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h:
$(top_srcdir)/vm/reference/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
$(JAVAH) -o $@ gnu.java.lang.management.VMOperatingSystemMXBeanImpl
+java_io_VMConsole.h: $(top_srcdir)/vm/reference/java/io/VMConsole.java
+ $(JAVAH) -o $@ java.io.VMConsole
java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFile.java
$(JAVAH) -o $@ java.io.VMFile
java_io_VMObjectInputStream.h:
$(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
diff --git a/java/io/Console.java b/java/io/Console.java
new file mode 100644
index 000..5434b02
--- /dev/null
+++ b/java/io/Console.java
@@ -0,0 +1,122 @@
+/* Console.java -- A character-based console device
+ Copyright (C) 2012 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.io;
+
+/**
+ * @since 1.6
+ */
+public final class Console implements Flushable
+{
+ private static Console console = new Console();
+
+ public static Console console()
+ {
+return console;
+ }
+
+ private Console()
+ {
+ }
+
+ public PrintWriter writer()
+ {
+return new PrintWriter(new OutputStreamWriter(System.out));
+ }
+
+ public Reader reader()
+ {
+return new InputStreamReader(System.in);
+ }
+
+ public Console format(String fmt, Object... args)
+ {
+System.out.printf(fmt, args);
+
+return this;
+ }
+
+ public Console printf(String fmt, Object... args)
+ {
+return format(fmt, args);
+ }
+
+ public String readLin
