--- FM2SQL/Attic/FM2SQL.java 2004/03/02 12:04:26 1.22 +++ FM2SQL/Attic/FM2SQL.java 2004/03/03 12:10:32 1.23 @@ -136,7 +136,7 @@ public class FM2SQL extends JFrame imple int oldWidth = 0, oldHeight = 0; boolean resize = true; static FileWriter logFile; - String delimiter = " | "; + String delimiter = ""; Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize(); JFileChooser configExportFileChooser; @@ -840,7 +840,7 @@ public class FM2SQL extends JFrame imple fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); fmInstance.setEnabled(false); Convert.convert(bean.url, destURLBox.getSelectedItem().toString(), vectors[0], vectors[1],vectors[2],vectors[3],vectors[4],mode,delimiter); - + System.out.println("delimiter "+delimiter); destBean.setConnection((String) destURLBox.getSelectedItem()); DefaultListModel model = new DefaultListModel(); tables = destBean.getTableNames(); @@ -873,7 +873,7 @@ public class FM2SQL extends JFrame imple // 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); - + source.delimiter =delimiter; try { Convert.writeConfig(file,source,destination); @@ -932,8 +932,10 @@ public class FM2SQL extends JFrame imple convert.setActionCommand("Update Tables"); mode = Convert.DataBase.UPDATE_MODE; } + delimiter=database.delimiter; + System.out.println("Delimiter in readXML ist "+delimiter); database.bean.getConnection(); - + bean = database.bean; Object obj =bean.url; ((DefaultComboBoxModel) sourceURLBox.getModel()).removeElement(obj);