[jetrix-cvs] SF.net SVN: jetrix:[718] jetrix/trunk/src/java/net/jetrix/clients/ ConsoleClient.java

[<sm...@us...>]

Revision: 718
          http://jetrix.svn.sourceforge.net/jetrix/?rev=718&view=rev
Author:   smanux
Date:     2008-08-06 22:18:15 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Changed the ConsoleClient to use the new Console class in Java 6

Modified Paths:
--------------
    jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java

Modified: jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java	2008-08-06 17:26:24 UTC (rev 717)
+++ jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java	2008-08-06 22:18:15 UTC (rev 718)
@@ -36,7 +36,7 @@
  */
 public class ConsoleClient implements Client
 {
-    private BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+    private Console console = System.console();
     private ServerConfig conf;
     private Protocol protocol;
     private User user;
@@ -62,6 +62,12 @@
 
     public void run()
     {
+        if (console == null)
+        {
+            log.info("Console interface unavailable");
+            return;
+        }
+
         while (conf.isRunning() && !closed)
         {
             try
@@ -88,19 +94,25 @@
     public void send(Message message)
     {
         String msg = protocol.translate(message, user.getLocale());
-        if (msg != null) System.out.println(msg);
+        if (msg != null)
+        {
+            console.writer().println(msg);
+        }
     }
 
     public Message receive() throws IOException
     {
-        String line = in.readLine();
+        String line = console.readLine();
         if (line == null)
         {
             closed = true;
         }
 
         Message message = protocol.getMessage(line);
-        if (message != null) message.setSource(this);
+        if (message != null)
+        {
+            message.setSource(this);
+        }
 
         return message;
     }
@@ -125,7 +137,8 @@
         return false;
     }
 
-    public boolean supportsAutoJoin() {
+    public boolean supportsAutoJoin()
+    {
         return true;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.