|
From: <wi...@us...> - 2011-08-16 22:17:24
|
Revision: 6360
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6360&view=rev
Author: wis775
Date: 2011-08-16 22:17:17 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
Store result of SQL in file:
- Reformat of the status text - now we will give feedback about the elapsed time. (suggestion from gerd)
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressAbortCallback.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/exportData/I18NStrings.properties
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java 2011-08-16 21:27:16 UTC (rev 6359)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java 2011-08-16 22:17:17 UTC (rev 6360)
@@ -231,13 +231,8 @@
@Override
public void currentlyLoading(final String simpleName)
{
- final StringBuilder statusText = new StringBuilder();
- statusText.append(_loadingPrefix);
- statusText.append(" ");
- statusText.append(simpleName);
+ final StringBuilder statusText = appendPrefixed(simpleName);
- appendToHistory(statusText.toString());
-
try
{
GUIUtils.processOnSwingEventThread(new Runnable()
@@ -261,8 +256,18 @@
s_log.error("Unexpected exception: " + e.getMessage(), e);
}
}
-
- /**
+
+ private StringBuilder appendPrefixed(String simpleName){
+ final StringBuilder statusText = new StringBuilder();
+ statusText.append(_loadingPrefix);
+ statusText.append(" ");
+ statusText.append(simpleName);
+
+ appendToHistory(statusText.toString());
+ return statusText;
+ }
+
+ /**
* @see net.sourceforge.squirrel_sql.fw.sql.ProgressAbortCallback#setTaskStatus(java.lang.String)
*/
@Override
@@ -282,7 +287,11 @@
{
public void run()
{
- additionalStatusLabel.setText(statusText.toString());
+ String statusTextToAppend = statusText.toString();
+ additionalStatusLabel.setText(statusTextToAppend);
+ if(StringUtils.isNotBlank(statusTextToAppend)){
+ appendPrefixed(statusTextToAppend);
+ }
}
});
@@ -293,6 +302,7 @@
}
}
+
/**
* @param string
*/
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java 2011-08-16 21:27:16 UTC (rev 6359)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java 2011-08-16 22:17:17 UTC (rev 6360)
@@ -22,6 +22,8 @@
import java.text.NumberFormat;
import java.util.Iterator;
+import javax.swing.plaf.SliderUI;
+
import net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvController;
import net.sourceforge.squirrel_sql.fw.sql.ProgressAbortCallback;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -49,10 +51,9 @@
// i18n[AbstractDataExportFileWriter.beginWriting=Begin writing]
String BEGIN_WRITING = s_stringMgr.getString("AbstractDataExportFileWriter.beginWriting");
- // i18n[AbstractDataExportFileWriter.NUMBER_OF_ROWS_COMPLETED=100 rows completed]
- String KEY_NUMBER_OF_ROWS_COMPLETED = "AbstractDataExportFileWriter.numberOfRowsCompleted";
+ String KEY_NUMBER_OF_ROWS_COMPLETED_IN_SECONDS = "AbstractDataExportFileWriter.numberOfRowsCompletedInSeconds";
+
-
// i18n[AbstractDataExportFileWriter.NUMBER_OF_ROWS_COMPLETED=Finished with 100 rows]
String KEY_FINISHED_LOADING = "AbstractDataExportFileWriter.finishedLoading";
@@ -134,12 +135,15 @@
long rowsCount = 0;
NumberFormat nfRowCount = NumberFormat.getInstance();
-
+
+ long begin = System.currentTimeMillis();
while (rows.hasNext() && isStop() == false) {
rowsCount++;
IExportDataRow aRow = rows.next();
+ Thread.sleep(1000);
if(isStatusUpdateNecessary()){
- taskStatus(s_stringMgr.getString(i18n.KEY_NUMBER_OF_ROWS_COMPLETED, nfRowCount.format(rowsCount)));
+ long secondsPassed = (System.currentTimeMillis() - begin) / 1000;
+ taskStatus(s_stringMgr.getString(i18n.KEY_NUMBER_OF_ROWS_COMPLETED_IN_SECONDS, nfRowCount.format(rowsCount), secondsPassed));
}
beforeRow(aRow.getRowIndex());
@@ -170,7 +174,7 @@
}
- /**
+ /**
* @return
*/
private boolean isStatusUpdateNecessary() {
@@ -322,8 +326,8 @@
progressController.setTaskStatus(status);
}
}
+
-
/**
* Checks, if the work should be stopped.
* @return true, if the work should be stopped, otherwise false.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressAbortCallback.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressAbortCallback.java 2011-08-16 21:27:16 UTC (rev 6359)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressAbortCallback.java 2011-08-16 22:17:17 UTC (rev 6360)
@@ -38,4 +38,5 @@
* Unnoticed, how many tasks are realy done.
*/
void setFinished();
+
}
Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/exportData/I18NStrings.properties
===================================================================
--- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/exportData/I18NStrings.properties 2011-08-16 21:27:16 UTC (rev 6359)
+++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/exportData/I18NStrings.properties 2011-08-16 22:17:17 UTC (rev 6360)
@@ -1,6 +1,6 @@
AbstractDataExportFileWriter.beginWriting=Begin writing.
-AbstractDataExportFileWriter.numberOfRowsCompleted={0} rows completed.
-AbstractDataExportFileWriter.finishedLoading=Finished with {0} rows.
+AbstractDataExportFileWriter.numberOfRowsCompletedInSeconds={0} rows completed in {1} seconds.
+AbstractDataExportFileWriter.finishedLoading=Finished with {0} rows.
AbstractDataExportFileWriter.closingTheFile=Closing the file.
AbstractDataExportFileWriter.done=Done.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
