--- FM2SQL/Attic/FM2SQL.java 2004/06/21 11:31:34 1.38 +++ FM2SQL/Attic/FM2SQL.java 2004/06/22 10:33:53 1.39 @@ -87,7 +87,7 @@ public class FM2SQL extends JFrame imple private JCheckBoxMenuItem appendItem; private JCheckBoxMenuItem updateItem; private JCheckBoxMenuItem deleteItem; - + private JCheckBoxMenuItem useNormanToUnicodeMapper; int mode = -1; final static int STATUS_INDEX = 0; final static int NAME_INDEX = 1; @@ -654,7 +654,10 @@ public class FM2SQL extends JFrame imple convert.setToolTipText("Deletes data that has been deleted in source"); mode = Convert.DataBase.DELETE_MODE; } - +if(command.equals("use NormanToUnicodeMapper")) +{ + if(bean!=null) bean.setUseNormanToUnicodeMapper(useNormanToUnicodeMapper.isSelected()); +} //writing config if (command.equals("save XML Config")) { @@ -950,6 +953,7 @@ public class FM2SQL extends JFrame imple 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); source.delimiter =delimiter; + source.useNormanToUnicodeMapper=useNormanToUnicodeMapper.isSelected(); try { Convert.writeConfig(file,source,destination); @@ -1006,6 +1010,7 @@ public class FM2SQL extends JFrame imple database.bean.getConnection(); bean = database.bean; + if(bean.isUseNormanToUnicodeMapper()) useNormanToUnicodeMapper.setSelected(true); Object obj =bean.url; ((DefaultComboBoxModel) sourceURLBox.getModel()).removeElement(obj); ((DefaultComboBoxModel) sourceURLBox.getModel()).insertElementAt(obj,0); @@ -1397,6 +1402,10 @@ public class FM2SQL extends JFrame imple bgrp.add(deleteItem); menu.add(deleteItem); + useNormanToUnicodeMapper = new JCheckBoxMenuItem("use NormanToUnicodeMapper"); + useNormanToUnicodeMapper.setToolTipText("maps characters in norman encoding to unicode characters"); + useNormanToUnicodeMapper.addActionListener(fm); + menu.add(useNormanToUnicodeMapper); menubar.add(menu); item = new JMenuItem("show Driver features"); @@ -1753,6 +1762,7 @@ public class FM2SQL extends JFrame imple public void fillTable() { noDBUpdate = true; + bean.setUseNormanToUnicodeMapper(useNormanToUnicodeMapper.isSelected()); Vector tableNames = bean.getTableNames(); Collections.sort(tableNames, String.CASE_INSENSITIVE_ORDER); Vector[] data = new Vector[2];