|
From: <ger...@us...> - 2012-10-22 20:50:43
|
Revision: 6694
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6694&view=rev
Author: gerdwagner
Date: 2012-10-22 20:50:36 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Execution time passed is shown during SQL execution.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-22 20:50:36 UTC (rev 6694)
@@ -7,6 +7,8 @@
import javax.swing.*;
import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class CancelPanel extends JPanel
{
@@ -16,6 +18,7 @@
JLabel currentStatusLbl = new JLabel();
JButton cancelBtn;
JButton closeBtn;
+ JTextField txtExecTimeCounter;
public CancelPanel(ISession session)
@@ -82,6 +85,32 @@
gbc.fill = GridBagConstraints.NONE;
ret.add(cancelBtn, gbc);
+ gbc.gridx = 0;
+ ++gbc.gridy;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.insets = new Insets(30, gbc.insets.left, gbc.insets.bottom, gbc.insets.right);
+ ret.add(createExecutionTimePanel(), gbc);
return ret;
}
+
+ private JPanel createExecutionTimePanel()
+ {
+ JPanel ret = new JPanel(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0);
+ ret.add(new JLabel(s_stringMgr.getString("SQLResultExecuterPanel.executingFor")), gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,0), 0,0);
+ txtExecTimeCounter = new JTextField();
+ txtExecTimeCounter.setEditable(false);
+ ret.add(txtExecTimeCounter, gbc);
+
+ gbc = new GridBagConstraints(2,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,0), 0,0);
+ ret.add(new JLabel(s_stringMgr.getString("SQLResultExecuterPanel.execMillis")), gbc);
+
+
+ return ret;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-22 20:50:36 UTC (rev 6694)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -25,12 +26,27 @@
*/
private int _currentQueryIndex = 0;
private CancelPanelListener _listener;
+ private final Timer _timer;
+ private final long _beginMillis;
CancelPanelCtrl(CancelPanelListener listener, ISession session)
{
_listener = listener;
_panel = new CancelPanel(session);
+ _beginMillis = System.currentTimeMillis();
+ _timer = new Timer(100, new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onUpdateExecutionTime();
+ }
+ });
+ _timer.setRepeats(true);
+ _timer.start();
+
+
_panel.cancelBtn.addActionListener(new ActionListener()
{
@Override
@@ -52,6 +68,11 @@
}
+ private void onUpdateExecutionTime()
+ {
+ _panel.txtExecTimeCounter.setText("" + (System.currentTimeMillis() - _beginMillis));
+ }
+
void incCurrentQueryIndex()
{
++_currentQueryIndex;
@@ -117,6 +138,7 @@
{
_panel.cancelBtn.doClick();
_listener.closeRquested();
+ _timer.stop();
}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-10-22 20:50:36 UTC (rev 6694)
@@ -84,4 +84,8 @@
ErrorPanel.copyAll=Copy All
ErrorPanel.copySelection=Copy Selection
-ResultFrame.rerun=Rerun this tab's SQL Query
\ No newline at end of file
+ResultFrame.rerun=Rerun this tab's SQL Query
+
+SQLResultExecuterPanel.executingFor=Executing since
+SQLResultExecuterPanel.execMillis=milli seconds
+
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-22 20:50:36 UTC (rev 6694)
@@ -8,6 +8,8 @@
Enhancements:
+Execution time passed is shown during SQL execution.
+
Session tabs can be detached in separate windows. The tabs can be arbitrarily moved between the main and separated windows using drag and drop.
Cristiano Guadagnino contributed all of the SQL required for the DB2Plugin to properly support the DB2 z/OS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
