[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2009-01-16 21:09:43 +0100 (Fri, 16 Jan 2009)
New Revision: 349

Modified:
   src/main/java/nl/improved/sqlclient/SQLShell.java
Log:
fix output from commandline


Modified: src/main/java/nl/improved/sqlclient/SQLShell.java
===================================================================
--- src/main/java/nl/improved/sqlclient/SQLShell.java	2009-01-16 19:46:42 UTC (rev 348)
+++ src/main/java/nl/improved/sqlclient/SQLShell.java	2009-01-16 20:09:43 UTC (rev 349)
@@ -39,7 +39,7 @@
     public static void main(String[] args) throws InterruptedException, IOException {
         PrintStream errorStream = System.err;
         PrintStream outStream = System.out;
-        Map<String, String> argsMap = new HashMap<String, String>();
+        final Map<String, String> argsMap = new HashMap<String, String>();
         if (args.length > 0) {
             if (args[0].equals("--help") || args.length %2 == 1) {
                 System.err.println("Usage: ");
@@ -88,15 +88,19 @@
                 @Override
                 public void show() {
                 }
+
+                @Override
+                protected void output(CharSequence data) {
+                    if (!argsMap.containsKey("-o")) {
+                        System.out.println(data);
+                    }
+                }
+
+
             };
             Command cmd = new nl.improved.sqlclient.AbstractSQLShellWindow.ExecuteBatchCommand(sqlshellWindow);
             cmd.execute(new SQLCommand("@"+ argsMap.get("-i")));
-            if (!argsMap.containsKey("-o")) {
-                for (CharSequence s : sqlshellWindow.getScreen().getScreenBuffer()) {
-                    System.out.println(s);
-                }
-                //System.out.println(output);
-            } else {
+            if (argsMap.containsKey("-o")) {
                 File f = new File(argsMap.get("-o"));
                 FileOutputStream fout = new FileOutputStream(f);
                 for (CharSequence s : sqlshellWindow.getScreen().getScreenBuffer()) {