Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741

1 files changed, 10 insertions, 1 deletions

diff --git a/libjava/classpath/java/lang/System.java b/libjava/classpath/java/lang/System.java
index 39d6da22907..51b3259fa8b 100644
--- a/libjava/classpath/java/lang/System.java
+++ b/libjava/classpath/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