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

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

Author: roy
Date: 2009-10-16 16:12:51 +0200 (Fri, 16 Oct 2009)
New Revision: 427

Modified:
   src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
   src/main/java/nl/improved/sqlclient/QueryExecutor.java
Log:
don't display 'More...' in spool file


Modified: src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
===================================================================
--- src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2009-09-30 18:14:51 UTC (rev 426)
+++ src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2009-10-16 14:12:51 UTC (rev 427)
@@ -425,6 +425,9 @@
                             Iterator<CharSequence> iResult = result.getResult();
                             while (iResult.hasNext()) {
                                 output(iResult.next());
+                                if (iResult.hasNext()) {
+                                    output("More...\n", false);
+                                }
                                 repaint();
                             }
                             if (!result.executedSuccessfully()) {
@@ -446,6 +449,9 @@
                                     Iterator<CharSequence> iResult = result.getResult();
                                     while (iResult.hasNext()) {
                                         output(iResult.next());
+                                        if (iResult.hasNext()) {
+                                            output("More...\n", false);
+                                        }
                                         repaint();
                                     }
                                     if (!result.executedSuccessfully()) {
@@ -802,10 +808,13 @@
      * @param data the data to print to the screen.
      */
     protected void output(CharSequence data) {
+        output(data, true);
+    }
+    protected void output(CharSequence data, boolean spool) {
         synchronized(this) {
             List<CharSequence> screenBuffer = screen.getScreenBuffer();
             screenBuffer.addAll(getLines(data));
-            if (spoolWriter != null) {
+            if (spoolWriter != null && spool) {
                 try {
                     spoolWriter.write(data.toString());
                     spoolWriter.write("\n");

Modified: src/main/java/nl/improved/sqlclient/QueryExecutor.java
===================================================================
--- src/main/java/nl/improved/sqlclient/QueryExecutor.java	2009-09-30 18:14:51 UTC (rev 426)
+++ src/main/java/nl/improved/sqlclient/QueryExecutor.java	2009-10-16 14:12:51 UTC (rev 427)
@@ -27,8 +27,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import nl.improved.sqlclient.util.ResultBuilder;
 
 /**
@@ -193,6 +191,7 @@
         private long start;
         private ResultSetMetaData metadata;
         private boolean next = true;
+        private boolean first = true;
 
         public QueryExecutorIterator(long start, ResultSet results, List<String> labels, ResultSetMetaData metadata) throws SQLException {
             this.start = start;
@@ -212,7 +211,10 @@
             try {
                 next = false;
                 ResultBuilder displayValue = new ResultBuilder();
-                displayValue.setHeader(labels);
+                if (first) {
+                    displayValue.setHeader(labels);
+                    first = false;
+                }
                 int max = 1000;
                 while (results.next() && !cancelled) {
                     for (int col = 1; col <= columnCount; col++ ) {
@@ -238,8 +240,6 @@
                     }
                     footer.append("Query took: "+ (System.currentTimeMillis() - start) +" millis\n\n");
                     displayValue.setFooter(footer);
-                } else {
-                    displayValue.setFooter("More...\n\n");
                 }
                 return displayValue.toString();
             } catch(SQLException e) {