diff options
author | Pekka Enberg <penberg@kernel.org> | 2012-01-08 12:35:48 +0000 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-01-08 12:35:48 +0000 |
commit | fd2ca0401d5cbcdee78e1dc78a4165d9f319ed6f (patch) | |
tree | aa71493920e0209b700b6b009a1dcfed9d085f6e /java | |
parent | a007b57e66081225e90dc39693e34f7e2098a513 (diff) | |
download | classpath-fd2ca0401d5cbcdee78e1dc78a4165d9f319ed6f.tar.gz |
Add java/io/Console class and java/lang/System.console() method
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-07 Pekka Enberg <penberg@kernel.org>
* 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 <penberg@kernel.org>
Diffstat (limited to 'java')
-rw-r--r-- | java/io/Console.java | 122 | ||||
-rw-r--r-- | java/lang/System.java | 11 |
2 files changed, 132 insertions, 1 deletions
diff --git a/java/io/Console.java b/java/io/Console.java new file mode 100644 index 000000000..5434b0267 --- /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 readLine(String fmt, Object... args) + { + format(fmt, args); + return readLine(); + } + + public String readLine() + { + String result = null; + try + { + result = new BufferedReader(reader()).readLine(); + } + catch (IOException e) + { + throw new IOError(e); + } + return result; + } + + public char[] readPassword(String fmt, Object... args) + { + format(fmt, args); + return readPassword(); + } + + public char[] readPassword() + { + String s = VMConsole.readPassword(this); + + System.out.println(); + + if (s == null) + { + return null; + } + return s.toCharArray(); + } + + public void flush() throws IOException + { + System.out.flush(); + } +} diff --git a/java/lang/System.java b/java/lang/System.java index 39d6da229..51b3259fa 100644 --- a/java/lang/System.java +++ b/java/lang/System.java @@ -1,5 +1,5 @@ /* System.java -- useful methods to interface with the system - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2012 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,6 +45,7 @@ import gnu.classpath.VMStackWalker; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.io.Console; import java.nio.channels.Channel; import java.nio.channels.spi.SelectorProvider; import java.util.AbstractCollection; @@ -703,6 +704,14 @@ public final class System return SelectorProvider.provider().inheritedChannel(); } + /* + * @since 1.6 + */ + public static Console console() + { + return Console.console(); + } + /** * This is a specialised <code>Collection</code>, providing * the necessary provisions for the collections used by the |