--- FM2SQL/Attic/FM2SQL.java	2004/01/15 13:25:37	1.12
+++ FM2SQL/Attic/FM2SQL.java	2004/01/19 08:24:37	1.13
@@ -656,6 +656,22 @@ public class FM2SQL extends JFrame imple
       };
       thread.start();
     }
+		if (command.equals("Update Tables"))
+		 {
+
+			 Thread thread = new Thread()
+			 {
+				 public void run()
+				 {
+					 setEnabled(false);
+					 update();
+					 setEnabled(true);
+				 }
+
+			 };
+			 thread.start();
+		 }
+
     if (command.equals("show Tables"))
     {
       Thread thread = new Thread()
@@ -711,6 +727,42 @@ public class FM2SQL extends JFrame imple
    }
    
   }
+	/**
+	 * Updates the content of source to destination and makes new table if necessary
+	 */
+
+  public void update() 
+  {
+    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.update(bean.url, box4.getSelectedItem().toString(), vectors[0], vectors[1], vectors[2], vectors[3],vectors[4], mode);
+
+      destBean.setConnection((String) box4.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(), "Conversion of table failed");
+      fmInstance.setEnabled(true);
+    }
+
+  }
   /**
    * Copys the content of source to destination and makes new table if necessary
    */
@@ -758,7 +810,7 @@ public class FM2SQL extends JFrame imple
 		else
 		if(updateItem.isSelected()) mode = Convert.DataBase.UPDATE_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],new Vector(),mode);
+    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);
    
     try
@@ -837,8 +889,11 @@ public class FM2SQL extends JFrame imple
           if(index<0) throw new RuntimeException("Error table \""+table+"\" does no longer exist\n at server "+bean.url +"\n or you mispelled the tablename.");
           noDBUpdate = true;
           tC.tableModel.setValueAt(new TableComponent.SQLCommand(database.selects.get(i).toString()),index,2);
+					
           String create =database.creates.get(i).toString();
           tC.tableModel.setValueAt(new TableComponent.SQLCommand(create.equals("") ? create:"           "+create),index,3);
+					tC.tableModel.setValueAt(new TableComponent.SQLCommand(bean.ids.get(i).toString()),index,4);
+
           Object comboBox=tC.tableModel.getValueAt(index,1);
           indices[i] = index;
           if(comboBox!=null) ((JComboBox)comboBox).setSelectedItem(database.layouts.get(i));  
@@ -1403,7 +1458,6 @@ public class FM2SQL extends JFrame imple
     data[1].add(" id ");
    // TODO add id vector DBBean
     data[0] = new Vector();
-
     for (int i = 0; i < tableNames.size(); i++)
     {
       String name = tableNames.get(i).toString();
@@ -1424,7 +1478,12 @@ public class FM2SQL extends JFrame imple
       dataRow.add(new TableComponent.SQLCommand("select * from "+bean.getQC()+name+bean.getQC()));
      
         data[0].add(dataRow);
+    
+    // create row
     dataRow.add(new TableComponent.SQLCommand(""));
+    // id row
+      dataRow.add(new TableComponent.SQLCommand(""));
+ 	    bean.ids.add("");
       //System.out.println(dataRow);
     }
     tC.tableModel.setDataVector(data[0], data[1]);
@@ -1435,11 +1494,12 @@ public class FM2SQL extends JFrame imple
   }
   public Vector[] getListFromTable()
   {
-    Vector[] vec = new Vector[4];
+    Vector[] vec = new Vector[5];
     vec[0] = new Vector();
     vec[1] = new Vector();
 		vec[2] = new Vector();
     vec[3] = new Vector();
+    vec[4] = new Vector();
     int[] rows = tC.table.getSelectedRows();
     for (int i = 0; i < rows.length; i++)
     {
@@ -1450,6 +1510,7 @@ public class FM2SQL extends JFrame imple
       vec[1].add(layoutName);
       vec[2].add(tC.tableModel.getValueAt(rows[i], 2).toString());
       vec[3].add(tC.tableModel.getValueAt(rows[i], 3).toString());
+			vec[4].add(tC.tableModel.getValueAt(rows[i], 4).toString());
   
     }
     return vec;