--- FM2SQL/Attic/FM2SQL.java 2004/01/12 13:23:09 1.9 +++ FM2SQL/Attic/FM2SQL.java 2004/01/13 12:14:36 1.10 @@ -26,6 +26,7 @@ public class FM2SQL extends JFrame imple private JCheckBoxMenuItem convertItem; private JCheckBoxMenuItem appendItem; private JCheckBoxMenuItem updateItem; + int mode = -1; /** * The database Bean instance. * @@ -553,20 +554,21 @@ public class FM2SQL extends JFrame imple System.out.println("Convert Mode selected"); convert.setText("Convert Tables"); convert.setActionCommand("Convert Tables"); - + mode = Convert.DataBase.CONVERT_MODE; } if (command == "Append Mode") { System.out.println("Append Mode selected"); convert.setText("Append Tables"); convert.setActionCommand("Append Tables"); - + mode = Convert.DataBase.APPEND_MODE; } if (command == "Update Mode") { System.out.println("Update Mode selected"); convert.setText("Update Tables"); convert.setActionCommand("Update Tables"); + mode = Convert.DataBase.UPDATE_MODE; } //writing config if (command.equals("save XML Config")) @@ -724,7 +726,7 @@ public class FM2SQL extends JFrame imple { fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); fmInstance.setEnabled(false); - Convert.convert(bean.url, box4.getSelectedItem().toString(), vectors[0], vectors[1],vectors[2],vectors[3]); + Convert.convert(bean.url, box4.getSelectedItem().toString(), vectors[0], vectors[1],vectors[2],vectors[3],mode); destBean.setConnection((String) box4.getSelectedItem()); DefaultListModel model = new DefaultListModel(); @@ -750,7 +752,6 @@ public class FM2SQL extends JFrame imple fmInstance.setEnabled(false); Vector vectors[] = getListFromTable(); - int mode =-1; if(convertItem.isSelected()) mode = Convert.DataBase.CONVERT_MODE; else if(appendItem.isSelected()) mode = Convert.DataBase.APPEND_MODE; @@ -798,30 +799,26 @@ public class FM2SQL extends JFrame imple for (Iterator iter = databases.iterator(); iter.hasNext();) { Convert.DataBase database = (Convert.DataBase) iter.next(); - int mode = -1; + if (database.mode == Convert.DataBase.CONVERT_MODE) { convertItem.setSelected(true); convert.setText("Convert Tables"); convert.setActionCommand("Convert Tables"); - - } else - if (database.mode == Convert.DataBase.APPEND_MODE) - { - appendItem.setSelected(true); - convert.setText("Append Tables"); - convert.setActionCommand("Append Tables"); - - } else - if (database.mode == Convert.DataBase.UPDATE_MODE) - { - updateItem.setSelected(true); - convert.setText("Update Tables"); - convert.setActionCommand("Update Tables"); - - } - - + mode = Convert.DataBase.CONVERT_MODE; + } else if (database.mode == Convert.DataBase.APPEND_MODE) + { + appendItem.setSelected(true); + convert.setText("Append Tables"); + convert.setActionCommand("Append Tables"); + mode = Convert.DataBase.APPEND_MODE; + } else if (database.mode == Convert.DataBase.UPDATE_MODE) + { + updateItem.setSelected(true); + convert.setText("Update Tables"); + convert.setActionCommand("Update Tables"); + mode = Convert.DataBase.UPDATE_MODE; + } database.bean.getConnection(); bean = database.bean; @@ -1185,6 +1182,7 @@ public class FM2SQL extends JFrame imple menu.setBackground(fm.getBackground()); menubar.setBackground(fm.getBackground()); + convertItem.doClick(); setJMenuBar(menubar); } /**