[power-architect commit] r2739 - trunk/src/ca/sqlpower/architect/swingui/query

[codesite-noreply]

Author: [EMAIL PROTECTED]
Date: Tue Sep 30 15:38:56 2008
New Revision: 2739
Modified:
   trunk/src/ca/sqlpower/architect/swingui/query/SQLQueryEntryPanel.java

Log:
Previously adding a datasource would make the database combo box select the  
first entry and try to connect to it. This would display an error if the  
connection could not be connected to and would also change the selected  
database.

This is now fixed.

Modified:  
trunk/src/ca/sqlpower/architect/swingui/query/SQLQueryEntryPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/query/SQLQueryEntryPanel.java	 
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/query/SQLQueryEntryPanel.java	 
Tue Sep 30 15:38:56 2008
@@ -329,18 +329,15 @@
     private DatabaseListChangeListener dbListChangeListener = new  
DatabaseListChangeListener() {

         public void databaseAdded(DatabaseListChangeEvent e) {
-            recreateComboBox();
-        }
-
-        private void recreateComboBox() {
-            databases.removeAllItems();
-            for (SPDataSource ds : session.getContext().getConnections()) {
-                databases.addItem(ds);
-            }
+            databases.addItem(e.getDataSource());
         }

         public void databaseRemoved(DatabaseListChangeEvent e) {
-            recreateComboBox();
+            if (databases.getSelectedItem().equals(e.getDataSource())) {
+                databases.setSelectedItem(null);
+            }
+
+            databases.removeItem(e.getDataSource());
         }

     };