Changeset 1341

Timestamp:

01/28/14 16:09:19 (11 years ago)

Author:

pharms

Message:

• corrected indentation of manuals

File:

• trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDman.java (modified) (3 diffs)

trunk/java-utils/src/main/java/de/ugoe/cs/util/console/defaultcommands/CMDman.java

@@ -15 +15 @@
 package de.ugoe.cs.util.console.defaultcommands;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.WordUtils;
 
@@ -56 +57 @@
             InputStream manStream =
                 ClassLoader.getSystemResourceAsStream("manuals/" + command);
+            
             if (manStream != null) {
+                BufferedReader reader = new BufferedReader(new InputStreamReader(manStream));
                 try {
-                    Console.println(WordUtils.wrap(IOUtils.toString(manStream, "UTF-8"), 100).replace("$USAGE$", "Usage: " + cmd.help()));
+                    String line = reader.readLine();
+                    
+                    while (line != null) {
+                        line = line.replace("$USAGE$", "Usage: " + cmd.help());
+                        Console.println(WordUtils.wrap(line, 100));
+                        line = reader.readLine();
+                    }
                 }
                 catch (IOException e) {
@@ -64 +73 @@
                     Console.logException(e);
                 }
+                finally {
+                    try {
+                        reader.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore, as this is unimportant to the user
+                    }
+                }
             }
             else {
-                Console.println("Usage: " + help());
+                Console.println("No man page for command " + command + " available");
             }
         }