--- FM2SQL/Attic/FM2SQL.java	2004/03/08 20:03:39	1.27
+++ FM2SQL/Attic/FM2SQL.java	2004/03/15 12:52:00	1.32
@@ -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(), "Delete of table failed");
+       fmInstance.setEnabled(true);
+     }
+
+   }
+
   /**
    * Copys the content of source to destination and makes new table if necessary
    */
@@ -877,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);
@@ -922,22 +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;
+          updateItem.doClick();
+        } else if (database.mode == Convert.DataBase.DELETE_MODE)
+        {
+          deleteItem.doClick();
         }
         delimiter=database.delimiter;
         database.bean.getConnection();
@@ -967,7 +1013,22 @@ public class FM2SQL extends JFrame imple
           Object idcomboBox=tC.tableModel.getValueAt(index,ID_INDEX);
       
           indices[i] = index;
-          if(comboBox!=null) ((JComboBox)comboBox).setSelectedItem(database.layouts.get(i));  
+          if (comboBox != null)
+          {
+            String layout = database.layouts.get(i).toString();
+            ((JComboBox) comboBox).setSelectedItem(layout);
+            if (layout != "")
+            {
+              bean.makeQuery("select * from" + bean.getQC() + table + bean.getQC() + " layout " + bean.getQC() + layout + bean.getQC(), 1);
+
+              Vector idVec = bean.getColumnNames();
+              if (idVec == null)
+                idVec = new Vector();
+              idVec.add(0, "");
+               ((JComboBox) idcomboBox).setModel(new DefaultComboBoxModel(idVec));
+            }
+          
+          }
           if(idcomboBox!=null)((JComboBox)idcomboBox).setSelectedItem(bean.ids.get(i));
           tC.tableModel.fireTableDataChanged();
           noDBUpdate = false;
@@ -1217,7 +1278,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)
@@ -1226,6 +1287,8 @@ public class FM2SQL extends JFrame imple
             JComboBox box = ((JComboBox) model.getValueAt(row, ID_INDEX));
             box.setModel(new DefaultComboBoxModel(idVec));
             box.setSelectedItem(id);
+            
+           tC.tableModel.fireTableCellUpdated(row,ID_INDEX);
           }
        
         }