--- FM2SQL/Attic/FM2SQL.java	2004/03/08 13:57:40	1.26
+++ FM2SQL/Attic/FM2SQL.java	2004/03/12 11:48:57	1.29
@@ -599,8 +599,8 @@ public class FM2SQL extends JFrame imple
     }
     if (command.equals("Delimiter"))
     {
-      new DelimiterDialog(fmInstance).setVisible(true); 
-      delimiter =  JOptionPane.showInputDialog(fmInstance,"Enter delimiter String",delimiter); 
+			new DelimiterDialog(fmInstance).setVisible(true); 
+      //delimiter =  JOptionPane.showInputDialog(fmInstance,"Enter delimiter String",delimiter); 
       
     }
 
@@ -739,6 +739,21 @@ public class FM2SQL extends JFrame imple
 			 };
 			 thread.start();
 		 }
+    if (command.equals("Delete Tables"))
+     {
+
+       Thread thread = new Thread()
+       {
+         public void run()
+         {
+           setEnabled(false);
+           delete();
+           setEnabled(true);
+         }
+
+       };
+       thread.start();
+     }
 
     if (command.equals("show Tables"))
     {
@@ -832,6 +847,40 @@ public class FM2SQL extends JFrame imple
     }
 
   }
+  public void delete() 
+   {
+     Vector vectors[] = getListFromTable();
+     Convert.user = bean.user;
+     Convert.passwd = bean.passwd;
+     Convert.userDest = destBean.user;
+     Convert.passwdDest = destBean.passwd;
+     try
+     {
+      
+       fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+       fmInstance.setEnabled(false);
+       Convert.delete(bean.url, destURLBox.getSelectedItem().toString(), vectors[0], vectors[1], vectors[2], vectors[3],vectors[4], mode);
+
+       destBean.setConnection((String) destURLBox.getSelectedItem());
+       DefaultListModel model = new DefaultListModel();
+       tables = destBean.getTableNames();
+       for (int j = 0; j < tables.size(); ++j)
+         model.addElement(tables.get(j));
+       if (debug)
+         System.out.println("hallo" + tables + " ");
+       tListDest.setModel(model);
+       fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+     } catch (Exception e4)
+     {
+       ByteArrayOutputStream b = new ByteArrayOutputStream();
+       PrintStream stream = new PrintStream(b);
+       e4.printStackTrace(stream);
+       showErrorDialog(b.toString(), "Update of table failed");
+       fmInstance.setEnabled(true);
+     }
+
+   }
+
   /**
    * Copys the content of source to destination and makes new table if necessary
    */
@@ -1217,7 +1266,7 @@ public class FM2SQL extends JFrame imple
           if (columnName.equals("Layouts"))
           {
             
-            bean.makeQuery("select * from"+bean.getQC()+table+bean.getQC(),1);
+            bean.makeQuery("select * from"+bean.getQC()+table+bean.getQC()+" layout "+bean.getQC()+layout+bean.getQC(),1);
 
             Vector idVec = bean.getColumnNames();
             if (idVec == null)
@@ -1474,6 +1523,7 @@ public class FM2SQL extends JFrame imple
 			setTitle("Delimiter Editor");
 			setModal(true);
 			content = new JPanel(true);
+			delimiter.setText(fmInstance.delimiter);
 			ActionListener al = new ActionListener()
 			{
 				public void actionPerformed(ActionEvent e)