--- FM2SQL/Attic/FM2SQL.java	2004/02/18 13:25:24	1.18
+++ FM2SQL/Attic/FM2SQL.java	2004/02/19 10:35:06	1.19
@@ -783,6 +783,7 @@ public class FM2SQL extends JFrame imple
     Convert.passwdDest = destBean.passwd;
     try
     {
+      
       fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
       fmInstance.setEnabled(false);
       Convert.update(bean.url, destURLBox.getSelectedItem().toString(), vectors[0], vectors[1], vectors[2], vectors[3],vectors[4], mode);
@@ -935,11 +936,14 @@ public class FM2SQL extends JFrame imple
 					
           String create =database.creates.get(i).toString();
           tC.tableModel.setValueAt(new TableComponent.SQLCommand(create.equals("") ? create:"           "+create),index,CREATE_INDEX);
-					tC.tableModel.setValueAt(new TableComponent.SQLCommand(bean.ids.get(i).toString()),index,ID_INDEX);
+					// tC.tableModel.setValueAt(new TableComponent.SQLCommand(bean.ids.get(i).toString()),index,ID_INDEX);
 
           Object comboBox=tC.tableModel.getValueAt(index,LAYOUT_INDEX);
+          Object idcomboBox=tC.tableModel.getValueAt(index,ID_INDEX);
+      
           indices[i] = index;
           if(comboBox!=null) ((JComboBox)comboBox).setSelectedItem(database.layouts.get(i));  
+          if(idcomboBox!=null)((JComboBox)idcomboBox).setSelectedItem(bean.ids.get(i));
           tC.tableModel.fireTableDataChanged();
           noDBUpdate = false;
           noUserUpdate = false;
@@ -1505,13 +1509,20 @@ public class FM2SQL extends JFrame imple
     {
       String name = tableNames.get(i).toString();
       Vector layouts = new Vector();
+      Vector idVec = new Vector();
+   
       try
       {
+        bean.makeQuery("select * from"+bean.getQC()+name+bean.getQC(),1);
         layouts = bean.getLayoutNames(name);
       } catch (SQLException e)
       {
         layouts = new Vector();
       }
+      
+      idVec = bean.getColumnNames(); 
+      if(idVec==null) idVec=new Vector();
+      idVec.add(0,"");
       Vector dataRow = new Vector(5);
       
       dataRow.setSize(5);
@@ -1527,7 +1538,7 @@ public class FM2SQL extends JFrame imple
       // create row
       dataRow.set(CREATE_INDEX,new TableComponent.SQLCommand(""));
       // id row
-      dataRow.set(ID_INDEX,new TableComponent.SQLCommand(""));
+      dataRow.set(ID_INDEX,new TableComponent.IDComboBox(idVec));//new TableComponent.SQLCommand(""));
       bean.ids.add("");
       data[0].add(dataRow);
 
@@ -1559,10 +1570,12 @@ public class FM2SQL extends JFrame imple
       vec[0].add(tC.tableModel.getValueAt(rows[i], 0));
       JComboBox box = ((JComboBox) tC.tableModel.getValueAt(rows[i], LAYOUT_INDEX));
       String layoutName = (box != null) ? box.getSelectedItem().toString() : "";
+      
+      String idName = ((JComboBox)tC.tableModel.getValueAt(rows[i], ID_INDEX)).getSelectedItem().toString();
       vec[1].add(layoutName);
       vec[2].add(tC.tableModel.getValueAt(rows[i],SELECT_INDEX ).toString());
       vec[3].add(tC.tableModel.getValueAt(rows[i], CREATE_INDEX).toString());
-			vec[4].add(tC.tableModel.getValueAt(rows[i], ID_INDEX).toString());
+			vec[4].add(idName);
   
     }
     return vec;