Changeset 3024 for DataCleaner

Timestamp:

01/13/12 15:12:44 (4 months ago)

Author:

kasper

Message:

Ticket #746: Fixed JDBC datastore dialog "Test connection" button

File:

• DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/windows/JdbcDatastoreDialog.java (modified) (11 diffs)

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/windows/JdbcDatastoreDialog.java

@@ -27 +27 @@
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
+import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
@@ -32 +33 @@
 import javax.inject.Inject;
 import javax.inject.Provider;
+import javax.sql.DataSource;
 import javax.swing.AbstractAction;
 import javax.swing.Action;
@@ -37 +39 @@
 import javax.swing.Icon;
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -48 +49 @@
 import javax.swing.KeyStroke;
 
-import org.eobjects.analyzer.connection.DatastoreConnection;
 import org.eobjects.analyzer.connection.JdbcDatastore;
-import org.eobjects.analyzer.connection.UpdateableDatastoreConnection;
 import org.eobjects.analyzer.util.StringUtils;
 import org.eobjects.datacleaner.bootstrap.WindowContext;
@@ -62 +61 @@
 import org.eobjects.datacleaner.util.WidgetFactory;
 import org.eobjects.datacleaner.util.WidgetUtils;
+import org.eobjects.datacleaner.widgets.DCCheckBox;
 import org.eobjects.datacleaner.widgets.DCComboBox;
 import org.eobjects.datacleaner.widgets.DCComboBox.Listener;
 import org.eobjects.datacleaner.widgets.DCLabel;
+import org.eobjects.metamodel.util.FileHelper;
 import org.jdesktop.swingx.JXTextField;
 
@@ -88 +89 @@
         private final JXTextField _usernameTextField;
         private final JPasswordField _passwordField;
-        private final JCheckBox _multipleConnectionsCheckBox;
+        private final DCCheckBox<Object> _multipleConnectionsCheckBox;
         private final DCComboBox<Object> _databaseDriverComboBox;
         private final Provider<OptionsDialog> _optionsDialogProvider;
@@ -105 +106 @@
                 _databaseDriverCatalog = databaseDriverCatalog;
 
-                _multipleConnectionsCheckBox = new JCheckBox("Allow multiple concurrent connections", true);
+                _multipleConnectionsCheckBox = new DCCheckBox<Object>("Allow multiple concurrent connections", true);
                 _multipleConnectionsCheckBox
                                 .setToolTipText("Indicates whether multiple connections (aka. connection pooling) may be created or not. "
@@ -346 +347 @@
                 row++;
 
-                final JButton testButton = WidgetFactory.createButton("Test connection", "images/actions/refresh.png");
+                final JButton testButton = WidgetFactory.createButton(getTestButtonText(), "images/actions/refresh.png");
                 testButton.addActionListener(new ActionListener() {
 
@@ -352 +353 @@
                         public void actionPerformed(ActionEvent event) {
                                 JdbcDatastore datastore = createDatastore();
-                                final List<DatastoreConnection> connections = new ArrayList<DatastoreConnection>();
+
+                                final List<Connection> connections = new ArrayList<Connection>();
+
                                 try {
-                                        for (int i = 0; i < TEST_CONNECTION_COUNT; i++) {
-                                                UpdateableDatastoreConnection connection = datastore.openConnection();
-                                                connections.add(connection);
+                                        if (datastore.isMultipleConnections()) {
+                                                DataSource ds = datastore.createDataSource();
+                                                for (int i = 0; i < TEST_CONNECTION_COUNT; i++) {
+                                                        Connection connection = ds.getConnection();
+                                                        connections.add(connection);
+                                                }
+                                        } else {
+                                                Connection connnection = datastore.createConnection();
+                                                connections.add(connnection);
                                         }
                                 } catch (Throwable e) {
@@ -362 +371 @@
                                         return;
                                 } finally {
-                                        for (DatastoreConnection connection : connections) {
-                                                connection.close();
+                                        for (Connection connection : connections) {
+                                                FileHelper.safeClose(connection);
                                         }
                                 }
 
                                 JOptionPane.showMessageDialog(JdbcDatastoreDialog.this, "Connection successful!");
+                        }
+                });
+                _multipleConnectionsCheckBox.addListener(new DCCheckBox.Listener<Object>() {
+                        @Override
+                        public void onItemSelected(Object item, boolean selected) {
+                                testButton.setText(getTestButtonText());
                         }
                 });
@@ -393 +408 @@
 
                 return panel;
+        }
+
+        private String getTestButtonText() {
+                if (_multipleConnectionsCheckBox.isSelected()) {
+                        return "Test connections";
+                }
+                return "Test connection";
         }