--- FM2SQL/Attic/FM2SQL.java	2004/03/12 11:48:57	1.29
+++ FM2SQL/Attic/FM2SQL.java	2004/03/15 12:30:51	1.30
@@ -875,7 +875,7 @@ public class FM2SQL extends JFrame imple
        ByteArrayOutputStream b = new ByteArrayOutputStream();
        PrintStream stream = new PrintStream(b);
        e4.printStackTrace(stream);
-       showErrorDialog(b.toString(), "Update of table failed");
+       showErrorDialog(b.toString(), "Delete of table failed");
        fmInstance.setEnabled(true);
      }
 
@@ -987,6 +987,12 @@ public class FM2SQL extends JFrame imple
           convert.setText("Update Tables");
           convert.setActionCommand("Update Tables");
           mode = Convert.DataBase.UPDATE_MODE;
+        } else if (database.mode == Convert.DataBase.UPDATE_MODE)
+        {
+          deleteItem.setSelected(true);
+          convert.setText("Delete Tables");
+          convert.setActionCommand("Delete Tables");
+          mode = Convert.DataBase.DELETE_MODE;
         }
         delimiter=database.delimiter;
         database.bean.getConnection();
@@ -1016,7 +1022,22 @@ public class FM2SQL extends JFrame imple
           Object idcomboBox=tC.tableModel.getValueAt(index,ID_INDEX);
       
           indices[i] = index;
-          if(comboBox!=null) ((JComboBox)comboBox).setSelectedItem(database.layouts.get(i));  
+          if (comboBox != null)
+          {
+            String layout = database.layouts.get(i).toString();
+            ((JComboBox) comboBox).setSelectedItem(layout);
+            if (layout != "")
+            {
+              bean.makeQuery("select * from" + bean.getQC() + table + bean.getQC() + " layout " + bean.getQC() + layout + bean.getQC(), 1);
+
+              Vector idVec = bean.getColumnNames();
+              if (idVec == null)
+                idVec = new Vector();
+              idVec.add(0, "");
+               ((JComboBox) idcomboBox).setModel(new DefaultComboBoxModel(idVec));
+            }
+          
+          }
           if(idcomboBox!=null)((JComboBox)idcomboBox).setSelectedItem(bean.ids.get(i));
           tC.tableModel.fireTableDataChanged();
           noDBUpdate = false;
@@ -1275,6 +1296,8 @@ public class FM2SQL extends JFrame imple
             JComboBox box = ((JComboBox) model.getValueAt(row, ID_INDEX));
             box.setModel(new DefaultComboBoxModel(idVec));
             box.setSelectedItem(id);
+            //box.repaint();
+           tC.tableModel.fireTableCellUpdated(row,ID_INDEX);
           }
        
         }