--- FM2SQL/Attic/FM2SQL.java 2004/03/23 11:57:06 1.33 +++ FM2SQL/Attic/FM2SQL.java 2004/04/05 10:14:01 1.34 @@ -1083,7 +1083,7 @@ public class FM2SQL extends JFrame imple } public boolean showTable(int list) { - ProgressDialog dialog = new ProgressDialog(fm); + ProgressDialog dialog = new ProgressDialog(fm,bean); dialog.setTitle("Preparing tables to be displayed"); dialog.thread = Thread.currentThread(); dialog.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -1486,9 +1486,12 @@ public class FM2SQL extends JFrame imple JProgressBar progress = new JProgressBar(); JButton cancel = new JButton("Cancel"); Thread thread; - public ProgressDialog(JFrame frame) + DBBean bean; + public ProgressDialog(JFrame frame,DBBean bean) { super(frame); + this.bean = bean; + content = new JPanel(true); //content.setBorder(BorderFactory.createRaisedBevelBorder()); content.setLayout(new BoxLayout(content, BoxLayout.Y_AXIS)); @@ -1523,6 +1526,18 @@ public class FM2SQL extends JFrame imple fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); fmInstance.setEnabled(true); setVisible(false); + try + { + ProgressDialog.this.bean.getConnection().close(); + } catch (SQLException e1) + { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (Exception e1) + { + // TODO Auto-generated catch block + e1.printStackTrace(); + } thread.stop(); } });