--- FM2SQL/Attic/Convert.java	2004/03/23 11:57:43	1.52
+++ FM2SQL/Attic/Convert.java	2004/04/06 10:34:15	1.54
@@ -263,7 +263,7 @@ class Convert
     FM2SQL.ProgressDialog dialog = null;
     if (FM2SQL.fmInstance != null)
     {
-      dialog = new FM2SQL.ProgressDialog(FM2SQL.fmInstance);
+      dialog = new FM2SQL.ProgressDialog(FM2SQL.fmInstance,bean);
       dialog.setTitle("Conversion running ...");
       dialog.title.setText("Getting table data ...");
       dialog.setLocation(FM2SQL.fmInstance.getLocationOnScreen().x + (FM2SQL.fmInstance.getWidth() - 400) / 2, FM2SQL.fmInstance.getLocationOnScreen().y + (FM2SQL.fmInstance.getHeight() - 250) / 2);
@@ -470,7 +470,7 @@ class Convert
 
     if (FM2SQL.fmInstance != null)
     {
-      dialog = new FM2SQL.ProgressDialog(FM2SQL.fmInstance);
+      dialog = new FM2SQL.ProgressDialog(FM2SQL.fmInstance,bean);
       dialog.setTitle("Conversion running ...");
       dialog.title.setText("Getting table data ...");
       dialog.setLocation(FM2SQL.fmInstance.getLocationOnScreen().x + (FM2SQL.fmInstance.getWidth() - 400) / 2, FM2SQL.fmInstance.getLocationOnScreen().y + (FM2SQL.fmInstance.getHeight() - 250) / 2);
@@ -824,12 +824,16 @@ class Convert
       for (int k = 0; k < row.size(); ++k)
       {
         obj = row.get(k);
-        if (obj instanceof ArrayList)
-				if (obj instanceof ArrayList)
+ 
+      	if (obj instanceof ArrayList)
 			 obj = formatFileMakerArray((List) obj,delimiter);
       
         String str = (obj == null) ? "NULL" : obj.toString();
-        if (!str.equals("NULL"))
+        if(obj instanceof Double)
+          {
+            pstm.setDouble(k + 1, ((Double)obj).doubleValue());
+          }else
+          if (!str.equals("NULL"))
           pstm.setString(k + 1, str);
         else
           pstm.setNull(k + 1, Types.NULL);
@@ -1604,7 +1608,7 @@ class Convert
     FM2SQL.ProgressDialog dialog = null;
     if (FM2SQL.fmInstance != null)
     {
-      dialog = new FM2SQL.ProgressDialog(FM2SQL.fmInstance);
+      dialog = new FM2SQL.ProgressDialog(FM2SQL.fmInstance,bean);
       dialog.setTitle("Conversion running ...");
       dialog.title.setText("Getting table data ...");
       dialog.setLocation(FM2SQL.fmInstance.getLocationOnScreen().x + (FM2SQL.fmInstance.getWidth() - 400) / 2, FM2SQL.fmInstance.getLocationOnScreen().y + (FM2SQL.fmInstance.getHeight() - 250) / 2);