[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6561] trunk/sql12

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

Revision: 6561
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6561&view=rev
Author:   gerdwagner
Date:     2012-01-23 18:42:15 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
No duplicate error message when connect fails

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
    trunk/sql12/doc/src/main/resources/changes.txt
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ErrorDialog.java

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java	2012-01-21 16:36:23 UTC (rev 6560)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java	2012-01-23 18:42:15 UTC (rev 6561)
@@ -105,16 +105,13 @@
 
    protected void showErrorDialog(final String msg, final Throwable th)
    {
-      synchronized (this)
+      SwingUtilities.invokeLater(new Runnable()
       {
-         SwingUtilities.invokeLater(new Runnable()
+         public void run()
          {
-            public void run()
-            {
-               new ErrorDialog(_app.getMainFrame(), msg, th).setVisible(true);
-            }
-         });
-      }
+            new ErrorDialog(_app.getMainFrame(), msg, th).setVisible(true);
+         }
+      });
    }
 
 

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java	2012-01-21 16:36:23 UTC (rev 6560)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java	2012-01-23 18:42:15 UTC (rev 6561)
@@ -146,7 +146,6 @@
         _app.getMainFrame().addWidget(sheet);
         DialogWidget.centerWithinDesktop(sheet);
         sheet.moveToFront();
-        sheet.setVisible(true);                        
     }
     
 

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2012-01-21 16:36:23 UTC (rev 6560)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2012-01-23 18:42:15 UTC (rev 6561)
@@ -19,6 +19,8 @@
 
 Bug fixes:
 
+Error dialog showed up twice when an error occurred during Alias connect.
+
 3026995 Fixed problem in squirrel-sql.bat for 64-bit windows.
 
 Graph Plugin --> Query Builder:

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ErrorDialog.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ErrorDialog.java	2012-01-21 16:36:23 UTC (rev 6560)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ErrorDialog.java	2012-01-23 18:42:15 UTC (rev 6561)
@@ -17,18 +17,18 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.sql.SQLException;
 
-import javax.swing.*;
-
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.Utilities;
-
 public class ErrorDialog extends JDialog
 {
 	/** Internationalized strings for this class. */

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