Changeset 312

Timestamp:

12/14/11 11:56:20 (12 years ago)

Author:

sherbold

Message:

• fixed some minor code smells

Location:

trunk/JavaHelperLib/src/de/ugoe/cs/util/console

Files:

• FileOutputListener.java (modified) (1 diff)
• TextConsole.java (modified) (2 diffs)
• defaultcommands/CMDexec.java (modified) (1 diff)

trunk/JavaHelperLib/src/de/ugoe/cs/util/console/FileOutputListener.java

@@ -2 +2 @@
 
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;

trunk/JavaHelperLib/src/de/ugoe/cs/util/console/TextConsole.java

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 
 import de.ugoe.cs.util.console.listener.IErrorListener;
@@ -119 +120 @@
         protected String getCommand() {
                 byte[] buffer = new byte[1024];
+                int bytesRead = 0;
+                String command;
                 try {
-                        System.in.read(buffer);
+                        bytesRead = System.in.read(buffer);
                 } catch (IOException e) {
 
                 }
-                return new String(buffer);
+                if (bytesRead == 0) {
+                        command = "";
+                } else {
+                        command = new String(buffer, Charset.defaultCharset());
+                }
+                return command;
         }
-        
+
         /**
          * <p>
          * Configures if the debug mode of the text console is enabled.
          * </p>
-         * @param debug if true, debug mode is enabled. 
+         * 
+         * @param debug
+         *            if true, debug mode is enabled.
          */
         public void setDebug(boolean debug) {

trunk/JavaHelperLib/src/de/ugoe/cs/util/console/defaultcommands/CMDexec.java

@@ -4 +4 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;