--- FM2SQL/src/Convert.java 2005/09/22 12:24:30 1.15 +++ FM2SQL/src/Convert.java 2006/09/30 10:58:58 1.16 @@ -137,7 +137,7 @@ class Convert static Vector postSQLCommands = new Vector(); - static final String versionID = new String("FM2SQL Version 0.9.9b\n"); + static final String versionID = new String("FM2SQL Version 0.9.10b\n"); private static boolean noError = false; @@ -838,41 +838,39 @@ class Convert throws Exception, SQLException { Vector row; - while ((row = bean.getNextRow()) != null) - { - j++; - Object obj = null; - for (int k = 0; k < row.size(); ++k) - { - obj = row.get(k); - - if (obj instanceof ArrayList) - obj = formatFileMakerArray((List) obj, delimiter); - - String str = (obj == null) ? "NULL" : obj.toString(); - 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); - } - pstm.execute(); - if (isGUI) - dialog.progress.setValue((int) (((double) (j + 1) / (double) rowCount) * 100.0)); - command = null; - } // to while loop + while ((row = bean.getNextRow()) != null) { + j++; + Object obj = null; + for (int k = 0; k < row.size(); ++k) { + obj = row.get(k); + + if (obj instanceof ArrayList) + obj = formatFileMakerArray((List) obj, delimiter); + + String str = (obj == null) ? "NULL" : obj.toString(); + 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); + } + pstm.execute(); + if (isGUI) + dialog.progress + .setValue((int) (((double) (j + 1) / (double) rowCount) * 100.0)); + command = null; + } // to while loop return command; } /** - * removes special characters from the input string as well as .fp5 - * - * @param newName - * String to change - * @return - */ + * removes special characters from the input string as well as .fp5 + * + * @param newName + * String to change + * @return + */ public static String convertText(String newName) { StringBuffer alterMe = new StringBuffer(newName.trim().toLowerCase());