--- FM2SQL/Attic/FM2SQL.java 2004/03/15 12:30:51 1.30 +++ FM2SQL/Attic/FM2SQL.java 2004/03/15 12:52:00 1.32 @@ -926,6 +926,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 +974,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(); @@ -1296,7 +1287,7 @@ 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); }