June 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2448 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 12:39:09 +0000 (Tue, 30 Jun 2009) New Revision: 2448 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Convert file to unicode before compilation and zip creation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-06-30 12:14:52 UTC (rev 2447) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-06-30 12:39:09 UTC (rev 2448) @@ -952,6 +952,9 @@ SimulatorStorage.SIMULATOR_PATH + File.separator + param.getSimulatorName())); + // convert all file to UTF-8 + convertAllFile(control, tmpDirectory); + if (compile) { compileAllFile(control, tmpDirectory); } @@ -989,6 +992,44 @@ } /** + * Convertit tous les fichiers du répertoire directory en UTF-8, + * pour eviter les erreurs d'encodage du la compilation + * sur un autre systeme ne supportant pas l'encodage courant. + * + * @param control le controleur + * @param directory le répertoire a convertir + */ + protected void convertAllFile(SimulationControl control, File directory) { + + control.setText("Converting file to unicode"); + + List<File> fileToConvert = new ArrayList<File>(); + + List<File> tmp = FileUtil.find(new File(directory, + ExportStorage.EXPORT_PATH), ".*\\.java$", true); + fileToConvert.addAll(tmp); + + tmp = FileUtil.find(new File(directory, RuleStorage.RULE_PATH), + ".*\\.java$", true); + fileToConvert.addAll(tmp); + + tmp = FileUtil.find(new File(directory, + AnalysePlanStorage.ANALYSE_PLAN_PATH), ".*\\.java$", true); + fileToConvert.addAll(tmp); + + tmp = FileUtil.find( + new File(directory, SimulatorStorage.SIMULATOR_PATH), + ".*\\.java$", true); + fileToConvert.addAll(tmp); + + // + // Convertion + // + CompileHelper.convertToUnicode(fileToConvert); + + } + + /** * Compile les fichiers présent dans le répertoire passé en * parametre, ce répertoire est hiérarchisé en: rules, exports, simulators * et scripts. Seuls les fichiers des 3 premiers répertoires sont compilés

1 0

r2447 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 12:14:52 +0000 (Tue, 30 Jun 2009) New Revision: 2447 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Log: Generate equation file to utf-8 encoding Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2009-06-30 10:39:17 UTC (rev 2446) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2009-06-30 12:14:52 UTC (rev 2447) @@ -151,7 +151,9 @@ String content = generateContent(packageName, className, interfaceMethod, script); try { - FileUtil.writeString(fileSrc, content); + // force writing to UTF-8 + // fix compilation issue : unmappable characters + FileUtil.writeString(fileSrc, content, "utf-8"); } catch (IOException zzz) { throw new IsisFishRuntimeException(_("isisfish.error.save.script.compilation", fileSrc), zzz); } @@ -187,7 +189,7 @@ return result; } - protected static String generateContent (String packageName, String className, Method interfaceMethod, String script) { + protected static String generateContent(String packageName, String className, Method interfaceMethod, String script) { String content = ""; if (packageName != null && !"".equals(packageName)) { content += "package " + packageName + ";";

1 0

r2446 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/util src/test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 10:39:17 +0000 (Tue, 30 Jun 2009) New Revision: 2446 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Log: Add codepage converter (code and tests) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-06-30 08:29:44 UTC (rev 2445) +++ isis-fish/trunk/pom.xml 2009-06-30 10:39:17 UTC (rev 2446) @@ -318,6 +318,13 @@ </dependency> <dependency> + <groupId>net.sourceforge.cpdetector</groupId> + <artifactId>cpdetector</artifactId> + <version>1.0.7</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>com.sun</groupId> <artifactId>tools</artifactId> <version>1.6.0</version> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2009-06-30 08:29:44 UTC (rev 2445) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2009-06-30 10:39:17 UTC (rev 2446) @@ -348,6 +348,7 @@ * Cree un zip. Le zip contient les memes fichiers lorsqu'on utilise le CVS. * * @param file le fichier dans lequel l'export doit se faire + * @param createMD5 if <tt>true</tt> create zip md5 * @return l'argument file * @throws IOException si problème lors de la création du zip */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-06-30 08:29:44 UTC (rev 2445) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-06-30 10:39:17 UTC (rev 2446) @@ -20,12 +20,27 @@ package fr.ifremer.isisfish.util; import static org.codelutin.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; @@ -36,6 +51,7 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,6 +81,9 @@ /** Logger for this class. */ private static final Log log = LogFactory.getLog(CompileHelper.class); + /** CP detector proxy. */ + protected static CodepageDetectorProxy detector; + /** * Recherche tous les fichiers qui un source plus recent que la version compilé. * @@ -197,7 +216,7 @@ protected static int compile(List<File> classpath, Collection<File> src, File dest, PrintWriter out) { dest.mkdirs(); - + int result = -1000; try { JavaCompiler compiler = JavacTool.create(); @@ -243,7 +262,9 @@ * <li>System.getProperty("java.class.path") * <li>All first jar dependency (META-INF/MANIFEST.MF) * </ul> - * @return classptah as string + * @param classpath initial classpath + * @return classpath as string + * @throws Exception */ public static String getClassPathAsString(List<File> classpath) throws Exception { @@ -351,4 +372,97 @@ String result = "<a href='" + ref + "'>" + text + "</a>"; return result; } + + protected static CodepageDetectorProxy getCodepageDetector() { + + if (detector == null) { + detector = CodepageDetectorProxy.getInstance(); // A singleton. + + // Add the implementations of info.monitorenter.cpdetector.io.ICodepageDetector: + // This one is quick if we deal with unicode codepages: + detector.add(new ByteOrderMarkDetector()); + // The first instance delegated to tries to detect the meta charset attribut in html pages. + detector.add(new ParsingDetector(true)); // be verbose about parsing. + // This one does the tricks of exclusion and frequency detection, if first implementation is + // unsuccessful: + detector.add(JChardetFacade.getInstance()); // Another singleton. + 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(); + + for (File file : files) { + try { + Charset charset = myDetector.detectCodepage(file.toURI().toURL()); + + if (log.isDebugEnabled()) { + log.debug("Charset for " + file.getAbsolutePath() + " is " + charset); + } + + if (charset != null && !charset.name().equalsIgnoreCase("utf-8")) { + + if (log.isDebugEnabled()) { + log.debug("Convert " + file.getAbsolutePath() + " to unicode"); + } + + File tmpFile = File.createTempFile(file.getName(), ".copy"); + tmpFile.deleteOnExit(); + + // direct copy + InputStream is = new FileInputStream(file); + OutputStream os = new FileOutputStream(tmpFile); + try { + IOUtils.copy(is, os); + } + finally { + is.close(); + os.close(); + } + + // copy using cp transaltion + is = new FileInputStream(tmpFile); + os = new FileOutputStream(file); + Reader ir = new InputStreamReader(is, charset); + Writer ow = new OutputStreamWriter(new FileOutputStream(file), "utf-8"); + try { + IOUtils.copy(ir, ow); + } + finally { + ir.close(); + ow.close(); + is.close(); + os.close(); + } + + } + else { + if (log.isDebugEnabled()) { + log.debug("File " + file.getAbsolutePath() + " already in unicode : skip"); + } + } + } catch (MalformedURLException e) { + if (log.isErrorEnabled()) { + log.error("Can't convert file in unicode", e); + } + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't convert file in unicode", e); + } + } + + } + + return files; + } } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-06-30 08:29:44 UTC (rev 2445) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-06-30 10:39:17 UTC (rev 2446) @@ -25,12 +25,16 @@ import java.util.Collections; import java.util.List; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; import org.junit.Assert; import org.junit.Test; +import com.sun.source.tree.AssertTree; + import fr.ifremer.isisfish.AbstractIsisFishTest; /** @@ -172,4 +176,61 @@ fB.delete(); 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"); + + // add un accent + content = content.replace("code", "cod\u00E9"); + + File nonUnicodeFile = File.createTempFile("ConvertToUnicode", ".java", getTestDirectory()); + FileUtil.writeString(nonUnicodeFile, content, "ISO-8859-15"); + + if (log.isDebugEnabled()) { + log.debug("Saved file " + nonUnicodeFile.getAbsolutePath() + " as ISO-8859-15"); + } + + CompileHelper.convertToUnicode(Collections.singletonList(nonUnicodeFile)); + + // don't support encoding String newContent = FileUtil.readAsString(nonUnicodeFile); + String newContent = FileUtils.readFileToString(nonUnicodeFile, "UTF-8"); + 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"); + + // add un accent + content = content.replace("code", "cod\u00E9"); + + File nonUnicodeFile = File.createTempFile("UselessConvertToUnicode", ".java", getTestDirectory()); + FileUtil.writeString(nonUnicodeFile, content, "UTF-8"); + + if (log.isDebugEnabled()) { + log.debug("Saved file " + nonUnicodeFile.getAbsolutePath() + " as UTF-8"); + } + + CompileHelper.convertToUnicode(Collections.singletonList(nonUnicodeFile)); + + // don't support encoding String newContent = FileUtil.readAsString(nonUnicodeFile); + String newContent = FileUtils.readFileToString(nonUnicodeFile, "UTF-8"); + Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); + + nonUnicodeFile.delete(); + } }

1 0

r2445 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 08:29:44 +0000 (Tue, 30 Jun 2009) New Revision: 2445 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Ajout d'un synchronized sur this (pour pas que le hasNext() soit fait par 2 jobs ?\195?\160 la fois) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-06-30 08:22:36 UTC (rev 2444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-06-30 08:29:44 UTC (rev 2445) @@ -733,64 +733,70 @@ // and if last doNext is false not do next simulation boolean result = !control.isStopSimulationRequest() && doNext; if (result) { - // si deja creer on ne le refet pas - if (nextJob == null) { - // Prepration de la simulation a faire - // create next id simulation - - // this start a 0 - int planNumber = planContext.getNumber(); - - if (planNumber > MAX_PLAN_SIMULATION) { - log.error(_("Analyse plan error, too many simulation for %s : %s", - id, planNumber)); - doNext = false; - result = false; - } else { - String simId = id + "_" + planNumber; - param.setAnalysePlanNumber(planNumber); - - File tmpDirectory = FileUtil.createTempDirectory( - "isisfish-simulation-", "-preparation"); - SimulationStorage sim = SimulationStorage - .importAndRenameZip(tmpDirectory, job - .getItem().getSimulationZip(), + + // hasNext() est appelee par un autre thread concurrent + // via la methode finished(SimulationJob, SimulationStorage) + synchronized (this) { + + // si deja creer on ne le refet pas + if (nextJob == null) { + // Prepration de la simulation a faire + // create next id simulation + + // this start a 0 + int planNumber = planContext.getNumber(); + + if (planNumber > MAX_PLAN_SIMULATION) { + log.error(_("Analyse plan error, too many simulation for %s : %s", + id, planNumber)); + doNext = false; + result = false; + } else { + String simId = id + "_" + planNumber; + param.setAnalysePlanNumber(planNumber); + + File tmpDirectory = FileUtil.createTempDirectory( + "isisfish-simulation-", "-preparation"); + SimulationStorage sim = SimulationStorage + .importAndRenameZip(tmpDirectory, job + .getItem().getSimulationZip(), + simId); + sim.getParameter().setAnalysePlanNumber(planNumber); + + // appel de tous les plans pour modifier la simulation + for (AnalysePlan plan : param.getAnalysePlans()) { + result = result + && plan.beforeSimulation(planContext, + sim); + if (!result) { + nextJob = null; + break; + } + } + doNext = result; + if (result) { + File zip = sim.createZip(); + SimulationControl childControl = new SimulationControl( simId); - sim.getParameter().setAnalysePlanNumber(planNumber); - - // appel de tous les plans pour modifier la simulation - for (AnalysePlan plan : param.getAnalysePlans()) { - result = result - && plan.beforeSimulation(planContext, - sim); - if (!result) { - nextJob = null; - break; + SimulationParameter childParam = param.copy(); + SimulationItem item = new SimulationItem( + childControl, childParam); + item.setSimulationZip(zip); + nextJob = new SimulationJob(simulationService, + job, item, job.getPriority()); + nextJob.setLauncher(job.getLauncher()); + nextJob.addPostAction(this); // pour l'appel des after des plans } + // quoi qu'il arrive on supprime le repertoire temporaire + if (!FileUtil.deleteRecursively(tmpDirectory)) { + log.warn(_("isisfish.error.remove.directory", + tmpDirectory)); + } } - doNext = result; - if (result) { - File zip = sim.createZip(); - SimulationControl childControl = new SimulationControl( - simId); - SimulationParameter childParam = param.copy(); - SimulationItem item = new SimulationItem( - childControl, childParam); - item.setSimulationZip(zip); - nextJob = new SimulationJob(simulationService, - job, item, job.getPriority()); - nextJob.setLauncher(job.getLauncher()); - nextJob.addPostAction(this); // pour l'appel des after des plans - } - // quoi qu'il arrive on supprime le repertoire temporaire - if (!FileUtil.deleteRecursively(tmpDirectory)) { - log.warn(_("isisfish.error.remove.directory", - tmpDirectory)); - } + + // increment number for next simulation job + planContext.incNumber(); } - - // increment number for next simulation job - planContext.incNumber(); } } return result;

1 0

r2444 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 08:22:36 +0000 (Tue, 30 Jun 2009) New Revision: 2444 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Oubli du contenu dans le label Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-06-30 08:02:35 UTC (rev 2443) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-06-30 08:22:36 UTC (rev 2444) @@ -469,7 +469,7 @@ separator = "\n"; } - JLabel labelModifiedFiles = new JLabel(); + JLabel labelModifiedFiles = new JLabel(labelTitle); JTextArea areaModifiedFiles = new JTextArea(conflictFilesString); areaModifiedFiles.setEditable(false); areaModifiedFiles.setAutoscrolls(true);

1 0

r2443 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish resources/i18n
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 08:02:35 +0000 (Tue, 30 Jun 2009) New Revision: 2443 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Beau catch d'une java.lang.Error si on utilise des script li?\195?\169 a des choses inexistantes. Affichage d'un message, redemarrage d'Isis. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-06-29 16:54:24 UTC (rev 2442) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-06-30 08:02:35 UTC (rev 2443) @@ -44,6 +44,7 @@ import org.codelutin.math.matrix.DoubleBigVector; import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.topia.TopiaException; +import org.codelutin.util.FileUtil; import org.codelutin.util.LocaleConverter; import org.codelutin.util.VersionNumber; import org.codelutin.widget.SwingUtil; @@ -93,16 +94,6 @@ static final public String LAST_RELEASE_LAUNCH = "lastReleaseLaunched"; - /* - Il y a un bug dans LutinLog, a chaque log, il contruit - une Jframe et la consommation mémoire explose... - static { - System.setProperty("org.apache.commons.logging.LogFactory", - LutinLogFactory.class.getName() - ); - log = LogFactory.getLog(IsisFish.class); - }*/ - static public IsisConfig config = null; static public int step = 0; // action step static public VCS vcs = null; @@ -114,7 +105,8 @@ System.exit(0); } - static public void main(String... args) { + public static void main(String... args) { + try { // permet de faire fonctionner la compilation en webstart System.setSecurityManager(null); @@ -153,6 +145,17 @@ } catch (Exception e) { e.printStackTrace(); quit(); + } catch (LinkageError e) { + // a real java.lang.Error sometimes happen when + // using non recompiled script due to dependency changes + // this is the better solution found : + // remove isis build directory + FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); + // display message + JOptionPane.showMessageDialog(null, _("isisfish.error.linkageerror.message"), + _("isisfish.error.linkageerror.title"), JOptionPane.ERROR_MESSAGE); + // restart isis + quit(); } } Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-29 16:54:24 UTC (rev 2442) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-30 08:02:35 UTC (rev 2443) @@ -296,6 +296,8 @@ isisfish.error.invalid.values.params=Parametre controlable hors valeurs possibles isisfish.error.invalidate.natural.death=natural mortality invalid isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s +isisfish.error.linkageerror.message=Isis-Fish has detected a script use error.\nCompilation directory has been deleted to force recompilation.\n\nPlease, restart Isis-Fish. +isisfish.error.linkageerror.title=Init error isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s isisfish.error.load.file=could not load file %1$s Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-29 16:54:24 UTC (rev 2442) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-30 08:02:35 UTC (rev 2443) @@ -296,6 +296,8 @@ isisfish.error.invalid.values.params=Param\u00E8tre controlable hors valeurs possibles isisfish.error.invalidate.natural.death=mortalite naturelle invalide isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s +isisfish.error.linkageerror.message=Isis-Fish a d\u00E9tect\u00E9 une erreur d'utilisation des scripts.\nLe dossier de compilation a \u00E9t\u00E9 supprim\u00E9 pour forcer leur recompilation.\n\nMerci de relancer Isis-Fish. +isisfish.error.linkageerror.title=Erreur d'initialisation isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s isisfish.error.load.file=could not load file %1$s

1 0

r2442 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/script java/fr/ifremer/isisfish/util resources/i18n
by chatellier＠users.labs.libre-entreprise.org 29 Jun '09

29 Jun '09

Author: chatellier Date: 2009-06-29 16:54:24 +0000 (Mon, 29 Jun 2009) New Revision: 2442 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompilationResult.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Display deprecated messages when compiling (in UI too) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-06-29 16:53:08 UTC (rev 2441) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-06-29 16:54:24 UTC (rev 2442) @@ -58,6 +58,7 @@ import fr.ifremer.isisfish.equation.Language; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; +import fr.ifremer.isisfish.util.CompilationResult; import fr.ifremer.isisfish.vcs.VCSException; import freemarker.cache.TemplateLoader; import freemarker.template.Configuration; @@ -325,8 +326,7 @@ out.flush(); script.setContent(out.toString()); } else { - throw new IsisFishRuntimeException( - "There is no templatePath"); + throw new IsisFishRuntimeException("There is no templatePath"); } code = script; @@ -538,8 +538,16 @@ } } - public String checkScript(String content) { - String resultLog = null; + /** + * Check script content. + * + * @param content + * @return compilation result and output + */ + public CompilationResult checkScript(String content) { + + CompilationResult compilationResult = new CompilationResult(); + try { if (log.isDebugEnabled()) { log.debug("checkScript called"); @@ -549,27 +557,29 @@ JavaSourceStorage javaCode = (JavaSourceStorage) code; StringWriter result = new StringWriter(); PrintWriter out = new PrintWriter(result); - int compileResult = 0; - Exception e = null; try { - compileResult = javaCode.compile(false, out); + int compileResult = javaCode.compile(false, out); + + if (compileResult == 0) { + compilationResult.setCompilationResult(CompilationResult.COMPILATION_OK); + } + else { + compilationResult.setCompilationResult(CompilationResult.COMPILATION_FAILED); + } } catch (Exception eee) { - compileResult = -1; - e = eee; + compilationResult.setCompilationResult(CompilationResult.COMPILATION_FAILED); + eee.printStackTrace(out); } - if (compileResult != 0) { - out.flush(); - resultLog = result.toString(); - if (e == null) { - e = new RuntimeException("there is some problem in script"); - } - } + + out.flush(); + compilationResult.setCompilationOutput(result.toString()); + } catch (IOException ex) { if (log.isErrorEnabled()) { log.error("Error on script check", ex); } } - return resultLog; + return compilationResult; } public String evaluateScript(String content) { @@ -577,12 +587,12 @@ if (log.isDebugEnabled()) { log.debug("evaluateScript called"); } - + String msg = ""; try { - String checkResult = checkScript(content); - if (checkResult != null) { - return checkResult; + CompilationResult compilationResult = checkScript(content); + if (compilationResult.getCompilationResult() == CompilationResult.COMPILATION_FAILED) { + return compilationResult.getCompilationOutput(); } code.setContent(content); JavaSourceStorage javaCode = (JavaSourceStorage) code; @@ -665,25 +675,16 @@ /** enum to encapsulate a script module */ protected enum ScriptMapping { - Script( - ScriptStorage.getScriptDirectory(), - ScriptStorage.SCRIPT_TEMPLATE), - Simulator( - SimulatorStorage.getSimulatorDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE), - Export( + Script(ScriptStorage.getScriptDirectory(), + ScriptStorage.SCRIPT_TEMPLATE), Simulator(SimulatorStorage + .getSimulatorDirectory(), SimulatorStorage.SIMULATOR_TEMPLATE), Export( ExportStorage.getExportDirectory(), - ExportStorage.EXPORT_TEMPLATE), - Rule( - RuleStorage.getRuleDirectory(), - RuleStorage.RULE_TEMPLATE), - AnalysePlan( + ExportStorage.EXPORT_TEMPLATE), Rule(RuleStorage + .getRuleDirectory(), RuleStorage.RULE_TEMPLATE), AnalysePlan( AnalysePlanStorage.getAnalysePlanDirectory(), - AnalysePlanStorage.ANALYSE_PLAN_TEMPLATE), - Sensitivity( + AnalysePlanStorage.ANALYSE_PLAN_TEMPLATE), Sensitivity( SensitivityStorage.getSensitivityDirectory(), - SensitivityStorage.SENSIVITY_TEMPLATE), - EquationModel( + SensitivityStorage.SENSIVITY_TEMPLATE), EquationModel( FormuleStorage.getFormuleDirectory(), FormuleStorage.FORMULE_TEMPLATE); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-06-29 16:53:08 UTC (rev 2441) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-06-29 16:54:24 UTC (rev 2442) @@ -28,6 +28,7 @@ import javax.swing.tree.TreeNode; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.IsisFishRuntimeException; + import fr.ifremer.isisfish.util.CompilationResult; setContextValue(new ScriptAction()); setButton(); @@ -68,6 +69,7 @@ editor.validate(); } actionLogArea.setText(""); + actionLogArea.setBackground(null); } setButton(); } @@ -222,12 +224,25 @@ protected void paste(){ } protected void checkScript(){ - String txt = getContextValue(ScriptAction.class).checkScript(editor.getText()); - actionLogArea.setText(txt == null ? "ok" : txt); + CompilationResult compilationResult = getContextValue(ScriptAction.class).checkScript(editor.getText()); + + // TODO display an ok status ? + if (compilationResult.getCompilationResult() == CompilationResult.COMPILATION_OK) { + actionLogArea.setText(_("isisfish.script.compilation.ok", compilationResult.getCompilationOutput())); + // vert leger + actionLogArea.setBackground(new Color(210, 255, 210)); + } + else { + actionLogArea.setText(_("isisfish.script.compilation.failed", compilationResult.getCompilationOutput())); + // rouge leger + actionLogArea.setBackground(new Color(255, 210, 210)); + } + setInfoText(_("isisfish.message.check.finished")); } protected void evaluateScript(){ actionLogArea.setText(getContextValue(ScriptAction.class).evaluateScript(editor.getText())); + actionLogArea.setBackground(null); setInfoText(_("isisfish.message.evaluation.finished")); } protected void importScript(){ @@ -311,7 +326,7 @@ <JSplitPane oneTouchExpandable="true" resizeWeight="0.75" orientation="VERTICAL"> <org.codelutin.widget.editor.Editor id='editor'/> <JScrollPane> - <JTextArea id="actionLogArea" editable="false"/> + <JTextArea id="actionLogArea" editable="false" font='{new Font("Monospaced",Font.PLAIN, 12)}' /> </JScrollPane> </JSplitPane> </JSplitPane> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompilationResult.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompilationResult.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompilationResult.java 2009-06-29 16:54:24 UTC (rev 2442) @@ -0,0 +1,105 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.util; + +/** + * Petite structure permettant de retourner a la fois + * un resultat de compilation et des messages d'erreur + * et/ou d'avertissement. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CompilationResult { + + /** Compilation success. */ + public static final int COMPILATION_OK = 0; + + /** Compilation failed. */ + public static final int COMPILATION_FAILED = 1; + + /** + * Résultat de la compilation. + * + * Values are {@link #COMPILATION_OK}, {@link #COMPILATION_FAILED}. + */ + protected int compilationResult; + + /** Compilation output. */ + protected String compilationOutput; + + /** + * Default constructor. + */ + public CompilationResult() { + this(COMPILATION_OK, null); + } + + /** + * Constructor with output and result. + * + * @param compilationResult result + * @param compilationOutput output + */ + public CompilationResult(int compilationResult, String compilationOutput) { + this.compilationResult = 0; + this.compilationOutput = compilationOutput; + } + + /** + * Get compilation result. + * + * Return {@link #COMPILATION_OK} or {@link #COMPILATION_FAILED}. + * + * @return the compilationResult + */ + public int getCompilationResult() { + return compilationResult; + } + + /** + * Set compilation result. + * + * @param compilationResult the compilationResult to set + */ + public void setCompilationResult(int compilationResult) { + this.compilationResult = compilationResult; + } + + /** + * Return compilation output. + * + * @return the compilationOutput + */ + public String getCompilationOutput() { + return compilationOutput; + } + + /** + * Set compilation output. + * + * @param compilationOutput the compilationOutput to set + */ + public void setCompilationOutput(String compilationOutput) { + this.compilationOutput = compilationOutput; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompilationResult.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-06-29 16:53:08 UTC (rev 2441) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-06-29 16:54:24 UTC (rev 2442) @@ -212,6 +212,8 @@ String classpathAsString = getClassPathAsString(classpath); List<String> args = new ArrayList<String>(); args.add("-g"); + // Show a description of each use or override of a deprecated member or class. + args.add("-deprecation"); args.add("-classpath"); args.add(classpathAsString); args.add("-d"); Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-29 16:53:08 UTC (rev 2441) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-29 16:54:24 UTC (rev 2442) @@ -845,6 +845,8 @@ isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=Check isisfish.script.commit=Commit +isisfish.script.compilation.failed=%s +isisfish.script.compilation.ok=Compilation complete.\n---------------------\n\n%s isisfish.script.copy=Copy isisfish.script.cut=Cut isisfish.script.evaluate=Evaluate Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-29 16:53:08 UTC (rev 2441) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-29 16:54:24 UTC (rev 2442) @@ -845,6 +845,8 @@ isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=V\u00E9rifier isisfish.script.commit=Commit +isisfish.script.compilation.failed=%s +isisfish.script.compilation.ok=Compilation r\u00E9ussie.\n--------------------\n\n%s isisfish.script.copy=Copier isisfish.script.cut=Couper isisfish.script.evaluate=\u00C9valuer

1 0

r2441 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore ui/simulator
by chatellier＠users.labs.libre-entreprise.org 29 Jun '09

29 Jun '09

Author: chatellier Date: 2009-06-29 16:53:08 +0000 (Mon, 29 Jun 2009) New Revision: 2441 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Remove a depracted function in region storage Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-06-29 16:52:24 UTC (rev 2440) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-06-29 16:53:08 UTC (rev 2441) @@ -169,7 +169,7 @@ } } - /** + /* * Retourne le nom courant de la région. * * @return Le nom de la region @@ -177,7 +177,7 @@ * * @deprecated ne plus utiliser car le context n'est jamais ferme, plutot * utiliser {@link #getFisheryRegion(TopiaContext)} - */ + * public FisheryRegion getFisheryRegion() throws StorageException { try { TopiaContext tx = getStorage().beginTransaction(); @@ -187,7 +187,7 @@ } catch (TopiaException eee) { throw new StorageException(_("isisfish.error.get.fisheryRegion"), eee); } - } + }*/ public File getMapRepository() { File result = new File(getDirectory(), MAP_DIRECTORY); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-06-29 16:52:24 UTC (rev 2440) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-06-29 16:53:08 UTC (rev 2441) @@ -22,20 +22,19 @@ <Boolean id='sensitivity' javaBean='false'/> <script><![CDATA[ +import org.codelutin.topia.TopiaException; +import org.codelutin.topia.TopiaContext; +import java.text.ParseException; +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.datastore.StorageException; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Strategy; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.FisheryRegionImpl; import fr.ifremer.isisfish.ui.Common; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.WelcomeTabUI; import fr.ifremer.isisfish.ui.RegionMonitor; -import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.Population; -import java.text.ParseException; -import fr.ifremer.isisfish.simulator.launcher.SimulationService; -import fr.ifremer.isisfish.simulator.launcher.SimulationJob; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; -import fr.ifremer.isisfish.entities.FisheryRegionImpl; -import fr.ifremer.isisfish.datastore.StorageException; -import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; import fr.ifremer.isisfish.ui.models.rule.RuleComboModel; import fr.ifremer.isisfish.ui.models.rule.RuleComboRenderer; import fr.ifremer.isisfish.ui.models.rule.RuleListCellRenderer; @@ -43,7 +42,12 @@ import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; +import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; +import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import fr.ifremer.isisfish.simulator.launcher.SimulationJob; +import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; // instances variables déclaration SimulationServiceListener simulationListener; @@ -128,14 +132,21 @@ } } protected void setFactorRegion() { - if (isSensitivity()){ + if (isSensitivity()) { try { - getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) simulAction.getSimulationParameter().getRegion().getFisheryRegion()); + // FIXME this transation in nerver closed + TopiaContext tx = simulAction.getRegionStorage().getStorage().beginTransaction(); + FisheryRegion fisheryRegion = RegionStorage.getFisheryRegion(tx); + getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) fisheryRegion); getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel(); } catch (StorageException ex) { if (log.isErrorEnabled()) { - log.debug("Cant reload factors", ex); + log.error("Can't reload factors", ex); } + } catch (TopiaException ex) { + if (log.isErrorEnabled()) { + log.error("Can't reload factors", ex); + } } } }

1 0

r2440 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 29 Jun '09

29 Jun '09

Author: chatellier Date: 2009-06-29 16:52:24 +0000 (Mon, 29 Jun 2009) New Revision: 2440 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java Log: H2 config for lob is not correct Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-06-26 13:33:17 UTC (rev 2439) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-06-29 16:52:24 UTC (rev 2440) @@ -39,11 +39,11 @@ */ public class IsisH2Config { - static { + /*static { // http://www.h2database.com/javadoc/org/h2/constant/SysProperties.html#h2.lob… // Force lob storage in database instead of filesystem System.setProperty("h2.lobFilesInDirectories", "false"); - } + }*/ protected static final String COMMON_URL = // on peut aussi utiliser mysql ou postgresql

1 0

r2439 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 26 Jun '09

26 Jun '09

Author: chatellier Date: 2009-06-26 13:33:17 +0000 (Fri, 26 Jun 2009) New Revision: 2439 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java Log: This fixme seams to not happen anymore Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2009-06-25 16:00:02 UTC (rev 2438) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2009-06-26 13:33:17 UTC (rev 2439) @@ -195,11 +195,6 @@ */ public Object getValueAt(int rowIndex, int columnIndex) { - // FIXME ArrayIndexOutOfBoundException here - if (rowIndex >= jobs.size()) { - return null; - } - SimulationJob job = jobs.get(rowIndex); SimulationControl control = job.getItem().getControl(); String id = control.getId();

1 0