From: Olivier G. <og...@us...> - 2008-04-03 22:22:55
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/export In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6408/src/osmose/application/export Modified Files: OSMExportHTML.java Log Message: Conversion to UTF8 encoding Index: OSMExportHTML.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/export/OSMExportHTML.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** OSMExportHTML.java 17 Feb 2008 22:11:51 -0000 1.7 --- OSMExportHTML.java 3 Apr 2008 22:22:59 -0000 1.8 *************** *** 39,43 **** * <p>Description : Generate the export to HTML file of the presentation</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Sociéte : Quadrille Ingenierie</p> * @author non attribuable * @version 1.0 --- 39,43 ---- * <p>Description : Generate the export to HTML file of the presentation</p> * <p>Copyright : Copyright (c) 2003</p> ! * <p>Sociéte : Quadrille Ingenierie</p> * @author non attribuable * @version 1.0 *************** *** 1266,1270 **** /** ! * it transforms specific caracters (for instance : é to é) * to be properly display in a html browser * @param str the string to be converted --- 1266,1270 ---- /** ! * it transforms specific caracters (for instance : é to é) * to be properly display in a html browser * @param str the string to be converted *************** *** 1360,1427 **** // conversation table for HTML m_ConversionTableHTML = new Hashtable(); ! m_ConversionTableHTML.put(new String("Æ"), new String("Æ")); ! m_ConversionTableHTML.put(new String("Á"), new String("Á")); ! m_ConversionTableHTML.put(new String("Â"), new String("Â")); ! m_ConversionTableHTML.put(new String("À"), new String("À")); ! m_ConversionTableHTML.put(new String("Å"), new String("Å")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ã")); ! m_ConversionTableHTML.put(new String("Ä"), new String("Ä")); ! m_ConversionTableHTML.put(new String("Ç"), new String("Ç")); ! m_ConversionTableHTML.put(new String("Ð"), new String("Ð")); ! m_ConversionTableHTML.put(new String("É"), new String("É")); ! m_ConversionTableHTML.put(new String("Ê"), new String("Ê")); ! m_ConversionTableHTML.put(new String("È"), new String("È")); ! m_ConversionTableHTML.put(new String("Ë"), new String("Ë")); ! m_ConversionTableHTML.put(new String("Í"), new String("Í")); ! m_ConversionTableHTML.put(new String("Î"), new String("Î")); ! m_ConversionTableHTML.put(new String("Ì"), new String("Ì")); ! m_ConversionTableHTML.put(new String("Ï"), new String("Ï")); ! m_ConversionTableHTML.put(new String("Ñ"), new String("Ñ")); ! m_ConversionTableHTML.put(new String("Ó"), new String("Ó")); ! m_ConversionTableHTML.put(new String("Ô"), new String("Ô")); ! m_ConversionTableHTML.put(new String("Ò"), new String("Ò")); ! m_ConversionTableHTML.put(new String("Ø"), new String("Ø")); ! m_ConversionTableHTML.put(new String("Õ"), new String("Õ")); ! m_ConversionTableHTML.put(new String("Ö"), new String("Ö")); ! m_ConversionTableHTML.put(new String("Þ"), new String("Þ")); ! m_ConversionTableHTML.put(new String("Ú"), new String("Ú")); ! m_ConversionTableHTML.put(new String("Û"), new String("Û")); ! m_ConversionTableHTML.put(new String("Ù"), new String("Ù")); ! m_ConversionTableHTML.put(new String("Ü"), new String("Ü")); ! m_ConversionTableHTML.put(new String("Ý"), new String("Ý")); ! m_ConversionTableHTML.put(new String("á"), new String("á")); ! m_ConversionTableHTML.put(new String("â"), new String("â")); ! m_ConversionTableHTML.put(new String("æ"), new String("æ")); ! m_ConversionTableHTML.put(new String("à"), new String("à")); ! m_ConversionTableHTML.put(new String("å"), new String("å")); ! m_ConversionTableHTML.put(new String("ã"), new String("ã")); ! m_ConversionTableHTML.put(new String("ä"), new String("ä")); ! m_ConversionTableHTML.put(new String("ç"), new String("ç")); ! m_ConversionTableHTML.put(new String("é"), new String("é")); ! m_ConversionTableHTML.put(new String("ê"), new String("ê")); ! m_ConversionTableHTML.put(new String("è"), new String("è")); ! m_ConversionTableHTML.put(new String("ð"), new String("ð")); ! m_ConversionTableHTML.put(new String("ë"), new String("ë")); ! m_ConversionTableHTML.put(new String("í"), new String("í")); ! m_ConversionTableHTML.put(new String("î"), new String("î")); ! m_ConversionTableHTML.put(new String("ì"), new String("ì")); ! m_ConversionTableHTML.put(new String("ï"), new String("ï")); ! m_ConversionTableHTML.put(new String("ñ"), new String("ñ")); ! m_ConversionTableHTML.put(new String("ó"), new String("ó")); ! m_ConversionTableHTML.put(new String("ô"), new String("ô")); ! m_ConversionTableHTML.put(new String("ò"), new String("ò")); ! m_ConversionTableHTML.put(new String("ø"), new String("ø")); ! m_ConversionTableHTML.put(new String("õ"), new String("õ")); ! m_ConversionTableHTML.put(new String("ö"), new String("ö")); ! m_ConversionTableHTML.put(new String("ß"), new String("ß")); ! m_ConversionTableHTML.put(new String("þ"), new String("þ")); ! m_ConversionTableHTML.put(new String("ú"), new String("ú")); ! m_ConversionTableHTML.put(new String("û"), new String("û")); ! m_ConversionTableHTML.put(new String("ù"), new String("ù")); ! m_ConversionTableHTML.put(new String("ü"), new String("ü")); ! m_ConversionTableHTML.put(new String("ý"), new String("ý")); ! m_ConversionTableHTML.put(new String("ÿ"), new String("ÿ")); m_ConversionTableHTML.put(new String("\n"), new String("<BR>")); ! m_ConversionTableHTML.put(new String(""), new String("€")); m_ConversionTableHTML.put(new String("<"), new String("<")); m_ConversionTableHTML.put(new String(">"), new String(">")); --- 1360,1427 ---- // conversation table for HTML m_ConversionTableHTML = new Hashtable(); ! m_ConversionTableHTML.put(new String("Ã"), new String("Æ")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Á")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Â")); ! m_ConversionTableHTML.put(new String("Ã"), new String("À")); ! m_ConversionTableHTML.put(new String("à "), new String("Å")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ã")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ä")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ç")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ð")); ! m_ConversionTableHTML.put(new String("Ã"), new String("É")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ê")); ! m_ConversionTableHTML.put(new String("Ã"), new String("È")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ë")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Í")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Î")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ì")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ï")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ñ")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ó")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ô")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ò")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ø")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Õ")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ö")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Þ")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ú")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Û")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ù")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ü")); ! m_ConversionTableHTML.put(new String("Ã"), new String("Ý")); ! m_ConversionTableHTML.put(new String("á"), new String("á")); ! m_ConversionTableHTML.put(new String("â"), new String("â")); ! m_ConversionTableHTML.put(new String("æ"), new String("æ")); ! m_ConversionTableHTML.put(new String("à "), new String("à")); ! m_ConversionTableHTML.put(new String("Ã¥"), new String("å")); ! m_ConversionTableHTML.put(new String("ã"), new String("ã")); ! m_ConversionTableHTML.put(new String("ä"), new String("ä")); ! m_ConversionTableHTML.put(new String("ç"), new String("ç")); ! m_ConversionTableHTML.put(new String("é"), new String("é")); ! m_ConversionTableHTML.put(new String("ê"), new String("ê")); ! m_ConversionTableHTML.put(new String("è"), new String("è")); ! m_ConversionTableHTML.put(new String("ð"), new String("ð")); ! m_ConversionTableHTML.put(new String("ë"), new String("ë")); ! m_ConversionTableHTML.put(new String("Ã"), new String("í")); ! m_ConversionTableHTML.put(new String("î"), new String("î")); ! m_ConversionTableHTML.put(new String("ì"), new String("ì")); ! m_ConversionTableHTML.put(new String("ï"), new String("ï")); ! m_ConversionTableHTML.put(new String("ñ"), new String("ñ")); ! m_ConversionTableHTML.put(new String("ó"), new String("ó")); ! m_ConversionTableHTML.put(new String("ô"), new String("ô")); ! m_ConversionTableHTML.put(new String("ò"), new String("ò")); ! m_ConversionTableHTML.put(new String("ø"), new String("ø")); ! m_ConversionTableHTML.put(new String("õ"), new String("õ")); ! m_ConversionTableHTML.put(new String("ö"), new String("ö")); ! m_ConversionTableHTML.put(new String("Ã"), new String("ß")); ! m_ConversionTableHTML.put(new String("þ"), new String("þ")); ! m_ConversionTableHTML.put(new String("ú"), new String("ú")); ! m_ConversionTableHTML.put(new String("û"), new String("û")); ! m_ConversionTableHTML.put(new String("ù"), new String("ù")); ! m_ConversionTableHTML.put(new String("ü"), new String("ü")); ! m_ConversionTableHTML.put(new String("ý"), new String("ý")); ! m_ConversionTableHTML.put(new String("ÿ"), new String("ÿ")); m_ConversionTableHTML.put(new String("\n"), new String("<BR>")); ! m_ConversionTableHTML.put(new String("Â"), new String("€")); m_ConversionTableHTML.put(new String("<"), new String("<")); m_ConversionTableHTML.put(new String(">"), new String(">")); *************** *** 1431,1458 **** // conversion table for path (directory without accent) m_ConversionTablePath = new Hashtable(); ! m_ConversionTablePath.put(new String("á"), new String("a")); ! m_ConversionTablePath.put(new String("â"), new String("a")); ! m_ConversionTablePath.put(new String("à"), new String("a")); ! m_ConversionTablePath.put(new String("å"), new String("a")); ! m_ConversionTablePath.put(new String("ã"), new String("a")); ! m_ConversionTablePath.put(new String("ä"), new String("a")); ! m_ConversionTablePath.put(new String("ç"), new String("c")); ! m_ConversionTablePath.put(new String("é"), new String("e")); ! m_ConversionTablePath.put(new String("ê"), new String("e")); ! m_ConversionTablePath.put(new String("è"), new String("e")); ! m_ConversionTablePath.put(new String("ë"), new String("e")); ! m_ConversionTablePath.put(new String("í"), new String("i")); ! m_ConversionTablePath.put(new String("î"), new String("i")); ! m_ConversionTablePath.put(new String("ì"), new String("i")); ! m_ConversionTablePath.put(new String("ï"), new String("i")); ! m_ConversionTablePath.put(new String("ó"), new String("o")); ! m_ConversionTablePath.put(new String("ô"), new String("o")); ! m_ConversionTablePath.put(new String("ò"), new String("o")); ! m_ConversionTablePath.put(new String("õ"), new String("o")); ! m_ConversionTablePath.put(new String("ö"), new String("o")); ! m_ConversionTablePath.put(new String("ú"), new String("u")); ! m_ConversionTablePath.put(new String("û"), new String("u")); ! m_ConversionTablePath.put(new String("ù"), new String("u")); ! m_ConversionTablePath.put(new String("ü"), new String("u")); } --- 1431,1458 ---- // conversion table for path (directory without accent) m_ConversionTablePath = new Hashtable(); ! m_ConversionTablePath.put(new String("á"), new String("a")); ! m_ConversionTablePath.put(new String("â"), new String("a")); ! m_ConversionTablePath.put(new String("à "), new String("a")); ! m_ConversionTablePath.put(new String("Ã¥"), new String("a")); ! m_ConversionTablePath.put(new String("ã"), new String("a")); ! m_ConversionTablePath.put(new String("ä"), new String("a")); ! m_ConversionTablePath.put(new String("ç"), new String("c")); ! m_ConversionTablePath.put(new String("é"), new String("e")); ! m_ConversionTablePath.put(new String("ê"), new String("e")); ! m_ConversionTablePath.put(new String("è"), new String("e")); ! m_ConversionTablePath.put(new String("ë"), new String("e")); ! m_ConversionTablePath.put(new String("Ã"), new String("i")); ! m_ConversionTablePath.put(new String("î"), new String("i")); ! m_ConversionTablePath.put(new String("ì"), new String("i")); ! m_ConversionTablePath.put(new String("ï"), new String("i")); ! m_ConversionTablePath.put(new String("ó"), new String("o")); ! m_ConversionTablePath.put(new String("ô"), new String("o")); ! m_ConversionTablePath.put(new String("ò"), new String("o")); ! m_ConversionTablePath.put(new String("õ"), new String("o")); ! m_ConversionTablePath.put(new String("ö"), new String("o")); ! m_ConversionTablePath.put(new String("ú"), new String("u")); ! m_ConversionTablePath.put(new String("û"), new String("u")); ! m_ConversionTablePath.put(new String("ù"), new String("u")); ! m_ConversionTablePath.put(new String("ü"), new String("u")); } |