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

r2629 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 16 Sep '09

16 Sep '09

Author: chatellier Date: 2009-09-16 12:02:04 +0000 (Wed, 16 Sep 2009) New Revision: 2629 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Make "analyseplan" property deprecated Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-09-16 09:49:24 UTC (rev 2628) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-09-16 12:02:04 UTC (rev 2629) @@ -145,7 +145,10 @@ /** utilisation du plan d'analyse */ protected boolean useAnalysePlan = false; - /** le script de plan d'analyse */ + /** + * Le script de plan d'analyse. + * @deprecated since 3.2.0.7 unused + */ protected String analysePlan = ""; /** le numero de sequence de la liste des plans d'analyse, le premier @@ -1151,6 +1154,8 @@ /** * @return Returns the analysePlan. + * + * @deprecated since 3.2.0.7 unused */ public String getAnalysePlan() { return this.analysePlan; @@ -1158,6 +1163,7 @@ /** * @param analysePlan The analysePlan to set. + * @deprecated since 3.2.0.7 unused */ public void setAnalysePlan(String analysePlan) { this.analysePlan = analysePlan;

1 0

r2628 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 16 Sep '09

16 Sep '09

Author: chatellier Date: 2009-09-16 09:49:24 +0000 (Wed, 16 Sep 2009) New Revision: 2628 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Fix export selection for current simulation only Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-16 07:48:15 UTC (rev 2627) +++ isis-fish/trunk/changelog.txt 2009-09-16 09:49:24 UTC (rev 2628) @@ -1,6 +1,7 @@ isis-fish (3.2.0.7) stable; urgency=low * Add log in equation content + * Fix export names selection problem for current simulation * Fix result names selection problem for current simulation * Improve check region code (null object, invalid names...) * Refactor storage modifications notification (done for regions) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2009-09-16 07:48:15 UTC (rev 2627) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2009-09-16 09:49:24 UTC (rev 2628) @@ -21,12 +21,9 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.models.export.ExportNameListModel; + import javax.swing.event.ListSelectionEvent; refresh(); - - /*public ExportUI (SimulAction action) { - setContextValue(action); - }*/ protected SimulAction getSimulAction() { return getContextValue(SimulAction.class); @@ -55,7 +52,21 @@ } } - protected void saveExport() { + protected void saveSimulationExports(ListSelectionEvent event) { + // Set exports (this can save empty list (not a big deal)) + Object[] values = listSimulExportChoose.getSelectedValues(); + java.util.List<String> exportNames = new LinkedList<String>(); + for (Object o : values) { + exportNames.add((String) o); + } + getSimulAction().getSimulationParameter().setExportNames(exportNames); + + if (log.isDebugEnabled()) { + log.debug("Set exports in simulation : " + exportNames); + } + } + + protected void saveConfigExports() { // set export directory String exportDirectory = fieldSimulExportFolder.getText(); getSimulAction().getSimulationParameter().setExportDirectory(exportDirectory); @@ -73,6 +84,7 @@ } protected void setInfoText(String txt) { + // TODO remove getParentContainer use WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); root.setInfoText(txt); } @@ -82,7 +94,8 @@ <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> <JList id="listSimulExportChoose" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' /> + cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' + onValueChanged='saveSimulationExports(event)' /> </JScrollPane> </cell> </row> @@ -94,10 +107,10 @@ <JTextField id="fieldSimulExportFolder" /> </cell> <cell> - <JButton text="isisfish.common.ellipsis" onActionPerformed='getContextValue(SimulAction.class).updateDirectory()'/> + <JButton text="isisfish.common.ellipsis" onActionPerformed='getSimulAction().updateDirectory()'/> </cell> <cell> - <JButton text="isisfish.common.saveNextSimulation" onActionPerformed='saveExport()'/> + <JButton text="isisfish.common.saveNextSimulation" onActionPerformed='saveConfigExports()'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2009-09-16 07:48:15 UTC (rev 2627) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2009-09-16 09:49:24 UTC (rev 2628) @@ -21,6 +21,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.models.result.ResultListModel; + import javax.swing.event.ListSelectionEvent; refresh(); @@ -48,7 +49,7 @@ } } - protected void saveParametersResultNames() { + protected void saveParametersResultNames(ListSelectionEvent event) { getContextValue(SimulAction.class).saveParametersResultNames(listResultNames.getSelectedValues()); } @@ -68,7 +69,7 @@ <JScrollPane constraints='BorderLayout.CENTER'> <JList id="listResultNames" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" cellRenderer='{new fr.ifremer.isisfish.ui.models.result.ResultListRenderer()}' - onValueChanged='saveParametersResultNames()' /> + onValueChanged='saveParametersResultNames(event)' /> </JScrollPane> <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation" onActionPerformed='saveConfigResultNames()'/> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-09-16 07:48:15 UTC (rev 2627) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-09-16 09:49:24 UTC (rev 2628) @@ -572,9 +572,17 @@ param.setExportDirectory(FileUtil.getDirectory()); } + /** + * Save current parameters exports names in configuration. + */ public void saveExport() { IsisFish.config.setDefaultExportDirectory(param.getExportDirectory()); if (param.getExportNames() != null) { + + if (log.isDebugEnabled()) { + log.debug("Set exports in configuration : " + param.getExportNames()); + } + IsisFish.config.setDefaultExportNames(param.getExportNames()); } }

1 0

r2627 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/util test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 16 Sep '09

16 Sep '09

Author: chatellier Date: 2009-09-16 07:48:15 +0000 (Wed, 16 Sep 2009) New Revision: 2627 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java Log: Add isis-database-3 into classpath for equation compilation. 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-09-16 07:30:11 UTC (rev 2626) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2009-09-16 07:48:15 UTC (rev 2627) @@ -26,6 +26,7 @@ import java.io.PrintWriter; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -168,7 +169,14 @@ // if Java file is newer than class file, compile java file if (FileUtil.isNewer(fileSrc, fileDest)) { try { - int compileResult = CompileHelper.compile(fileRootSrc, fileSrc, fileRootSrc, null); + // does'nt contains isisdatabase-3 directory + //int compileResult = CompileHelper.compile(fileRootSrc, fileSrc, fileRootSrc, null); + + List<File> classpath = new ArrayList<File>(); + classpath.add(fileRootSrc.getAbsoluteFile()); + classpath.add(IsisFish.config.getDatabaseDirectory().getAbsoluteFile()); + int compileResult = CompileHelper.compile(classpath, Collections.singletonList(fileSrc), fileRootSrc, null); + if (compileResult != 0) { throw new IsisFishRuntimeException(_("isisfish.error.compile.script", compileResult, fileSrc)); } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-09-16 07:30:11 UTC (rev 2626) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-09-16 07:48:15 UTC (rev 2627) @@ -113,7 +113,7 @@ * Test que le repertoire des scripts en bien présent * dans le classpath de compilation. */ - @Ignore + @Test public void testEquationWithDatabaseContent() { Map<String, Object> args = new HashMap<String, Object>(); args.put("context", null);

1 0

r2626 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 16 Sep '09

16 Sep '09

Author: chatellier Date: 2009-09-16 07:30:11 +0000 (Wed, 16 Sep 2009) New Revision: 2626 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java Log: Add unit test on log in equation Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-09-15 16:45:10 UTC (rev 2625) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-09-16 07:30:11 UTC (rev 2626) @@ -128,4 +128,23 @@ Assert.assertNotNull(result); Assert.assertEquals("4.0", result.toString()); } + + /** + * Test that commons logging logger in present for use in equation. + */ + @Test + public void testEquationWithLogger() { + Map<String, Object> args = new HashMap<String, Object>(); + args.put("context", null); + args.put("length", 2.0); + args.put("group", null); + + String equationContent = "log.info(\"Test logger\");"; + equationContent += "return 1.0;"; + Object result = EvaluatorHelper.evaluate("fr.isisfish.equation", + "TestEquationWithDatabaseContent", PopulationGrowthReverse.class, + equationContent, args); + Assert.assertNotNull(result); + Assert.assertEquals("1.0", result.toString()); + } }

1 0

r2625 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 15 Sep '09

15 Sep '09

Author: chatellier Date: 2009-09-15 16:45:10 +0000 (Tue, 15 Sep 2009) New Revision: 2625 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Log: Add commons logger in equation Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-15 16:44:20 UTC (rev 2624) +++ isis-fish/trunk/changelog.txt 2009-09-15 16:45:10 UTC (rev 2625) @@ -1,6 +1,8 @@ isis-fish (3.2.0.7) stable; urgency=low - * Imporve check region code (null object, invalid names...) + * Add log in equation content + * Fix result names selection problem for current simulation + * Improve check region code (null object, invalid names...) * Refactor storage modifications notification (done for regions) * Fix a little trace util object for both Cache and Trace aspect * Add aspect to get rule time (init/pre/post) in simulation summary 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-09-15 16:44:20 UTC (rev 2624) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2009-09-15 16:45:10 UTC (rev 2625) @@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; +import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.IsisFish; @@ -189,6 +190,18 @@ return result; } + /** + * Generate equation content. + * + * Warning, content are always on a unique single line (without \n) for + * debuging purpose. + * + * @param packageName + * @param className + * @param interfaceMethod + * @param script + * @return equation return + */ protected static String generateContent(String packageName, String className, Method interfaceMethod, String script) { String content = ""; if (packageName != null && !"".equals(packageName)) { @@ -200,11 +213,12 @@ content += "import fr.ifremer.isisfish.types.Month;"; content += "import fr.ifremer.isisfish.types.RangeOfValues;"; content += "import fr.ifremer.isisfish.types.TimeUnit;"; + content += "import org.apache.commons.logging.Log;"; + content += "import org.apache.commons.logging.LogFactory;"; content += "import java.util.*;"; content += "public class " + className + " implements " + interfaceMethod.getDeclaringClass().getName() + " {"; - content += - "public " + interfaceMethod.getReturnType().getName() + - " " + interfaceMethod.getName() + "("; + content += "private static Log log = LogFactory.getLog(" + className + ".class);"; + content += "public " + interfaceMethod.getReturnType().getName() + " " + interfaceMethod.getName() + "("; Args args = interfaceMethod.getAnnotation(Args.class); String [] names = args.value();

1 0

r2624 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 15 Sep '09

15 Sep '09

Author: chatellier Date: 2009-09-15 16:44:20 +0000 (Tue, 15 Sep 2009) New Revision: 2624 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Don't save results names in configuration if only selection change. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2009-09-15 16:42:46 UTC (rev 2623) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2009-09-15 16:44:20 UTC (rev 2624) @@ -48,8 +48,12 @@ } } - protected void saveResultNames() { - getContextValue(SimulAction.class).saveResultNames(listResultNames.getSelectedValues()); + protected void saveParametersResultNames() { + getContextValue(SimulAction.class).saveParametersResultNames(listResultNames.getSelectedValues()); + } + + protected void saveConfigResultNames() { + getContextValue(SimulAction.class).saveConfigurationResultNames(listResultNames.getSelectedValues()); setInfoText(_("isisfish.resultChoice.saved")); } @@ -63,8 +67,9 @@ <JLabel text="isisfish.resultChoice.save" horizontalAlignment="center" constraints='BorderLayout.NORTH'/> <JScrollPane constraints='BorderLayout.CENTER'> <JList id="listResultNames" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - cellRenderer='{new fr.ifremer.isisfish.ui.models.result.ResultListRenderer()}' /> + cellRenderer='{new fr.ifremer.isisfish.ui.models.result.ResultListRenderer()}' + onValueChanged='saveParametersResultNames()' /> </JScrollPane> - <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation" onActionPerformed='saveResultNames()'/> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation" onActionPerformed='saveConfigResultNames()'/> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-09-15 16:42:46 UTC (rev 2623) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-09-15 16:44:20 UTC (rev 2624) @@ -583,13 +583,28 @@ * ResultUI */ - public void saveResultNames(Object[] resultNames) { + public void saveParametersResultNames(Object[] resultNames) { List<String> resultNamesString = new ArrayList<String>(); for (Object o : resultNames) { resultNamesString.add(o.toString()); } param.setResultEnabled(resultNamesString); + + if (log.isDebugEnabled()) { + log.debug("Set simulation result names : " + resultNamesString); + } + } + + public void saveConfigurationResultNames(Object[] resultNames) { + List<String> resultNamesString = new ArrayList<String>(); + for (Object o : resultNames) { + resultNamesString.add(o.toString()); + } IsisFish.config.setDefaultResultNames(resultNamesString); + + if (log.isDebugEnabled()) { + log.debug("Set configuration result names : " + resultNamesString); + } } public List<String> getDefaultResultNames() {

1 0

r2623 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 15 Sep '09

15 Sep '09

Author: chatellier Date: 2009-09-15 16:42:46 +0000 (Tue, 15 Sep 2009) New Revision: 2623 Modified: 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: Format 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-09-15 16:05:47 UTC (rev 2622) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-09-15 16:42:46 UTC (rev 2623) @@ -12,7 +12,6 @@ Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= Can't\ get\ changlog= -isisfish.error.invalid.nullequation=Equation %s doesn't exist ! Can't\ get\ result\:\ %1$s=Can't get result\: %1$s Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= @@ -294,6 +293,7 @@ isisfish.error.invalid.interval.reproduction.recruitment=interval entre la reproduction et le recrutement invalide isisfish.error.invalid.mean.weight=poids moyen invalide isisfish.error.invalid.natural.death=natural mortality on classes naissantes invalide +isisfish.error.invalid.nullequation=Equation %s doesn't exist \! isisfish.error.invalid.number=the number is invalid isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable isisfish.error.invalid.values.params=Parametre controlable hors valeurs possibles 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-09-15 16:05:47 UTC (rev 2622) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-09-15 16:42:46 UTC (rev 2623) @@ -11,7 +11,6 @@ Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= -isisfish.error.invalid.nullequation=L'equation %s n'existe pas ! Can't\ get\ changlog=Impossible d'obtenir de changelog Can't\ get\ result\:\ %1$s=Can't get result\: %1$s Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s @@ -294,6 +293,7 @@ isisfish.error.invalid.interval.reproduction.recruitment=interval entre la reproduction et le recrutement invalide isisfish.error.invalid.mean.weight=poids moyen invalide isisfish.error.invalid.natural.death=mortalit\u00E9 naturelle sur les classes naissantes invalide +isisfish.error.invalid.nullequation=L'equation %s n'existe pas \! isisfish.error.invalid.number=le nombre est invalide isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable isisfish.error.invalid.values.params=Param\u00E8tre controlable hors valeurs possibles

1 0

r2622 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input/check src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 15 Sep '09

15 Sep '09

Author: chatellier Date: 2009-09-15 16:05:47 +0000 (Tue, 15 Sep 2009) New Revision: 2622 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.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: Fix null equation check. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-15 14:25:11 UTC (rev 2621) +++ isis-fish/trunk/changelog.txt 2009-09-15 16:05:47 UTC (rev 2622) @@ -1,5 +1,6 @@ isis-fish (3.2.0.7) stable; urgency=low + * Imporve check region code (null object, invalid names...) * Refactor storage modifications notification (done for regions) * Fix a little trace util object for both Cache and Trace aspect * Add aspect to get rule time (init/pre/post) in simulation summary Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2009-09-15 14:25:11 UTC (rev 2621) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2009-09-15 16:05:47 UTC (rev 2622) @@ -1,5 +1,5 @@ /* *##% -* Copyright (C) 2002 - 2009 Code Lutin +* Copyright (C) 2002 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Static public License @@ -85,14 +85,17 @@ */ - static public void check(Equation eq, CheckResult result) { + static public void check(Object parent, String name, Equation eq, CheckResult result) { + if (eq == null) { + result.addError(parent, _("isisfish.error.invalid.nullequation", name)); + } if (0 != EvaluatorHelper.check(eq.getJavaInterface(), eq.getContent(), null)) { result.addError(eq, _("isisfish.error.invalid.equation")); } } static public void check(TargetSpecies capturabilite, CheckResult result){ - check(capturabilite.getTargetFactorEquation(), result); + check(capturabilite, "TargetFactorEquation", capturabilite.getTargetFactorEquation(), result); } static public void check(PopulationGroup classPop, CheckResult result){ @@ -188,9 +191,9 @@ static public void check(PopulationSeasonInfo infoSaisonPop, CheckResult result){ if (infoSaisonPop.getUseEquationMigration()) { - check(infoSaisonPop.getMigrationEquation(), result); - check(infoSaisonPop.getEmigrationEquation(), result); - check(infoSaisonPop.getImmigrationEquation(), result); + check(infoSaisonPop, "MigrationEquation", infoSaisonPop.getMigrationEquation(), result); + check(infoSaisonPop, "Emigration", infoSaisonPop.getEmigrationEquation(), result); + check(infoSaisonPop, "ImmigrationEquation", infoSaisonPop.getImmigrationEquation(), result); } else { if (isEmptyMatrix(infoSaisonPop.getMigrationMatrix())) { result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); @@ -268,7 +271,13 @@ check(metier.getGear(), result); } - if (!metier.getGear().getPossibleValue().contains(metier.getGearParameterValue())) { + try { + if (!metier.getGear().getPossibleValue().contains(metier.getGearParameterValue())) { + result.addWarning(metier, _("isisfish.error.invalid.values.params")); + } + } catch(Exception e) { + // can't happen StringIndexOutOfBoundsException + // if gear.PossibleValue if not valid result.addWarning(metier, _("isisfish.error.invalid.values.params")); } @@ -284,8 +293,8 @@ if(pop.getMaturityGroup() == null){ result.addInfo(pop, _("isisfish.error.not.null.class.grown")); } - check(pop.getGrowth(), result); - check(pop.getGrowthReverse(), result); + check(pop, "Growth", pop.getGrowth(), result); + check(pop, "GrowthReverse", pop.getGrowthReverse(), result); List<PopulationGroup> classes = pop.getPopulationGroup(); if(classes.size() == 0){ result.addWarning(pop, _("isisfish.error.undefined.classes")); @@ -328,10 +337,10 @@ check(info, result); } } - check(pop.getPrice(), result); - check(pop.getMeanWeight(), result); - check(pop.getReproductionEquation(), result); - check(pop.getNaturalDeathRate(), result); + check(pop, "Price", pop.getPrice(), result); + check(pop, "MeanWeight", pop.getMeanWeight(), result); + check(pop, "ReproductionEquation", pop.getReproductionEquation(), result); + check(pop, "NaturalDeathRate", pop.getNaturalDeathRate(), result); if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { result.addWarning(pop, _("isisfish.error.invalid.distribution.recruitment")); @@ -451,7 +460,4 @@ } - - - } // CheckSaisie - +} // CheckSaisie 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-09-15 14:25:11 UTC (rev 2621) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-09-15 16:05:47 UTC (rev 2622) @@ -12,6 +12,7 @@ Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= Can't\ get\ changlog= +isisfish.error.invalid.nullequation=Equation %s doesn't exist ! Can't\ get\ result\:\ %1$s=Can't get result\: %1$s Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= 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-09-15 14:25:11 UTC (rev 2621) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-09-15 16:05:47 UTC (rev 2622) @@ -11,6 +11,7 @@ Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= +isisfish.error.invalid.nullequation=L'equation %s n'existe pas ! Can't\ get\ changlog=Impossible d'obtenir de changelog Can't\ get\ result\:\ %1$s=Can't get result\: %1$s Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s

1 0

r2621 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 15 Sep '09

15 Sep '09

Author: chatellier Date: 2009-09-15 14:25:11 +0000 (Tue, 15 Sep 2009) New Revision: 2621 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Switch tab on JList focus. 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-09-15 09:38:19 UTC (rev 2620) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-09-15 14:25:11 UTC (rev 2621) @@ -288,20 +288,11 @@ protected void strategySelected(){ simulAction.setStrategies(listSimulParamsStrategies.getSelectedValues()); } + protected void saveDescription() { simulAction.getSimulationParameter().setDescription(fieldSimulParamsDesc.getText()); } -/*protected ComboBoxModel getParamsMesuresSelectModel() { - java.util.List<Rule> availableRules = simulAction.getAvailableRules(); - RuleComboBoxModel model = new RuleComboBoxModel(availableRules); - - // TODO change place (but must be same rule list) - fieldSimulParamsMesuresSelect.setRenderer(model); - - return model; -}*/ - protected void setRulesListModel() { if (log.isDebugEnabled()) { log.debug("Set simulation rules model"); @@ -529,7 +520,8 @@ <row> <cell fill="both" weightx="1.0" weighty="1.0"> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="listSimulParamsPopulations" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" onValueChanged='populationSelected()'/> + <JList id="listSimulParamsPopulations" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + onValueChanged='populationSelected()' onFocusGained="parametersTabbedPane.setSelectedIndex(0)" /> </JScrollPane> </cell> </row> @@ -550,7 +542,8 @@ <row> <cell fill="both" weightx="1.0" weighty="1.0"> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="listSimulParamsMesuresList" selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" onValueChanged='onRuleSelectionChange()'/> + <JList id="listSimulParamsMesuresList" selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" + onValueChanged='onRuleSelectionChange()' onFocusGained="parametersTabbedPane.setSelectedIndex(1)" /> </JScrollPane> </cell> </row> @@ -588,7 +581,7 @@ </row> <row> <cell columns="4" fill="both" weightx="1.0" weighty="0.6"> - <JTabbedPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTabbedPane id="parametersTabbedPane" minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <tab title='{_("isisfish.params.populationNumbers")}'> <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/> </tab>

1 0

r2620 - isis-fish/trunk/src/main/resources/templates/script
by chatellier＠users.labs.libre-entreprise.org 15 Sep '09

15 Sep '09

Author: chatellier Date: 2009-09-15 09:38:19 +0000 (Tue, 15 Sep 2009) New Revision: 2620 Modified: isis-fish/trunk/src/main/resources/templates/script/export.ftl isis-fish/trunk/src/main/resources/templates/script/sensitivityexport.ftl Log: Add scripts.ResultName import on exports template. Modified: isis-fish/trunk/src/main/resources/templates/script/export.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-09-15 08:24:06 UTC (rev 2619) +++ isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-09-15 09:38:19 UTC (rev 2620) @@ -25,6 +25,9 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.math.matrix.*; + +import scripts.ResultName; + import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; @@ -52,7 +55,7 @@ // example: // ResultName.MATRIX_BIOMASS, // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - }; + }; public String[] getNecessaryResult() { return this.necessaryResult; Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/sensitivityexport.ftl 2009-09-15 08:24:06 UTC (rev 2619) +++ isis-fish/trunk/src/main/resources/templates/script/sensitivityexport.ftl 2009-09-15 09:38:19 UTC (rev 2620) @@ -25,6 +25,9 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.math.matrix.*; + +import scripts.ResultName; + import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.SensitivityExport; @@ -52,7 +55,7 @@ // example: // ResultName.MATRIX_BIOMASS, // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - }; + }; public String[] getNecessaryResult() { return this.necessaryResult;

1 0