Revision: 4695
http://sourceforge.net/p/jump-pilot/code/4695
Author: edso
Date: 2015-12-27 14:20:56 +0000 (Sun, 27 Dec 2015)
Log Message:
-----------
try to make icon selection more robust against refactoring by using classes
where possible
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
2015-12-27 13:59:09 UTC (rev 4694)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
2015-12-27 14:20:56 UTC (rev 4695)
@@ -490,28 +490,31 @@
public static Icon getConnectionIcon(ConnectionDescriptor desc,
boolean isClosed) throws DataStoreException {
String driverClassName = desc.getDataStoreDriverClassName();
+
if (driverClassName
-
.equals("com.vividsolutions.jump.datastore.postgis.PostgisDSDriver")) {
+
.equals(com.vividsolutions.jump.datastore.postgis.PostgisDSDriver.class
+ .getName())) {
return isClosed ? PG_DISCONNECTED_ICON : PG_CONNECTED_ICON;
} else if (driverClassName
-
.equals("com.vividsolutions.jump.datastore.oracle.OracleDataStoreDriver")) {
+
.equals(com.vividsolutions.jump.datastore.oracle.OracleDataStoreDriver.class
+ .getName())) {
return isClosed ? ORA_DISCONNECTED_ICON : ORA_CONNECTED_ICON;
} else if (driverClassName
-
.equals("com.vividsolutions.jump.datastore.mariadb.MysqlDataStoreDriver")) {
+
.equals(com.vividsolutions.jump.datastore.mariadb.MysqlDataStoreDriver.class
+ .getName())) {
return isClosed ? MYSQL_DISCONNECTED_ICON : MYSQL_CONNECTED_ICON;
- }
+ }
// match MariadbDataStoreDriver & MysqlMariadbDataStoreDriver
- else if (driverClassName.endsWith("MariadbDataStoreDriver")) {
+ else if (driverClassName.matches("(?i).+\\.\\w*Mariadb\\w+Driver")) {
return isClosed ? MARIA_DISCONNECTED_ICON : MARIA_CONNECTED_ICON;
} else if (driverClassName
-
.equals("com.vividsolutions.jump.datastore.spatialite.SpatialiteDataStoreDriver"))
{
+
.equals(com.vividsolutions.jump.datastore.spatialite.SpatialiteDataStoreDriver.class
+ .getName())) {
return isClosed ? SQLITE_DISCONNECTED_ICON : SQLITE_CONNECTED_ICON;
- } else if (driverClassName
- .equals("com.vividsolutions.jump.datastore.h2.H2DataStoreDriver")) {
+ }
+ // match both H2 DataStoreDrivers
+ else if (driverClassName.matches("(?i).+\\.H2\\w+Driver")) {
return isClosed ? H2_DISCONNECTED_ICON : H2_CONNECTED_ICON;
- } else if (driverClassName
-
.equals("com.vividsolutions.jump.datastore.h2.H2ServerDataStoreDriver")) {
- return isClosed ? H2_DISCONNECTED_ICON : H2_CONNECTED_ICON;
}
// Default
return isClosed ? DISCONNECTED_ICON : CONNECTED_ICON;
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
