|
From: <ger...@us...> - 2010-08-26 17:58:57
|
Revision: 5849
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5849&view=rev
Author: gerdwagner
Date: 2010-08-26 17:58:51 +0000 (Thu, 26 Aug 2010)
Log Message:
-----------
Fixed two bugs
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/DriverPropertiesController.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/firebirdmanager/src/main/java/net/sourceforge/squirrel_sql/plugins/firebirdmanager/FirebirdManagerPlugin.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/DriverPropertiesController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/DriverPropertiesController.java 2010-08-22 22:12:41 UTC (rev 5848)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/DriverPropertiesController.java 2010-08-26 17:58:51 UTC (rev 5849)
@@ -85,17 +85,17 @@
}
}
- DriverPropertyInfo[] infoAr;
+ DriverPropertyInfo[] infoAr = new DriverPropertyInfo[0];
try
{
infoAr = jdbcDriver.getPropertyInfo(alias.getUrl(), new Properties());
}
- catch (SQLException e)
+ catch (Exception e)
{
// I18n[DriverPropertiesController.gettingDriverPropetiesFailed=Loading the properties from the JDBC driver failed.\nCan not load driver properties tab.]
_errMsg = s_stringMgr.getString("DriverPropertiesController.gettingDriverPropetiesFailed");
_app.getMessageHandler().showErrorMessage(_errMsg);
- return;
+ //return;
}
SQLDriverPropertyCollection driverPropertiesClone = alias.getDriverPropertiesClone();
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-08-22 22:12:41 UTC (rev 5848)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-08-26 17:58:51 UTC (rev 5849)
@@ -23,6 +23,10 @@
Bug-fixes:
+Firebird Manger Plugin: Removed dialog (that pointed out missig Firebird driver) from startup routines.
+
+Fixed Alias Properties not showing when drivers getPropertyInfo() fails. Behavior has been seen with Oracle driver.
+
RSyntax: Turned off drag and drop inside the editor. It conflicted with our
drag and drop feature for files and caused editor texts to vanish. See bug #3006515.
Modified: trunk/sql12/plugins/firebirdmanager/src/main/java/net/sourceforge/squirrel_sql/plugins/firebirdmanager/FirebirdManagerPlugin.java
===================================================================
--- trunk/sql12/plugins/firebirdmanager/src/main/java/net/sourceforge/squirrel_sql/plugins/firebirdmanager/FirebirdManagerPlugin.java 2010-08-22 22:12:41 UTC (rev 5848)
+++ trunk/sql12/plugins/firebirdmanager/src/main/java/net/sourceforge/squirrel_sql/plugins/firebirdmanager/FirebirdManagerPlugin.java 2010-08-26 17:58:51 UTC (rev 5849)
@@ -368,8 +368,12 @@
return fb.getMajorVersion() >= 2;
} catch (ClassNotFoundException e) {
log.error(i18n.ERROR_DRIVER_NOT_INSTALLED);
- JOptionPane.showMessageDialog(null, i18n.ERROR_DRIVER_NOT_INSTALLED);
- return false;
+
+ // This was shown at application start up. The message box did hide behind the splash screen.
+ // In general it is not a good idea to pop up message boxes at start up from within Plugin intializations.
+ // JOptionPane.showMessageDialog(null, i18n.ERROR_DRIVER_NOT_INSTALLED);
+
+ return false;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
