A displayName property was added to JDBCDriver and the name property was + turned into a programmatic name. A new JDBC driver registration DTD + (version 1.1) was added containing an element for the new property. A + driver-name element was added to the connection registration format, allowing + to specify the exact driver to be used by that connection.
<?xml version='1.0'?>
<!DOCTYPE driver PUBLIC '-//NetBeans//DTD JDBC Driver 1.0//EN' 'http://www.netbeans.org/dtds/jdbc-driver-1_0.dtd'>
<driver>
- <name value='PostgreSQL (v7.0 and later)'/>
+ <name value='postgresql-7'/>
+ <display-name value='PostgreSQL (v7.0 and later)'/>
<class value='org.postgresql.Driver'/>
<urls>
<url value='file:/folder1/folder2/drivers/pg74.1jdbc3.jar'/>
@@ -212,6 +213,7 @@
<!DOCTYPE connection PUBLIC '-//NetBeans//DTD Database Connection 1.0//EN' 'http://www.netbeans.org/dtds/connection-1_0.dtd'>
<connection>
<driver-class value='org.postgresql.Driver'/>
+ <driver-name value='postgres-7'/>
<database-url value='jdbc:postgresql:test'/>
<schema value='public'/>
<user value='test'/>
Index: src/org/netbeans/api/db/explorer/JDBCDriver.java
===================================================================
RCS file: /cvs/db/src/org/netbeans/api/db/explorer/JDBCDriver.java,v
retrieving revision 1.2
diff -u -r1.2 JDBCDriver.java
--- src/org/netbeans/api/db/explorer/JDBCDriver.java 17 Aug 2005 16:31:57 -0000 1.2
+++ src/org/netbeans/api/db/explorer/JDBCDriver.java 7 Dec 2005 20:08:20 -0000
@@ -25,29 +25,32 @@
private URL[] urls;
private String clazz;
+ private String displayName;
private String name;
- JDBCDriver(String name, String clazz, URL[] urls) {
- assert name != null && clazz != null && urls != null;
- this.clazz = clazz;
+ JDBCDriver(String name, String displayName, String clazz, URL[] urls) {
+ assert name != null && displayName != null && clazz != null && urls != null;
this.name = name;
+ this.displayName = displayName;
+ this.clazz = clazz;
this.urls = urls;
}
/**
* Creates a new JDBCDriver instance.
*
- * @param name the name of the driver; must not be null.
+ * @param name the programmatic name of the driver; must not be null.
+ * @param displayName the display name of the driver (used for example to display the driver in the UI); must not be null.
* @param clazz the JDBC driver class; must not be null.
* @param urls the array of the JDBC driver files URLs; must not be null.
*
* @throws NullPointerException if any of the parameters is null.
*/
- public static JDBCDriver create(String name, String clazz, URL[] urls) {
- if (name == null || clazz == null || urls == null) {
+ public static JDBCDriver create(String name, String displayName, String clazz, URL[] urls) {
+ if (name == null || displayName == null || clazz == null || urls == null) {
throw new NullPointerException();
}
- return new JDBCDriver(name, clazz, urls);
+ return new JDBCDriver(name, displayName, clazz, urls);
}
/**
@@ -69,15 +72,27 @@
}
/**
- * Return the user defined driver name.
+ * Returns the display name of the driver (used for example to display the driver in the UI).
+ *
+ * @return the display name of the driver.
+ */
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ /**
+ * Return the programmatic driver name.
*
- * @return the user defined driver name.
+ * @return the programmatic driver name.
*/
public String getName() {
return name;
}
public String toString() {
- return "JDBCDriver[name='" + name + ",className='" + clazz + ",urls=" + Arrays.asList(urls) + "]";
+ return "JDBCDriver[name='" + name + // NOI18N
+ "',displayName='" + displayName + // NOI18N
+ "',className='" + clazz + // NOI18N
+ "',urls=" + Arrays.asList(urls) + "]"; // NOI18N
}
}
Index: src/org/netbeans/modules/db/explorer/DatabaseConnection.java
===================================================================
RCS file: /cvs/db/src/org/netbeans/modules/db/explorer/DatabaseConnection.java,v
retrieving revision 1.45
diff -u -r1.45 DatabaseConnection.java
--- src/org/netbeans/modules/db/explorer/DatabaseConnection.java 5 Dec 2005 17:24:07 -0000 1.45
+++ src/org/netbeans/modules/db/explorer/DatabaseConnection.java 7 Dec 2005 20:08:21 -0000
@@ -154,9 +154,10 @@
name = getName();
}
- public DatabaseConnection(String driver, String database, String theschema, String user, String password) {
+ public DatabaseConnection(String driver, String driverName, String database, String theschema, String user, String password) {
this();
drv = driver;
+ drvname = driverName;
db = database;
usr = user;
schema = theschema;
Index: src/org/netbeans/modules/db/explorer/DatabaseConnectionConvertor.java
===================================================================
RCS file: /cvs/db/src/org/netbeans/modules/db/explorer/DatabaseConnectionConvertor.java,v
retrieving revision 1.5
diff -u -r1.5 DatabaseConnectionConvertor.java
--- src/org/netbeans/modules/db/explorer/DatabaseConnectionConvertor.java 4 Oct 2005 13:12:31 -0000 1.5
+++ src/org/netbeans/modules/db/explorer/DatabaseConnectionConvertor.java 7 Dec 2005 20:08:21 -0000
@@ -142,7 +142,6 @@
reader.parse(is);
} catch (SAXException ex) {
Exception x = ex.getException();
- ex.printStackTrace();
if (x instanceof java.io.IOException)
throw (IOException)x;
else
@@ -165,6 +164,7 @@
private static DatabaseConnection createDatabaseConnection(Handler handler) {
DatabaseConnection dbconn = new DatabaseConnection(
handler.driverClass,
+ handler.driverName,
handler.connectionUrl,
handler.schema,
handler.user,
@@ -308,6 +308,7 @@
pw.println(""); //NOI18N
pw.println(""); //NOI18N
pw.println(" "); //NOI18N
pw.println(" "); //NOI18N
URL[] urls = instance.getURLs();
@@ -341,11 +354,13 @@
private static final class Handler extends DefaultHandler {
private static final String ELEMENT_NAME = "name"; // NOI18N
+ private static final String ELEMENT_DISPLAY_NAME = "display-name"; // NOI18N
private static final String ELEMENT_CLASS = "class"; // NOI18N
private static final String ELEMENT_URL = "url"; // NOI18N
private static final String ATTR_PROPERTY_VALUE = "value"; // NOI18N
String name;
+ String displayName;
String clazz;
LinkedList urls = new LinkedList();
@@ -358,6 +373,8 @@
public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException {
if (ELEMENT_NAME.equals(qName)) {
name = attrs.getValue(ATTR_PROPERTY_VALUE);
+ } else if (ELEMENT_DISPLAY_NAME.equals(qName)) {
+ displayName = attrs.getValue(ATTR_PROPERTY_VALUE);
} else if (ELEMENT_CLASS.equals(qName)) {
clazz = attrs.getValue(ATTR_PROPERTY_VALUE);
} else if (ELEMENT_URL.equals(qName)) {
Index: src/org/netbeans/modules/db/explorer/infos/DriverListNodeInfo.java
===================================================================
RCS file: /cvs/db/src/org/netbeans/modules/db/explorer/infos/DriverListNodeInfo.java,v
retrieving revision 1.23
diff -u -r1.23 DriverListNodeInfo.java
--- src/org/netbeans/modules/db/explorer/infos/DriverListNodeInfo.java 4 Dec 2005 22:21:28 -0000 1.23
+++ src/org/netbeans/modules/db/explorer/infos/DriverListNodeInfo.java 7 Dec 2005 20:08:22 -0000
@@ -63,7 +63,7 @@
file = file.substring(1);
sb.append(file);
}
- DatabaseDriver drv = new DatabaseDriver(drvs[i].getName(), drvs[i].getClassName(), sb.toString());
+ DatabaseDriver drv = new DatabaseDriver(drvs[i].getDisplayName(), drvs[i].getClassName(), sb.toString(), drvs[i]);
DriverNodeInfo chinfo = (DriverNodeInfo) DatabaseNodeInfo.createNodeInfo(this, DatabaseNode.DRIVER);
if (chinfo != null && drv != null) {
chinfo.setDatabaseDriver(drv);
Index: src/org/netbeans/modules/db/explorer/infos/DriverNodeInfo.java
===================================================================
RCS file: /cvs/db/src/org/netbeans/modules/db/explorer/infos/DriverNodeInfo.java,v
retrieving revision 1.23
diff -u -r1.23 DriverNodeInfo.java
--- src/org/netbeans/modules/db/explorer/infos/DriverNodeInfo.java 17 Aug 2005 16:32:05 -0000 1.23
+++ src/org/netbeans/modules/db/explorer/infos/DriverNodeInfo.java 7 Dec 2005 20:08:22 -0000
@@ -41,7 +41,10 @@
public void delete() throws IOException {
try {
- JDBCDriverManager.getDefault().removeDriver(getJDBCDriver());
+ JDBCDriver driver = getJDBCDriver();
+ if (driver != null) {
+ JDBCDriverManager.getDefault().removeDriver(driver);
+ }
} catch (DatabaseException e) {
// PENDING
}
@@ -59,20 +62,19 @@
}
private boolean checkDriverFiles() {
- JDBCDriver[] drvs = JDBCDriverManager.getDefault().getDrivers(getURL());
- for (int i = 0; i < drvs.length; i++)
- if (drvs[i].getName().equals(getName()))
- return JDBCDriverSupport.isAvailable(drvs[i]);
-
- return false;
+ JDBCDriver driver = getJDBCDriver();
+ if (driver != null) {
+ return JDBCDriverSupport.isAvailable(driver);
+ } else {
+ return false;
+ }
}
- private JDBCDriver getJDBCDriver() {
- JDBCDriver[] drvs = JDBCDriverManager.getDefault().getDrivers(getURL());
- for (int i = 0; i < drvs.length; i++) {
- if (drvs[i].getName().equals(getName()))
- return drvs[i];
+ public JDBCDriver getJDBCDriver() {
+ DatabaseDriver dbdrv = getDatabaseDriver();
+ if (dbdrv == null) {
+ return null;
}
- return null;
+ return dbdrv.getJDBCDriver();
}
}
Index: src/org/netbeans/modules/db/resources/JDBCODBC.xml
===================================================================
RCS file: /cvs/db/src/org/netbeans/modules/db/resources/JDBCODBC.xml,v
retrieving revision 1.2
diff -u -r1.2 JDBCODBC.xml
--- src/org/netbeans/modules/db/resources/JDBCODBC.xml 10 Dec 2003 14:59:54 -0000 1.2
+++ src/org/netbeans/modules/db/resources/JDBCODBC.xml 7 Dec 2005 20:08:22 -0000
@@ -1,7 +1,9 @@
+
+
+
@@ -61,6 +64,11 @@
+
+
");
writer.write("
");
- writer.write("");
for (int i = 0; i < urls.length; i++) {
Index: test/unit/src/org/netbeans/modules/db/explorer/driver/bar-driver.xml
===================================================================
RCS file: /cvs/db/test/unit/src/org/netbeans/modules/db/explorer/driver/bar-driver.xml,v
retrieving revision 1.2
diff -u -r1.2 bar-driver.xml
--- test/unit/src/org/netbeans/modules/db/explorer/driver/bar-driver.xml 17 Aug 2005 16:32:12 -0000 1.2
+++ test/unit/src/org/netbeans/modules/db/explorer/driver/bar-driver.xml 7 Dec 2005 20:08:22 -0000
@@ -1,7 +1,8 @@
-