--- FM2SQL/Attic/FM2SQL.java	2004/03/15 12:52:00	1.32
+++ FM2SQL/Attic/FM2SQL.java	2004/06/01 18:58:08	1.37
@@ -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;
@@ -18,6 +32,7 @@ import java.io.FileWriter;
 import java.io.PrintStream;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.text.ParseException;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Vector;
@@ -74,10 +89,12 @@ public class FM2SQL extends JFrame imple
   private JCheckBoxMenuItem deleteItem;
   
   int mode = -1;
-  final static int ID_INDEX = 1;
-  final static int SELECT_INDEX = 2;
-  final static int CREATE_INDEX = 3;
-  final static int LAYOUT_INDEX = 4;
+  final static int STATUS_INDEX = 0;
+  final static int NAME_INDEX = 1;
+  final static int ID_INDEX = 2;
+  final static int SELECT_INDEX = 3;
+  final static int CREATE_INDEX = 4;
+  final static int LAYOUT_INDEX = 5;
   
   
  
@@ -1038,8 +1055,10 @@ public class FM2SQL extends JFrame imple
         // add Selections
         ListSelectionModel lm = tC.table.getSelectionModel();
         for(int i=0;i<indices.length;++i)
-        lm.addSelectionInterval(indices[i],indices[i]);
-         
+        {
+          lm.addSelectionInterval(indices[i],indices[i]);
+          tC.tableModel.setValueAt(Boolean.TRUE,indices[i],STATUS_INDEX);
+        }    
        destBean.getConnection();
       
         DefaultListModel model = new DefaultListModel();
@@ -1069,7 +1088,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));
@@ -1261,7 +1280,7 @@ public class FM2SQL extends JFrame imple
       {
         if(columnName.equals("select")||columnName.equals("Layouts"))
         {
-          String table = model.getValueAt(row,0).toString();
+          String table = model.getValueAt(row,NAME_INDEX).toString();
           String layout = (model.getValueAt(row,LAYOUT_INDEX)!=null) ?((JComboBox)model.getValueAt(row,LAYOUT_INDEX)).getSelectedItem().toString():"";
           String query =  model.getValueAt(row,SELECT_INDEX).toString();
           String create = model.getValueAt(row,CREATE_INDEX).toString();
@@ -1472,9 +1491,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));
@@ -1509,6 +1531,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();
         }
       });
@@ -1722,9 +1756,10 @@ public class FM2SQL extends JFrame imple
     Vector tableNames = bean.getTableNames();
     Collections.sort(tableNames, String.CASE_INSENSITIVE_ORDER);
     Vector[] data = new Vector[2];
-    data[1] = new Vector(5);
-    data[1].setSize(5); 
-    data[1].set(0," source Tablename  ");
+    data[1] = new Vector(6);
+    data[1].setSize(6); 
+    data[1].set(STATUS_INDEX," ");
+    data[1].set(NAME_INDEX," source Tablename  ");
     data[1].set(LAYOUT_INDEX,"Layouts");
 		data[1].set(SELECT_INDEX,"select");
     data[1].set(CREATE_INDEX,"create");
@@ -1748,10 +1783,11 @@ public class FM2SQL extends JFrame imple
       idVec = bean.getColumnNames(); 
       if(idVec==null) idVec=new Vector();
       idVec.add(0,"");
-      Vector dataRow = new Vector(5);
+      Vector dataRow = new Vector(6);
       
-      dataRow.setSize(5);
-      dataRow.set(0,name);
+      dataRow.setSize(6);
+      dataRow.set(STATUS_INDEX,Boolean.FALSE);
+      dataRow.set(NAME_INDEX,name);
       
       dataRow.set(SELECT_INDEX,new TableComponent.SQLCommand("select * from " + bean.getQC() + name + bean.getQC()));
       if (!layouts.isEmpty())
@@ -1770,6 +1806,7 @@ public class FM2SQL extends JFrame imple
       //System.out.println(dataRow);
     }
    
+    tC.booleanRenderer.renderFalseEmpty=true;
     tC.tableModel.setDataVector(data[0], data[1]);
    //@TODO new sizeToFit method needed
     //tC.sizeToFit(450, 250);
@@ -1788,18 +1825,27 @@ public class FM2SQL extends JFrame imple
 		vec[2] = new Vector();
     vec[3] = new Vector();
     vec[4] = new Vector();
+    for(int i=0;i<tC.tableModel.getRowCount();++i)
+    {
+    }
     int[] rows = tC.table.getSelectedRows();
-    for (int i = 0; i < rows.length; i++)
+    for (int i = 0; i < tC.tableModel.getRowCount(); i++)
     {
+      if(((Boolean)tC.tableModel.getValueAt(i,STATUS_INDEX))==Boolean.FALSE)
+      { 
+        System.out.println("skipped row "+i);
+        continue; 
+        }
+  
       //System.out.println(tC.tableModel.getValueAt(rows[i],1));
-      vec[0].add(tC.tableModel.getValueAt(rows[i], 0));
-      JComboBox box = ((JComboBox) tC.tableModel.getValueAt(rows[i], LAYOUT_INDEX));
+      vec[0].add(tC.tableModel.getValueAt(i, NAME_INDEX));
+      JComboBox box = ((JComboBox) tC.tableModel.getValueAt(i, LAYOUT_INDEX));
       String layoutName = (box != null) ? box.getSelectedItem().toString() : "";
       
-      String idName = ((JComboBox)tC.tableModel.getValueAt(rows[i], ID_INDEX)).getSelectedItem().toString();
+      String idName = ((JComboBox)tC.tableModel.getValueAt(i, ID_INDEX)).getSelectedItem().toString();
       vec[1].add(layoutName);
-      vec[2].add(tC.tableModel.getValueAt(rows[i],SELECT_INDEX ).toString());
-      vec[3].add(tC.tableModel.getValueAt(rows[i], CREATE_INDEX).toString());
+      vec[2].add(tC.tableModel.getValueAt(i,SELECT_INDEX ).toString());
+      vec[3].add(tC.tableModel.getValueAt(i, CREATE_INDEX).toString());
 			vec[4].add(idName);
   
     }
@@ -1815,7 +1861,7 @@ public class FM2SQL extends JFrame imple
     destURLBox.setEnabled(state);
 
   }
-  public TableComponent.SQLCommand createStatement(String table,DBBean beanDest,String layout,String query)  throws SQLException
+  public TableComponent.SQLCommand createStatement(String table,DBBean beanDest,String layout,String query)  throws SQLException, ParseException
   {
     fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));