--- FM2SQL/Attic/FM2SQL.java	2004/02/27 11:34:53	1.21
+++ FM2SQL/Attic/FM2SQL.java	2004/03/04 11:30:11	1.25
@@ -67,6 +67,7 @@ import javax.swing.table.TableModel;
  */
 public class FM2SQL extends JFrame implements ActionListener, TableModelListener
 {
+  private JMenuItem delimiterItem;
   private JCheckBoxMenuItem convertItem;
   private JCheckBoxMenuItem appendItem;
   private JCheckBoxMenuItem updateItem;
@@ -136,6 +137,8 @@ public class FM2SQL extends JFrame imple
   int oldWidth = 0, oldHeight = 0;
   boolean resize = true;
   static FileWriter logFile;
+	String delimiter = "";
+
   Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
   JFileChooser configExportFileChooser;
   JFileChooser configImportFileChooser;
@@ -594,6 +597,12 @@ public class FM2SQL extends JFrame imple
       {
       }
     }
+    if (command.equals("Delimiter"))
+    {
+      delimiter =  JOptionPane.showInputDialog(fmInstance,"Enter delimiter String",delimiter); 
+      
+    }
+
     if (command == "Convert Mode")
     {
       System.out.println("Convert Mode selected");
@@ -837,8 +846,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);
-
+      Convert.convert(bean.url, destURLBox.getSelectedItem().toString(), vectors[0], vectors[1],vectors[2],vectors[3],vectors[4],mode,delimiter);
       destBean.setConnection((String) destURLBox.getSelectedItem());
       DefaultListModel model = new DefaultListModel();
       tables = destBean.getTableNames();
@@ -871,7 +879,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);
@@ -930,8 +938,9 @@ public class FM2SQL extends JFrame imple
           convert.setActionCommand("Update Tables");
           mode = Convert.DataBase.UPDATE_MODE;
         }
+        delimiter=database.delimiter;
         database.bean.getConnection();
-        
+           
         bean = database.bean;
         Object obj =bean.url;
         ((DefaultComboBoxModel) sourceURLBox.getModel()).removeElement(obj);
@@ -1272,12 +1281,6 @@ public class FM2SQL extends JFrame imple
     menu = new JMenu("Options");
     menu.setMnemonic('O');
    
-    item = new JMenuItem("show Driver features");
-		item.setToolTipText("shows the features of the selected driver");
-    item.addActionListener(fm);
-    menu.add(item);
-    menubar.add(menu);
-
     ButtonGroup bgrp = new ButtonGroup();
     convertItem = new JCheckBoxMenuItem("Convert Mode");
 		convertItem.setToolTipText("Normal table conversion  existing table will be deleted");
@@ -1313,9 +1316,19 @@ public class FM2SQL extends JFrame imple
     menu.add(deleteItem);
 
 		menubar.add(menu);
-  
+    item = new JMenuItem("show Driver features");
+    item.setToolTipText("shows the features of the selected driver");
     item.addActionListener(fm);
     menu.add(item);
+    menubar.add(menu);
+    delimiterItem = new JMenuItem("Delimiter");
+    delimiterItem.setToolTipText("Delimiter for FM Arrayfields");
+    delimiterItem.addActionListener(fm);
+    menu.add(delimiterItem);
+    menubar.add(menu);
+
+ //   item.addActionListener(fm);
+//    menu.add(item);
   
     menubar.add(menu);