Author: chatellier Date: 2011-03-17 16:32:11 +0000 (Thu, 17 Mar 2011) New Revision: 3179 Log: Disable charset converter Modified: isis-fish/branches/3.3.1/changelog.txt isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Modified: isis-fish/branches/3.3.1/changelog.txt =================================================================== --- isis-fish/branches/3.3.1/changelog.txt 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/changelog.txt 2011-03-17 16:32:11 UTC (rev 3179) @@ -1,5 +1,6 @@ isis-fish (3.3.1.0-rc1) stable; urgency=low + * Disable charset converter (need to be retested) * Add a new button to check all script in one action in script UI * Improve UI to enable some fields/tabs only after region loading * Enable to put population effectives into factors Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:32:11 UTC (rev 3179) @@ -343,12 +343,12 @@ <scope>compile</scope> </dependency> - <dependency> + <!-- <dependency> <groupId>net.sourceforge.cpdetector</groupId> <artifactId>cpdetector</artifactId> <version>1.0.7</version> <scope>compile</scope> - </dependency> + </dependency> --> <dependency> <groupId>com.sun</groupId> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -1128,7 +1128,7 @@ // // Convertion // - CompileHelper.convertToUnicode(fileToConvert); + //CompileHelper.convertToUnicode(fileToConvert); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -26,27 +26,12 @@ package fr.ifremer.isisfish.util; import static org.nuiton.i18n.I18n._; -import info.monitorenter.cpdetector.io.ASCIIDetector; -import info.monitorenter.cpdetector.io.ByteOrderMarkDetector; -import info.monitorenter.cpdetector.io.CodepageDetectorProxy; -import info.monitorenter.cpdetector.io.JChardetFacade; -import info.monitorenter.cpdetector.io.ParsingDetector; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.Reader; -import java.io.Writer; import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URL; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -58,7 +43,6 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -89,7 +73,7 @@ private static final Log log = LogFactory.getLog(CompileHelper.class); /** CP detector proxy. */ - protected static CodepageDetectorProxy detector; + //protected static CodepageDetectorProxy detector; /** * Recherche tous les fichiers qui un source plus recent que la version compilé. @@ -386,7 +370,7 @@ return result; } - protected static CodepageDetectorProxy getCodepageDetector() { + /*protected static CodepageDetectorProxy getCodepageDetector() { if (detector == null) { detector = CodepageDetectorProxy.getInstance(); // A singleton. @@ -402,15 +386,14 @@ detector.add(ASCIIDetector.getInstance()); // Fallback, see javadoc. } return detector; - } - + }*/ - /** + /* * Convert all files to UTF-8. * * @param files fiels to convert * @return converted file list - */ + * public static List<File> convertToUnicode(List<File> files) { CodepageDetectorProxy myDetector = getCodepageDetector(); @@ -477,5 +460,5 @@ } return files; - } + }*/ } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -182,12 +182,12 @@ FileUtil.deleteRecursively(dest); } - /** + /* * Save a file as non utf-8 encoded. * Convert to uft-8. * Assert that file has been converted. * @throws IOException - */ + * @Test public void convertToUnicodeTest() throws IOException { String content = getFirstClassContent("ConvertToUnicode"); @@ -209,13 +209,13 @@ Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); nonUnicodeFile.delete(); - } + }*/ - /** + /* * Try to convert file already in UTF-8. * * @throws IOException - */ + * @Test public void convertToUnicodeUselessTest() throws IOException { String content = getFirstClassContent("UselessConvertToUnicode"); @@ -237,5 +237,5 @@ Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); nonUnicodeFile.delete(); - } + }*/ }