--- FM2SQL/Attic/FM2SQL.java	2004/03/15 12:31:30	1.31
+++ FM2SQL/Attic/FM2SQL.java	2004/04/05 10:14:01	1.34
@@ -1,3 +1,17 @@
+/*
+ * FM2SQL.java -- Main program Filemaker to SQL Converter 
+ * Copyright (C) 2003 Robert Gordesch (rogo@mpiwg-berlin.mpg.de) 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.  Please read license.txt for the full details. A copy of
+ * the GPL may be found at http://www.gnu.org/copyleft/lgpl.html  You should
+ * have received a copy of the GNU General Public License along with this
+ * program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA  Created on 15.09.2003 by
+ * rogo  
+ */
+
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -926,6 +940,9 @@ public class FM2SQL extends JFrame imple
 		if(appendItem.isSelected()) mode = Convert.DataBase.APPEND_MODE;
 		else
 		if(updateItem.isSelected()) mode = Convert.DataBase.UPDATE_MODE;
+    else
+    if(deleteItem.isSelected()) mode = Convert.DataBase.DELETE_MODE;
+
     // TODO add id vector in table and write it out
     Convert.DataBase source = new Convert.DataBase(bean,vectors[0],vectors[1],vectors[2],vectors[3],vectors[4],mode);
     Convert.DataBase destination = new Convert.DataBase(destBean,new Vector(),new Vector(),new Vector(),new Vector(),new Vector(),-1);
@@ -971,28 +988,16 @@ public class FM2SQL extends JFrame imple
         
         if (database.mode == Convert.DataBase.CONVERT_MODE)
         {
-          convertItem.setSelected(true);
-          convert.setText("Convert Tables");
-          convert.setActionCommand("Convert Tables");
-          mode = Convert.DataBase.CONVERT_MODE;
+          convertItem.doClick();
         } else if (database.mode == Convert.DataBase.APPEND_MODE)
         {
-          appendItem.setSelected(true);
-          convert.setText("Append Tables");
-          convert.setActionCommand("Append Tables");
-          mode = Convert.DataBase.APPEND_MODE;
+          appendItem.doClick();
         } else if (database.mode == Convert.DataBase.UPDATE_MODE)
         {
-          updateItem.setSelected(true);
-          convert.setText("Update Tables");
-          convert.setActionCommand("Update Tables");
-          mode = Convert.DataBase.UPDATE_MODE;
-        } else if (database.mode == Convert.DataBase.UPDATE_MODE)
+          updateItem.doClick();
+        } else if (database.mode == Convert.DataBase.DELETE_MODE)
         {
-          deleteItem.setSelected(true);
-          convert.setText("Delete Tables");
-          convert.setActionCommand("Delete Tables");
-          mode = Convert.DataBase.DELETE_MODE;
+          deleteItem.doClick();
         }
         delimiter=database.delimiter;
         database.bean.getConnection();
@@ -1078,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));
@@ -1481,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));
@@ -1518,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();
         }
       });