# HG changeset patch # User Daniele Nicolodi # Date 1275494545 -7200 # Node ID 670905eb688a4c799bb1aa0dad97ace843b95d25 # Parent 35f1cfcaa5a928b6dd723f389456ec3b8010bebf Fix code indentation. diff -r 35f1cfcaa5a9 -r 670905eb688a ConnectionManager/src/connectionmanager/CredentialsDialog.java --- a/ConnectionManager/src/connectionmanager/CredentialsDialog.java Wed Jun 02 17:29:18 2010 +0200 +++ b/ConnectionManager/src/connectionmanager/CredentialsDialog.java Wed Jun 02 18:02:25 2010 +0200 @@ -136,7 +136,7 @@ private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed cancelled = false; - username = (String)usernameField.getSelectedItem(); + username = (String) usernameField.getSelectedItem(); password = new String(passwordField.getPassword()); cache = cacheCheckBox.isSelected(); doClose(); @@ -153,7 +153,6 @@ }//GEN-LAST:event_closeDialog private void usernameFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_usernameFieldActionPerformed - }//GEN-LAST:event_usernameFieldActionPerformed private void doClose() { diff -r 35f1cfcaa5a9 -r 670905eb688a ConnectionManager/src/connectionmanager/DatabaseDialog.java --- a/ConnectionManager/src/connectionmanager/DatabaseDialog.java Wed Jun 02 17:29:18 2010 +0200 +++ b/ConnectionManager/src/connectionmanager/DatabaseDialog.java Wed Jun 02 18:02:25 2010 +0200 @@ -4,29 +4,29 @@ public class DatabaseDialog extends javax.swing.JDialog { - public boolean cancelled = true; - public String hostname; - public String database; + public boolean cancelled = true; + public String hostname; + public String database; - public DatabaseDialog(java.awt.Frame parent, boolean modal, String[] hostnames) { - super(parent, modal); - initComponents(); - hostnameCombo.setModel(new DefaultComboBoxModel(hostnames)); - } + public DatabaseDialog(java.awt.Frame parent, boolean modal, String[] hostnames) { + super(parent, modal); + initComponents(); + hostnameCombo.setModel(new DefaultComboBoxModel(hostnames)); + } - public DatabaseDialog(java.awt.Frame parent, boolean modal) { - super(new java.awt.Frame(), true); - initComponents(); - hostnameCombo.setModel(new DefaultComboBoxModel()); - } + public DatabaseDialog(java.awt.Frame parent, boolean modal) { + super(new java.awt.Frame(), true); + initComponents(); + hostnameCombo.setModel(new DefaultComboBoxModel()); + } - public DatabaseDialog() { - super(new java.awt.Frame(), true); - initComponents(); - hostnameCombo.setModel(new DefaultComboBoxModel()); - } + public DatabaseDialog() { + super(new java.awt.Frame(), true); + initComponents(); + hostnameCombo.setModel(new DefaultComboBoxModel()); + } - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents private void initComponents() { @@ -122,23 +122,21 @@ }// //GEN-END:initComponents private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed - cancelled = true; - doClose(); + cancelled = true; + doClose(); }//GEN-LAST:event_cancelButtonActionPerformed private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed cancelled = false; - hostname = (String)hostnameCombo.getSelectedItem(); - database = (String)databaseCombo.getSelectedItem(); + hostname = (String) hostnameCombo.getSelectedItem(); + database = (String) databaseCombo.getSelectedItem(); doClose(); }//GEN-LAST:event_okButtonActionPerformed private void databaseComboActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_databaseComboActionPerformed - }//GEN-LAST:event_databaseComboActionPerformed private void hostnameComboActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_hostnameComboActionPerformed - }//GEN-LAST:event_hostnameComboActionPerformed private void doClose() { @@ -154,5 +152,4 @@ private javax.swing.JLabel jLabel9; private javax.swing.JButton okButton; // End of variables declaration//GEN-END:variables - } diff -r 35f1cfcaa5a9 -r 670905eb688a ConnectionManager/src/connectionmanager/DatabaseSelectorDialog.java --- a/ConnectionManager/src/connectionmanager/DatabaseSelectorDialog.java Wed Jun 02 17:29:18 2010 +0200 +++ b/ConnectionManager/src/connectionmanager/DatabaseSelectorDialog.java Wed Jun 02 18:02:25 2010 +0200 @@ -7,42 +7,41 @@ public class DatabaseSelectorDialog extends javax.swing.JDialog { - private boolean cancelled = true; - - public String hostname; - public String database; - public String username; + public boolean cancelled = true; + public String hostname; + public String database; + public String username; - public DatabaseSelectorDialog(java.awt.Frame parent) { - super(parent, true); - initComponents(); - databasesTable.addMouseListener(new MouseListenerDoubleClick()); - } + public DatabaseSelectorDialog(java.awt.Frame parent) { + super(parent, true); + initComponents(); + databasesTable.addMouseListener(new MouseListenerDoubleClick()); + } - public DatabaseSelectorDialog() { + public DatabaseSelectorDialog() { super(new javax.swing.JFrame(), true); initComponents(); databasesTable.addMouseListener(new MouseListenerDoubleClick()); } - private class MouseListenerDoubleClick extends MouseAdapter { + private class MouseListenerDoubleClick extends MouseAdapter { - @Override - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() >= 2) { - cancelled = false; - Point p = e.getPoint(); - int row = databasesTable.rowAtPoint(p); - DefaultTableModel model = (DefaultTableModel)databasesTable.getModel(); - hostname = (String)model.getValueAt(row, 0); - database = (String)model.getValueAt(row, 1); - username = (String)model.getValueAt(row, 2); - doClose(); - } + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() >= 2) { + cancelled = false; + Point p = e.getPoint(); + int row = databasesTable.rowAtPoint(p); + DefaultTableModel model = (DefaultTableModel) databasesTable.getModel(); + hostname = (String) model.getValueAt(row, 0); + database = (String) model.getValueAt(row, 1); + username = (String) model.getValueAt(row, 2); + doClose(); + } + } } - } - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents private void initComponents() { @@ -135,43 +134,43 @@ pack(); }// //GEN-END:initComponents - private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed - cancelled = true; - doClose(); - }//GEN-LAST:event_cancelButtonActionPerformed + private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed + cancelled = true; + doClose(); + }//GEN-LAST:event_cancelButtonActionPerformed - private void selectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectButtonActionPerformed - cancelled = false; - int row = databasesTable.getSelectedRow(); - DefaultTableModel model = (DefaultTableModel)databasesTable.getModel(); - hostname = (String)model.getValueAt(row, 0); - database = (String)model.getValueAt(row, 1); - username = (String)model.getValueAt(row, 2); - doClose(); - }//GEN-LAST:event_selectButtonActionPerformed + private void selectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectButtonActionPerformed + cancelled = false; + int row = databasesTable.getSelectedRow(); + DefaultTableModel model = (DefaultTableModel) databasesTable.getModel(); + hostname = (String) model.getValueAt(row, 0); + database = (String) model.getValueAt(row, 1); + username = (String) model.getValueAt(row, 2); + doClose(); + }//GEN-LAST:event_selectButtonActionPerformed - private void newButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newButtonActionPerformed - DatabaseDialog dialog = new DatabaseDialog(); - dialog.setVisible(true); - if (!dialog.cancelled) { - cancelled = false; - hostname = dialog.hostname; - database = dialog.database; - username = new String(""); - doClose(); - } - }//GEN-LAST:event_newButtonActionPerformed + private void newButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newButtonActionPerformed + DatabaseDialog dialog = new DatabaseDialog(); + dialog.setVisible(true); + if (!dialog.cancelled) { + cancelled = false; + hostname = dialog.hostname; + database = dialog.database; + username = new String(""); + doClose(); + } + }//GEN-LAST:event_newButtonActionPerformed - private void doClose() { + private void doClose() { setVisible(false); dispose(); - } + } - public void add(String hostname, String database, String username) { - DefaultTableModel model = (DefaultTableModel)databasesTable.getModel(); - model.insertRow(model.getRowCount(), new Object[] { hostname, database, username }); - } - + public void add(String hostname, String database, String username) { + DefaultTableModel model = (DefaultTableModel) databasesTable.getModel(); + model.insertRow(model.getRowCount(), new Object[]{hostname, database, username}); + } + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton cancelButton; private javax.swing.JTable databasesTable;