[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6701] trunk/sql12/app/src/main/java/net/ sourceforge/squirrel_sql/client/session/mainpanel

[<ger...@us...>]

Revision: 6701
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6701&view=rev
Author:   gerdwagner
Date:     2012-10-26 19:27:22 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
Fixed bug in new execution time display: Timer was not stopped

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/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java

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-25 22:12:13 UTC (rev 6700)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java	2012-10-26 19:27:22 UTC (rev 6701)
@@ -106,6 +106,7 @@
       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);
+      txtExecTimeCounter.setColumns(10);
       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);

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-25 22:12:13 UTC (rev 6700)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java	2012-10-26 19:27:22 UTC (rev 6701)
@@ -6,8 +6,9 @@
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
+import java.awt.event.*;
 
 class CancelPanelCtrl
 {
@@ -64,8 +65,6 @@
             onClose();
          }
       });
-
-
    }
 
    private void onUpdateExecutionTime()
@@ -138,7 +137,6 @@
    {
       _panel.cancelBtn.doClick();
       _listener.closeRquested();
-      _timer.stop();
    }
 
 
@@ -147,4 +145,10 @@
    {
       return _panel;
    }
+
+   public void wasRemoved()
+   {
+      _timer.stop();
+      System.out.println("CancelPanelCtrl.wasRemoved");
+   }
 }

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java	2012-10-25 22:12:13 UTC (rev 6700)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java	2012-10-26 19:27:22 UTC (rev 6701)
@@ -188,13 +188,14 @@
       });
    }
 
-   private void onRemoveCancelPanel(CancelPanelCtrl cancelPanelCtrl, IResultTab resultTabToReplace)
+   private void onRemoveCancelPanel(final CancelPanelCtrl cancelPanelCtrl, IResultTab resultTabToReplace)
    {
       SwingUtilities.invokeLater(new Runnable()
       {
          public void run()
          {
             _centerPanel.removeAll();
+            cancelPanelCtrl.wasRemoved();
          }
       });
    }

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java	2012-10-25 22:12:13 UTC (rev 6700)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java	2012-10-26 19:27:22 UTC (rev 6701)
@@ -719,6 +719,8 @@
                _tabbedExecutionsPanel.setSelectedIndex(indexToSelect);
             }
 
+            cancelPanelCtrl.wasRemoved();
+
          }
       });
    }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.