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

r2979 - in isis-fish/branches/3.3.1: . src/main/java/fr/ifremer/isisfish/ui/script src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Feb. 4, 2010

Feb. 4, 2010

Author: chatellier Date: 2010-02-04 15:11:31 +0000 (Thu, 04 Feb 2010) New Revision: 2979 Modified: isis-fish/branches/3.3.1/changelog.txt isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Add new menu to check all scripts Modified: isis-fish/branches/3.3.1/changelog.txt =================================================================== --- isis-fish/branches/3.3.1/changelog.txt 2010-02-04 14:31:25 UTC (rev 2978) +++ isis-fish/branches/3.3.1/changelog.txt 2010-02-04 15:11:31 UTC (rev 2979) @@ -1,5 +1,6 @@ isis-fish (3.3.1.0-rc1) stable; urgency=low + * 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 * Enable to put rules into factor Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-02-04 14:31:25 UTC (rev 2978) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-02-04 15:11:31 UTC (rev 2979) @@ -73,6 +73,7 @@ import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.ui.vcs.UpdateDialogUI; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; +import fr.ifremer.isisfish.util.CompileHelper; import fr.ifremer.isisfish.util.JavadocHelper; import fr.ifremer.isisfish.vcs.VCSException; import freemarker.cache.TemplateLoader; @@ -717,7 +718,54 @@ setStatusMessage(_("isisfish.message.check.finished")); return check; } + + /** + * Check all scripts. + */ + public void checkAllScripts() { + boolean allSuccess = true; + + // reste previous state + scriptUI.getActionLogArea().setBackground(null); + scriptUI.getActionLogArea().setText(""); + + for (ScriptMapping scriptMapping : ScriptMapping.values()) { + // normalement ne match pas les formules + // le cas est différent pour les formules + // le fichier java ne sont pas compilable sans la formule associée + List<File> javaFiles = FileUtil.find(scriptMapping.getModule(), ".+\\.java$", false); + for (File javaFile : javaFiles) { + scriptUI.getActionLogArea().append(_("isisfish.script.compilingfile", javaFile)); + + StringWriter result = new StringWriter(); + PrintWriter out = new PrintWriter(result); + int compileResult = CompileHelper.compile(IsisFish.config.getDatabaseDirectory(), javaFile, IsisFish.config.getCompileDirectory(), out); + out.flush(); + + if (compileResult == 0) { + scriptUI.getActionLogArea().append(_("isisfish.common.ok") + "\n"); + } + else { + scriptUI.getActionLogArea().append(_("isisfish.common.error") + ":\n"); + scriptUI.getActionLogArea().append(result.toString() + "\n"); + scriptUI.getActionLogArea().setBackground(COLOR_FAILURE); + allSuccess = false; + } + + // scroll down + scriptUI.getActionLogArea().setCaretPosition(scriptUI.getActionLogArea().getText().length()); + } + } + + // set final color + if (allSuccess) { + scriptUI.getActionLogArea().setBackground(COLOR_SUCCESS); + } + + setStatusMessage(_("isisfish.message.check.finished")); + } + /** * Call main method in current cod storage code. * Check script before call. @@ -1033,27 +1081,27 @@ /** enum to encapsulate a script module */ protected enum ScriptMapping { - Script( - ScriptStorage.getScriptDirectory(), - ScriptStorage.SCRIPT_TEMPLATE), - Simulator( - SimulatorStorage.getSimulatorDirectory(), - SimulatorStorage.SIMULATOR_TEMPLATE), + AnalysePlan( + AnalysePlanStorage.getAnalysePlanDirectory(), + AnalysePlanStorage.ANALYSE_PLAN_TEMPLATE), Export( ExportStorage.getExportDirectory(), ExportStorage.EXPORT_TEMPLATE), Rule( RuleStorage.getRuleDirectory(), RuleStorage.RULE_TEMPLATE), - AnalysePlan( - AnalysePlanStorage.getAnalysePlanDirectory(), - AnalysePlanStorage.ANALYSE_PLAN_TEMPLATE), + Script( + ScriptStorage.getScriptDirectory(), + ScriptStorage.SCRIPT_TEMPLATE), Sensitivity( SensitivityStorage.getSensitivityDirectory(), SensitivityStorage.SENSIVITY_TEMPLATE), SensitivityExport( SensitivityExportStorage.getSensitivityExportDirectory(), SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE), + Simulator( + SimulatorStorage.getSimulatorDirectory(), + SimulatorStorage.SIMULATOR_TEMPLATE), EquationModel( FormuleStorage.getFormuleDirectory(), FormuleStorage.FORMULE_TEMPLATE); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2010-02-04 14:31:25 UTC (rev 2978) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2010-02-04 15:11:31 UTC (rev 2979) @@ -66,6 +66,7 @@ </JMenu> <JMenu id="scriptTxtCode" text="isisfish.script.menu.code"> <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png" onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' /> + <JMenuItem id="miCheckAllSyntax" text="isisfish.script.menu.checkAllSyntax" icon="script_code_red.png" onActionPerformed="new SwingWorker<Void, Void>(){public Void doInBackground(){getScriptAction().checkAllScripts();return null;}}.execute()" /> <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script_gear.png" onActionPerformed="getScriptAction().evaluateScript()" enabled='{isJavaFileSelected()}' /> <JSeparator/> <JMenuItem id="miGenerateJavadoc" text="isisfish.script.menu.javadocgenerate" onActionPerformed="getScriptAction().generateScriptJavadoc()"/> Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-04 14:31:25 UTC (rev 2978) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-04 15:11:31 UTC (rev 2979) @@ -823,6 +823,7 @@ isisfish.script.commit.tooltip=Commit script to SVN server isisfish.script.compilation.failed=%s isisfish.script.compilation.ok=Compilation complete.\n---------------------\n\n%s +isisfish.script.compilingfile=Compiling %s... isisfish.script.copy=Copy isisfish.script.copy.tooltip=Copy current selection (Ctrl-c) isisfish.script.cut=Cut @@ -843,6 +844,7 @@ isisfish.script.import.labelOverwrite=Following files already exists. Confirm overridding. isisfish.script.import.tooltip.checkAll=(Un)Check all scripts isisfish.script.javadoc.ok=Javadoc generated-----------------\n\n%s +isisfish.script.menu.checkAllSyntax=Check all scripts isisfish.script.menu.checkSyntax=Check syntax isisfish.script.menu.code=Code isisfish.script.menu.commit=Commit script to server Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-04 14:31:25 UTC (rev 2978) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-04 15:11:31 UTC (rev 2979) @@ -823,6 +823,7 @@ isisfish.script.commit.tooltip=Committer le script sur le serveur SVN isisfish.script.compilation.failed=%s isisfish.script.compilation.ok=Compilation r\u00E9ussie.\n--------------------\n\n%s +isisfish.script.compilingfile=Compilation de %s... isisfish.script.copy=Copier isisfish.script.copy.tooltip=Copier la s\u00E9lection courante (Ctrl-c) isisfish.script.cut=Couper @@ -843,6 +844,7 @@ isisfish.script.import.labelOverwrite=Le(s) fichier(s) suivant(s) existe(nt) d\u00E9j\u00E0, Confirmer pour l'\u00E9crasement isisfish.script.import.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 importer isisfish.script.javadoc.ok=Javadoc g\u00E9n\u00E9r\u00E9e avec succ\u00E8s\n---------------------------\n\n%s +isisfish.script.menu.checkAllSyntax=V\u00E9rifier tous les scripts isisfish.script.menu.checkSyntax=V\u00E9rifier la syntaxe isisfish.script.menu.code=Code isisfish.script.menu.commit=Commiter des scripts sur le serveur @@ -902,7 +904,7 @@ isisfish.sensitivity.firstValue=Premi\u00E8re valeur isisfish.sensitivity.increment=Cardinalit\u00E9 isisfish.sensitivity.lastValue=Derni\u00E8re valeur -isisfish.sensitivity.methodfactornotsupported=La m\u00e9thode de sensibilit\u00e9 choisie g\u00e8re les cardinalit\u00e9s des facteurs +isisfish.sensitivity.methodfactornotsupported=La m\u00E9thode de sensibilit\u00E9 choisie g\u00E8re les cardinalit\u00E9s des facteurs isisfish.sensitivity.name=Nom du facteur isisfish.sensitivity.operator=Op\u00E9rateur isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats

1 0

r2978 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org Feb. 4, 2010

Feb. 4, 2010

Author: chatellier Date: 2010-02-04 14:31:25 +0000 (Thu, 04 Feb 2010) New Revision: 2978 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Use provided compiler only if system compiler can't be found 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 2010-02-04 11:24:41 UTC (rev 2977) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2010-02-04 14:31:25 UTC (rev 2978) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -50,6 +50,7 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; @@ -216,10 +217,16 @@ protected static int compile(List<File> classpath, Collection<File> src, File dest, PrintWriter out) { dest.mkdirs(); - + int result = -1000; try { - JavaCompiler compiler = JavacTool.create(); + + // look for best available Java compiler (if none, use provided) + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + if (compiler == null) { + compiler = JavacTool.create(); + } + // Use system compiler // JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager fileManager = compiler

1 0

r2977 - isis-fish/branches/3.3.1/doc/devel
by chatellier＠users.labs.libre-entreprise.org Feb. 4, 2010

Feb. 4, 2010

Author: chatellier Date: 2010-02-04 11:24:41 +0000 (Thu, 04 Feb 2010) New Revision: 2977 Added: isis-fish/branches/3.3.1/doc/devel/Sensitivity.png isis-fish/branches/3.3.1/doc/devel/sensitivity.zargo Log: Add a little diagrams about sensitivity objects (factor, group, domain...) Added: isis-fish/branches/3.3.1/doc/devel/Sensitivity.png =================================================================== (Binary files differ) Property changes on: isis-fish/branches/3.3.1/doc/devel/Sensitivity.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/branches/3.3.1/doc/devel/sensitivity.zargo =================================================================== (Binary files differ) Property changes on: isis-fish/branches/3.3.1/doc/devel/sensitivity.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2976 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Feb. 4, 2010

Feb. 4, 2010

Author: chatellier Date: 2010-02-04 11:23:18 +0000 (Thu, 04 Feb 2010) New Revision: 2976 Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update translations Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-04 10:50:54 UTC (rev 2975) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-04 11:23:18 UTC (rev 2976) @@ -664,6 +664,7 @@ isisfish.params.description=Description isisfish.params.filter=Filter isisfish.params.loadOldSimulation=Load old simulation +isisfish.params.nopopulation=No selected population isisfish.params.numberYear=Number of year isisfish.params.populationEffectives=%s's effectives isisfish.params.rules=Rules @@ -901,6 +902,7 @@ isisfish.sensitivity.firstValue=First value isisfish.sensitivity.increment=Cardinality isisfish.sensitivity.lastValue=Last value +isisfish.sensitivity.methodfactornotsupported=The selected sensitivity method handles factors cardinalities isisfish.sensitivity.name=Factor name isisfish.sensitivity.operator=Operator isisfish.sensitivity.secondpass=Analyze results @@ -910,7 +912,7 @@ isisfish.sensitivity.title=Sensitivity analysis isisfish.sensitivity.validDiscretNumber=Ok isisfish.sensitivity.value=Value -isisfish.sensitivityChooser.title=Sensitivities input +isisfish.sensitivityChooser.title=Sensitivity method isisfish.server.ssh.generateKey.title=Generate Ssh key isisfish.setOfVessels.comments=Comments isisfish.setOfVessels.fixedCosts=Fixed costs Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-04 10:50:54 UTC (rev 2975) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-04 11:23:18 UTC (rev 2976) @@ -664,6 +664,7 @@ isisfish.params.description=Description isisfish.params.filter=Filtrer isisfish.params.loadOldSimulation=Charger une ancienne simulation +isisfish.params.nopopulation=Aucune population s\u00E9lectionn\u00E9e isisfish.params.numberYear=Nombre d'ann\u00E9es isisfish.params.populationEffectives=Effectifs %s isisfish.params.rules=R\u00E8gles @@ -901,6 +902,7 @@ isisfish.sensitivity.firstValue=Premi\u00E8re valeur isisfish.sensitivity.increment=Cardinalit\u00E9 isisfish.sensitivity.lastValue=Derni\u00E8re valeur +isisfish.sensitivity.methodfactornotsupported=La m\u00e9thode de sensibilit\u00e9 choisie g\u00e8re les cardinalit\u00e9s des facteurs isisfish.sensitivity.name=Nom du facteur isisfish.sensitivity.operator=Op\u00E9rateur isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats

1 0

r2975 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org Feb. 4, 2010

Feb. 4, 2010

Author: chatellier Date: 2010-02-04 10:50:54 +0000 (Thu, 04 Feb 2010) New Revision: 2975 Modified: isis-fish/branches/3.3.1/changelog.txt Log: Update changelog Modified: isis-fish/branches/3.3.1/changelog.txt =================================================================== --- isis-fish/branches/3.3.1/changelog.txt 2010-02-02 16:52:49 UTC (rev 2974) +++ isis-fish/branches/3.3.1/changelog.txt 2010-02-04 10:50:54 UTC (rev 2975) @@ -1,5 +1,22 @@ -isis-fish (3.3.0.0) stable; urgency=low +isis-fish (3.3.1.0-rc1) stable; urgency=low + * Improve UI to enable some fields/tabs only after region loading + * Enable to put population effectives into factors + * Enable to put rules into factor + * Add group screening features + * Modify parameters interface to prepare factorizable values (population/rule) + * Factor, DesignPlan, Scenario and Domain are no longer generics + + -- jeu. févr. 4 11:48:12 CET 2010 + +isis-fish (3.3.0.0-rc2) stable; urgency=low + + * Disable all list filtering functionalities (don't work anymore with a lot of simulations) + + -- jeu. janv. 28 18:51:17 CET 2010 + +isis-fish (3.3.0.0-rc1) stable; urgency=low + * Enable to add factors from tables (target factor equation, selectivity equation) * Restore simulation control auto save features (usefull for remote simulation monitoring) * Make all data storage isolated on simulation directory during a simulation @@ -32,7 +49,7 @@ * Add ".shp" extension to database map files list (database migration) * Move codelutin librairies to nuiton.org (database migration) - -- mar. oct. 13 09:48:15 CEST 2009 + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.2.0.10) stable; urgency=high

1 0

r2974 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2010

Feb. 2, 2010

Author: chatellier Date: 2010-02-02 16:52:49 +0000 (Tue, 02 Feb 2010) New Revision: 2974 Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Cleanup unused properties Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-02 16:34:22 UTC (rev 2973) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-02 16:52:49 UTC (rev 2974) @@ -124,7 +124,6 @@ isisfish.common.region=Region isisfish.common.remove=Remove isisfish.common.reset=Reset -isisfish.common.rules=Rules isisfish.common.save=Save isisfish.common.saveModel=Save as model isisfish.common.saveNextSimulation=Save for next simulation @@ -667,11 +666,8 @@ isisfish.params.loadOldSimulation=Load old simulation isisfish.params.numberYear=Number of year isisfish.params.populationEffectives=%s's effectives -isisfish.params.populationNumbers=Population numbers input -isisfish.params.populations=Populations -isisfish.params.ruleParameters=Rule's parameters isisfish.params.rules=Rules -isisfish.params.rules.availables=Avalilables rules +isisfish.params.rules.availables=Available rules isisfish.params.rules.selected=Selected rules isisfish.params.sensitivityName=Sensitivity name isisfish.params.simulationLauncher=Simulation launcher Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-02 16:34:22 UTC (rev 2973) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-02 16:52:49 UTC (rev 2974) @@ -124,7 +124,6 @@ isisfish.common.region=R\u00E9gion isisfish.common.remove=Supprimer isisfish.common.reset=R\u00E9initialiser -isisfish.common.rules=R\u00E8gles isisfish.common.save=Sauver isisfish.common.saveModel=Sauver comme mod\u00E8le isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation @@ -667,8 +666,6 @@ isisfish.params.loadOldSimulation=Charger une ancienne simulation isisfish.params.numberYear=Nombre d'ann\u00E9es isisfish.params.populationEffectives=Effectifs %s -isisfish.params.populationNumbers=Donn\u00E9es de population -isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles isisfish.params.rules=R\u00E8gles isisfish.params.rules.availables=R\u00E8gles disponibles isisfish.params.rules.selected=R\u00E8gles s\u00E9lectionn\u00E9es

1 0

r2973 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2010

Feb. 2, 2010

Author: chatellier Date: 2010-02-02 16:34:22 +0000 (Tue, 02 Feb 2010) New Revision: 2973 Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update translation (population effectives and rule factors) Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-02 14:56:45 UTC (rev 2972) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-02 16:34:22 UTC (rev 2973) @@ -664,13 +664,19 @@ isisfish.params.clearFilter=Clear filter isisfish.params.description=Description isisfish.params.filter=Filter -isisfish.params.lblLauncher=Simulation launcher isisfish.params.loadOldSimulation=Load old simulation isisfish.params.numberYear=Number of year +isisfish.params.populationEffectives=%s's effectives isisfish.params.populationNumbers=Population numbers input +isisfish.params.populations=Populations isisfish.params.ruleParameters=Rule's parameters +isisfish.params.rules=Rules +isisfish.params.rules.availables=Avalilables rules +isisfish.params.rules.selected=Selected rules isisfish.params.sensitivityName=Sensitivity name +isisfish.params.simulationLauncher=Simulation launcher isisfish.params.simulationName=Simulation name +isisfish.params.stategiesAndPopulations=Stategies and populations isisfish.params.title=Parameters isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n isisfish.params.toString.lib.logger.level=Level of libraries' logger \: %1$s Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-02 14:56:45 UTC (rev 2972) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-02 16:34:22 UTC (rev 2973) @@ -664,13 +664,18 @@ isisfish.params.clearFilter=Remise \u00E0 z\u00E9ro du filtre isisfish.params.description=Description isisfish.params.filter=Filtrer -isisfish.params.lblLauncher=Lanceur de simulation isisfish.params.loadOldSimulation=Charger une ancienne simulation isisfish.params.numberYear=Nombre d'ann\u00E9es +isisfish.params.populationEffectives=Effectifs %s isisfish.params.populationNumbers=Donn\u00E9es de population isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles +isisfish.params.rules=R\u00E8gles +isisfish.params.rules.availables=R\u00E8gles disponibles +isisfish.params.rules.selected=R\u00E8gles s\u00E9lectionn\u00E9es isisfish.params.sensitivityName=Nom de l'analyse de sensibilit\u00E9 +isisfish.params.simulationLauncher=Lanceur de simulation isisfish.params.simulationName=Nom de la simulation +isisfish.params.stategiesAndPopulations=Strat\u00E9gies et populations isisfish.params.title=Param\u00E8tres isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n isisfish.params.toString.lib.logger.level=niveau du logger de librairies \: %1$s

1 0

r2972 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2010

Feb. 2, 2010

Author: chatellier Date: 2010-02-02 14:56:45 +0000 (Tue, 02 Feb 2010) New Revision: 2972 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Common.java Log: Make all method deprecated (replaced by their storage equivalent) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Common.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 10:59:29 UTC (rev 2971) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 14:56:45 UTC (rev 2972) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 Ifremer, Code Lutin + * Copyright (C) 2006 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,13 +27,14 @@ import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationProperties; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; /** - * Welcome.java + * Common class containing static method to get some list (region, simulations...). * * Created: 22 août 2006 10:50:49 * @@ -54,6 +55,8 @@ * Return regions. * * @return regions + * + * @deprecated since 3.3.1.0, use {@link RegionStorage#getRegionNames()} instead */ public static Object[] getRegionItem() { List<String> regionNames = new ArrayList<String>(); @@ -71,6 +74,8 @@ * Return old simulations. * * @return old simulations + * + * @deprecated since 3.3.1.0, use {@link SimulationStorage#getSimulationNames()} instead */ public static Object[] getOldSimulationItem() { @@ -103,5 +108,22 @@ } return null; } + + /** + * Return list with all available rules names. + * + * @return list with all available rules names + * + * @deprecated since 3.3.1.0, use {@link RuleStorage#getRuleNames()} instead + */ + public static List<String> getAvailablesRuleNames() { + List<String> result = new ArrayList<String>(); + for (String ruleName : RuleStorage.getRuleNames()) { + // TODO remove last .java + String shortRuleName = ruleName.substring(0, ruleName.length() - 5); + result.add(shortRuleName); + } + return result; + } }

1 0

r2971 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2010

Feb. 2, 2010

Author: chatellier Date: 2010-02-02 10:59:29 +0000 (Tue, 02 Feb 2010) New Revision: 2971 Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizard.java Log: Remove unused class Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizard.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizard.java 2010-02-02 10:06:41 UTC (rev 2970) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizard.java 2010-02-02 10:59:29 UTC (rev 2971) @@ -1,67 +0,0 @@ -/* *##% - * Copyright (C) 2002, 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.ui.simulator; - -import javax.swing.JButton; -import javax.swing.JTabbedPane; - -/** - * SensWizard. - * - * Created: 14 nov. 2005 - * - * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - * - * @deprecated on 20080223 seams to be unused - */ -public class SensWizard { - - /** - * Methode appelee à lors du passage d'une fenetre a une autre dans le - * wizard - * @return l'index de la tab a selectionner - */ - public static int newTab(JButton prev, JButton next, JButton finish, - JTabbedPane tabPane) { - // La direction du changement de tab (+1, -1) - //int step = ((Integer)currentContext.getData("_step")).intValue(); - // La nouvelle tab sélectionnée par l'utilisateur - int tab = tabPane.getSelectedIndex(); - if (tab > 0) { - prev.setEnabled(true); - } else { - prev.setEnabled(false); - } - // Active/desactive les boutons next et finish - if (tab == tabPane.getTabCount() - 1) { - next.setEnabled(false); - finish.setEnabled(true); - } else { - next.setEnabled(true); - finish.setEnabled(false); - } - return tab; - } - -} //SensWizard

1 0

r2970 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2010

Feb. 2, 2010

Author: chatellier Date: 2010-02-02 10:06:41 +0000 (Tue, 02 Feb 2010) New Revision: 2970 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Also disable reset button 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 2010-02-02 10:04:26 UTC (rev 2969) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-02-02 10:06:41 UTC (rev 2970) @@ -407,7 +407,7 @@ <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()' enabled="false"/> </cell> <cell> - <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()'/> + <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()' enabled="false"/> </cell> </row> </Table>

1 0