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

r4294 - trunk
by echatellier＠users.forge.codelutin.com 24 Jun '15

24 Jun '15

Author: echatellier Date: 2015-06-24 08:20:02 +0000 (Wed, 24 Jun 2015) New Revision: 4294 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4294 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-06-24 08:19:56 UTC (rev 4293) +++ trunk/pom.xml 2015-06-24 08:20:02 UTC (rev 4294) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.0.0-rc-3</version> + <version>4.4.0.0-SNAPSHOT</version>  <dependencies> @@ -755,9 +755,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0-rc-3</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0-rc-3</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0-rc-3</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> + <url>https://svn.codelutin.com/isis-fish/trunk</url> </scm> <repositories>

1 0

r4293 - in tags: . isis-fish-4.4.0.0-rc-3
by echatellier＠users.forge.codelutin.com 24 Jun '15

24 Jun '15

Author: echatellier Date: 2015-06-24 08:19:56 +0000 (Wed, 24 Jun 2015) New Revision: 4293 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4293 Log: [maven-release-plugin] copy for tag isis-fish-4.4.0.0-rc-3 Added: tags/isis-fish-4.4.0.0-rc-3/ Property changes on: tags/isis-fish-4.4.0.0-rc-3 ___________________________________________________________________ Added: svn:mergeinfo + /branches/isis-fish-4.4.0-editor:4243-4262 /branches/isis-fish-4.4.0-resultname:4267-4276 /branches/isis-fish-4.4.0-ui-refactoring:4246-4262 Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine .idea

1 0

r4292 - trunk
by echatellier＠users.forge.codelutin.com 24 Jun '15

24 Jun '15

Author: echatellier Date: 2015-06-24 08:19:47 +0000 (Wed, 24 Jun 2015) New Revision: 4292 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4292 Log: [maven-release-plugin] prepare release isis-fish-4.4.0.0-rc-3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-06-24 08:04:58 UTC (rev 4291) +++ trunk/pom.xml 2015-06-24 08:19:47 UTC (rev 4292) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.0.0-SNAPSHOT</version> + <version>4.4.0.0-rc-3</version>  <dependencies> @@ -755,9 +755,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> - <url>https://svn.codelutin.com/isis-fish/trunk</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0-rc-3</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0-rc-3</developerConnection> + <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.0-rc-3</url> </scm> <repositories>

1 0

r4291 - in trunk/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 24 Jun '15

24 Jun '15

Author: echatellier Date: 2015-06-24 08:04:58 +0000 (Wed, 24 Jun 2015) New Revision: 4291 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4291 Log: Fix tests Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java trunk/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/ObjectiveStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/OptimizationStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -68,6 +68,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return SENSITIVITY_EXPORT_PATH; + } + /** * Get context (official VCS) sensitivity export directory. * Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -72,8 +72,7 @@ .getTemplate(FormuleStorage.FORMULE_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? + Map<String, Object> root = new HashMap<>(); root.put("category", ""); root.put("name", fileName); root.put("date", new Date()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ObjectiveStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ObjectiveStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ObjectiveStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -73,9 +73,7 @@ .getTemplate(ObjectiveStorage.OBJECTIVE_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/OptimizationStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/OptimizationStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/OptimizationStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -73,8 +73,7 @@ .getTemplate(OptimizationStorage.OPTIMIZATION_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? + Map<String, Object> root = new HashMap<>(); root.put("category", ""); root.put("name", fileName); root.put("date", new Date()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -65,9 +65,7 @@ .getTemplate(ResultInfoStorage.RESULT_INFO_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -73,9 +73,7 @@ .getTemplate(RuleStorage.RULE_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); @@ -111,9 +109,7 @@ .getTemplate(RuleStorage.RULE_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -102,12 +102,10 @@ // get template Template template = freemarkerConfiguration - .getTemplate(RuleStorage.RULE_TEMPLATE); + .getTemplate(ScriptStorage.SCRIPT_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -74,9 +74,7 @@ .getTemplate(SensitivityAnalysisStorage.SENSITIVITY_ANALYSIS_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -73,9 +73,7 @@ .getTemplate(SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -74,9 +74,7 @@ .getTemplate(SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -81,9 +81,7 @@ .getTemplate(SimulatorStorage.SIMULATOR_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName());

1 0

r4290 - in trunk/src: main/java/fr/ifremer/isisfish/datastore main/java/fr/ifremer/isisfish/ui/script main/resources/templates/script test/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 23 Jun '15

23 Jun '15

Author: echatellier Date: 2015-06-23 16:49:38 +0000 (Tue, 23 Jun 2015) New Revision: 4290 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4290 Log: Fix resultInfo template. Add test for it. Added: trunk/src/main/resources/templates/script/resultinfo.ftl trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java trunk/src/main/resources/templates/script/export.ftl trunk/src/main/resources/templates/script/exportStep.ftl trunk/src/main/resources/templates/script/objective.ftl trunk/src/main/resources/templates/script/optimization.ftl trunk/src/main/resources/templates/script/rule.ftl trunk/src/main/resources/templates/script/sensitivityexport.ftl trunk/src/main/resources/templates/script/simulationplan.ftl Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java 2015-06-23 16:49:38 UTC (rev 4290) @@ -54,7 +54,7 @@ public static final String RESULT_INFO_PATH = "resultinfos"; /** Template freemarker pour les noms de resultats. */ - public static final String RESULT_NAME_TEMPLATE = "templates/script/resultInfo.ftl"; + public static final String RESULT_INFO_TEMPLATE = "templates/script/resultinfo.ftl"; /** Instance cache. */ protected static Map<String, ResultInfoStorage> resultInfosCache = new ReferenceMap<String, ResultInfoStorage>(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java 2015-06-23 16:49:38 UTC (rev 4290) @@ -975,7 +975,7 @@ RuleStorage.RULE_TEMPLATE, true), ResultInfo( ResultInfoStorage.getResultInfoDirectory(), - ResultInfoStorage.RESULT_NAME_TEMPLATE, true), + ResultInfoStorage.RESULT_INFO_TEMPLATE, true), Objective( ObjectiveStorage.getObjectiveDirectory(), ObjectiveStorage.OBJECTIVE_TEMPLATE, true), @@ -1018,7 +1018,7 @@ RuleStorage.RULE_TEMPLATE), CommunityResultInfo( ResultInfoStorage.getCommunityResultInfoDirectory(), - ResultInfoStorage.RESULT_NAME_TEMPLATE), + ResultInfoStorage.RESULT_INFO_TEMPLATE), CommunityScript( ScriptStorage.getCommunityScriptDirectory(), ScriptStorage.SCRIPT_TEMPLATE), Modified: trunk/src/main/resources/templates/script/export.ftl =================================================================== --- trunk/src/main/resources/templates/script/export.ftl 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/resources/templates/script/export.ftl 2015-06-23 16:49:38 UTC (rev 4290) @@ -76,8 +76,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // MatrixBiomass.class.getSimpleName(), - // MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName(), + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, }; public String[] getNecessaryResult() { Modified: trunk/src/main/resources/templates/script/exportStep.ftl =================================================================== --- trunk/src/main/resources/templates/script/exportStep.ftl 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/resources/templates/script/exportStep.ftl 2015-06-23 16:49:38 UTC (rev 4290) @@ -75,8 +75,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // MatrixBiomass.class.getSimpleName(), - // MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName(), + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, }; /** Modified: trunk/src/main/resources/templates/script/objective.ftl =================================================================== --- trunk/src/main/resources/templates/script/objective.ftl 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/resources/templates/script/objective.ftl 2015-06-23 16:49:38 UTC (rev 4290) @@ -76,8 +76,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // MatrixBiomass.class.getSimpleName(), - // MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName(), + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, }; @Override Modified: trunk/src/main/resources/templates/script/optimization.ftl =================================================================== --- trunk/src/main/resources/templates/script/optimization.ftl 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/resources/templates/script/optimization.ftl 2015-06-23 16:49:38 UTC (rev 4290) @@ -77,8 +77,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // MatrixBiomass.class.getSimpleName(), - // MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName(), + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, }; @Override Added: trunk/src/main/resources/templates/script/resultinfo.ftl =================================================================== --- trunk/src/main/resources/templates/script/resultinfo.ftl (rev 0) +++ trunk/src/main/resources/templates/script/resultinfo.ftl 2015-06-23 16:49:38 UTC (rev 4290) @@ -0,0 +1,72 @@ +<#-- + #%L + IsisFish + + $Id: rule.ftl 4277 2015-06-21 17:24:03Z echatellier $ + $HeadURL: http://svn.codelutin.com/isis-fish/trunk/src/main/resources/templates/scrip… $ + %% + Copyright (C) 2015 Ifremer, CodeLutin, Chatellier Eric + %% + 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 3 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, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% +--> +/* + * Copyright (C) ${date?date?string("yyyy")} ${author} + * + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + */ + +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * ${name}.java + * + * Created: ${date?date?string.long} + */ +public class ${name} extends AbstractResultInfo { + + public static final String NAME = ${name}.class.getSimpleName(); + + protected String[] necessaryResult = { + // put here all necessary result for this rule + // example: + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, + }; + + @Override + public String[] getNecessaryResult() { + return necessaryResult; + } + + @Override + public String getDescription() { + return "do the doc of Result ${name}"; + } +} Modified: trunk/src/main/resources/templates/script/rule.ftl =================================================================== --- trunk/src/main/resources/templates/script/rule.ftl 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/resources/templates/script/rule.ftl 2015-06-23 16:49:38 UTC (rev 4290) @@ -75,8 +75,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // MatrixBiomass.class.getSimpleName(), - // MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName(), + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, }; public String[] getNecessaryResult() { Modified: trunk/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- trunk/src/main/resources/templates/script/sensitivityexport.ftl 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/resources/templates/script/sensitivityexport.ftl 2015-06-23 16:49:38 UTC (rev 4290) @@ -74,8 +74,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // MatrixBiomass.class.getSimpleName(), - // MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName(), + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, }; public String[] getNecessaryResult() { Modified: trunk/src/main/resources/templates/script/simulationplan.ftl =================================================================== --- trunk/src/main/resources/templates/script/simulationplan.ftl 2015-06-23 16:39:29 UTC (rev 4289) +++ trunk/src/main/resources/templates/script/simulationplan.ftl 2015-06-23 16:49:38 UTC (rev 4290) @@ -80,8 +80,8 @@ protected String[] necessaryResult = { // put here all necessary result for this rule // example: - // MatrixBiomass.class.getSimpleName(), - // MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName(), + // MatrixBiomass.NAME, + // MatrixNetValueOfLandingsPerStrategyMet.NAME, }; @Override Added: trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) @@ -0,0 +1,88 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 Ifremer, CodeLutin, Chatellier Eric + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore; + +import java.io.StringWriter; +import java.io.Writer; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.datastore.CodeSourceStorage.Location; +import freemarker.template.Configuration; +import freemarker.template.Template; + +/** + * ResultInfoStorageTest. + */ +public class ResultInfoStorageTest extends AbstractIsisFishTest { + + protected Configuration freemarkerConfiguration; + + @Before + public void setUp() throws Exception { + freemarkerConfiguration = getFreemarkerConfiguration(); + } + + @Test + public void testNewResultWithCompilation() throws Exception { + + String fileName = "TestResult1"; + + ResultInfoStorage resultInfoStorage = ResultInfoStorage.createResultInfo(fileName, Location.COMMUNITY); + + // get template + Template template = freemarkerConfiguration + .getTemplate(ResultInfoStorage.RESULT_INFO_TEMPLATE); + + // context values + Map<String, Object> root = new HashMap<String, Object>(); + // FIXME what is category ? + root.put("category", ""); + root.put("name", fileName); + root.put("date", new Date()); + root.put("author", IsisFish.config.getUserName()); + root.put("email", IsisFish.config.getUserMail()); + + // process template + Writer out = new StringWriter(); + template.process(root, out); + out.flush(); + String content = out.toString(); + + resultInfoStorage.setContent(content); + + // 0 = compile success + int compileResult = resultInfoStorage.compile(false, null); + Assert.assertEquals(0, compileResult); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r4289 - in trunk/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 23 Jun '15

23 Jun '15

Author: echatellier Date: 2015-06-23 16:39:29 +0000 (Tue, 23 Jun 2015) New Revision: 4289 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4289 Log: closes #7149: D?\195?\169tecter la non pr?\195?\169sence de "package" dans un script Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -78,6 +78,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return EXPORT_PATH; + } + /** * Get context (official VCS) export directory. * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -81,6 +81,13 @@ } /** + * Get package name where script should be declared. + * + * @return package declaration + */ + public abstract String getPackage(); + + /** * Return class fully qualified name. * * @return class name including package name @@ -122,8 +129,25 @@ * @return 0 si la compilation a reussi, une autre valeur sinon */ public int compile(boolean force, PrintWriter out) { - return CompileHelper.compile(this, IsisFish.config + int result = CompileHelper.compile(this, IsisFish.config .getCompileDirectory(), force, out); + + // add a specific isi test for "package xxx;" declaration that is NOT an error + // in pur Java, but is for isis fish + if (result == 0) { + String content = getContent(); + String packageDeclaration = "package " + getPackage() + ";"; + if (!content.contains(packageDeclaration)) { + if (out != null) { + out.println("Script doesn't contains mandatory package declaration:"); + out.println(" " + packageDeclaration); + } + + result = 2; + } + } + + return result; } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -65,6 +65,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return OBJECTIVE_PATH; + } + /** * Get context (official VCS) rule directory. * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -65,6 +65,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return OPTIMIZATION_PATH; + } + /** * Get context (official VCS) rule directory. * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -70,6 +70,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return RESULT_INFO_PATH; + } + /** * Get context (official VCS) resultInfo directory. * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -81,6 +81,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return RULE_PATH; + } + /** * Get context (official VCS) rule directory. * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -67,6 +67,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return SCRIPT_PATH; + } + /** * Get context (official VCS) script directory. * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -76,6 +76,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return SENSITIVITY_ANALYSIS_PATH; + } + /** * Get sensitivity storage directory. * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -78,6 +78,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return SIMULATION_PLAN_PATH; + } + /** * Get context (official VCS) simulation plan directory. * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -65,6 +65,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return SIMULATOR_PATH; + } + /** * Get context (official VCS) simulator directory. * Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2015-06-23 16:15:29 UTC (rev 4288) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2015-06-23 16:39:29 UTC (rev 4289) @@ -94,4 +94,43 @@ Assert.assertEquals(0, compileResult); } + /** + * Test que l'absence de "package" est bien détectée. + * + * @throws Exception + */ + @Test + public void testNewRuleWithMissingPackage() throws Exception { + + String fileName = "TestRule1"; + + RuleStorage ruleStorage = RuleStorage.createRule(fileName, Location.OFFICIAL); + + // get template + Template template = freemarkerConfiguration + .getTemplate(RuleStorage.RULE_TEMPLATE); + + // context values + Map<String, Object> root = new HashMap<String, Object>(); + // FIXME what is category ? + root.put("category", ""); + root.put("name", fileName); + root.put("date", new Date()); + root.put("author", IsisFish.config.getUserName()); + root.put("email", IsisFish.config.getUserMail()); + + // process template + Writer out = new StringWriter(); + template.process(root, out); + out.flush(); + String content = out.toString(); + + content = content.replace("rules;", "roles;"); // simulate bad package name + ruleStorage.setContent(content); + + // 2 = compile error + int compileResult = ruleStorage.compile(false, null); + Assert.assertEquals(2, compileResult); + } + }

1 0

r4288 - in trunk/src/main/java/fr/ifremer/isisfish: mexico ui/sensitivity/wizard
by echatellier＠users.forge.codelutin.com 23 Jun '15

23 Jun '15

Author: echatellier Date: 2015-06-23 16:15:29 +0000 (Tue, 23 Jun 2015) New Revision: 4288 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4288 Log: fixes #7230: Cannot restore sensitivity analysis factor on rule Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2015-06-23 15:31:32 UTC (rev 4287) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2015-06-23 16:15:29 UTC (rev 4288) @@ -520,6 +520,9 @@ result = beanUtils.convert(objectId, Month.class); } } + } else { + // ca peut arriver pour des parametres de type "String" sur les param_ de regles. + result = content; } if (result == null && log.isWarnEnabled()) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java 2015-06-23 15:31:32 UTC (rev 4287) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java 2015-06-23 16:15:29 UTC (rev 4288) @@ -229,12 +229,9 @@ JComponent c = null; if (o != null) { c = getEditorWithValue(factorWizardUI, factor, dDomain, o); + } else if (log.isWarnEnabled()) { + log.warn("Null value in factor"); } - else { - if (log.isWarnEnabled()) { - log.warn("Null value in factor"); - } - } JScrollPane js = new JScrollPane(c); String tabName = t("isisfish.sensitivity.discretevaluelabel", i); factorWizardUI.getTabPane().addTab(tabName, js); @@ -266,7 +263,6 @@ protected JComponent getEditorWithValue(FactorWizardUI factorWizardUI, Factor factor, Domain domain, Object value) { JComponent result = null; - if (Double.class.isAssignableFrom(value.getClass())) { result = new JTextField(); ((JTextField)result).setText(String.valueOf(value));

1 0

r4287 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 23 Jun '15

23 Jun '15

Author: echatellier Date: 2015-06-23 15:31:32 +0000 (Tue, 23 Jun 2015) New Revision: 4287 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4287 Log: Prepare rc Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2015-06-23 15:06:36 UTC (rev 4286) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2015-06-23 15:31:32 UTC (rev 4287) @@ -1112,7 +1112,7 @@ public static enum Option implements ConfigOptionDef { CONFIG_FILE(CONFIG_FILE_NAME, n("isisfish.config.main.configFileName.description"), "isis-config-" + ISIS_FISH_MAJOR_VERSION), - ISIS_HOME_DIRECTORY("isis.home.directory", n("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + ISIS_FISH_MAJOR_VERSION), + ISIS_HOME_DIRECTORY("isis.home.directory", n("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + ISIS_FISH_MAJOR_VERSION + "-rc"), COMPILATION_DIRECTORY("compilation.directory", n("isisfish.config.main.compileDirectory.description"), "${isis.home.directory}" + File.separator + "isis-build"), MONITORING_DIRECTORY("monitoring.directory", n("isisfish.config.main.monitoringDirectory.description"), "${isis.home.directory}" + File.separator + "isis-monitoring"), JAVADOC_DIRECTORY("javadoc.directory", n("isisfish.config.main.javadocDirectory.description"), "${isis.home.directory}" + File.separator + "isis-docs"),

1 0

r4286 - trunk/src/test/java/fr/ifremer/isisfish/ui
by echatellier＠users.forge.codelutin.com 23 Jun '15

23 Jun '15

Author: echatellier Date: 2015-06-23 15:06:36 +0000 (Tue, 23 Jun 2015) New Revision: 4286 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4286 Log: Restore assume Modified: trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractAssertjIT.java Modified: trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractAssertjIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractAssertjIT.java 2015-06-23 14:46:50 UTC (rev 4285) +++ trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractAssertjIT.java 2015-06-23 15:06:36 UTC (rev 4286) @@ -30,6 +30,7 @@ import org.assertj.swing.exception.WaitTimedOutError; import org.assertj.swing.fixture.FrameFixture; import org.junit.After; +import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; @@ -47,7 +48,7 @@ @BeforeClass public static void setUpOnce() throws Exception { - //Assume.assumeTrue(!java.awt.GraphicsEnvironment.isHeadless()); + Assume.assumeTrue(!java.awt.GraphicsEnvironment.isHeadless()); FailOnThreadViolationRepaintManager.install(); }

1 0

r4285 - in trunk/src: main/java/fr/ifremer/isisfish/datastore/migration main/resources test/resources/test-database/scripts
by echatellier＠users.forge.codelutin.com 23 Jun '15

23 Jun '15

Author: echatellier Date: 2015-06-23 14:46:50 +0000 (Tue, 23 Jun 2015) New Revision: 4285 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4285 Log: Fix tests Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java trunk/src/main/resources/sensitivity.properties trunk/src/test/resources/test-database/scripts/SiMatrix.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2015-06-23 14:46:29 UTC (rev 4284) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2015-06-23 14:46:50 UTC (rev 4285) @@ -178,10 +178,6 @@ } } } - - // migration v 4.1.2 (resuppression des colunnes pour que la suite de la migration soit cohérente) - tx.executeSQL("alter table POPULATION drop column fbargroupmin"); - tx.executeSQL("alter table POPULATION drop column fbargroupmax"); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-06-23 14:46:29 UTC (rev 4284) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-06-23 14:46:50 UTC (rev 4285) @@ -63,6 +63,10 @@ List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + // relicat de la migration depuis la version MigrationV33V40 + tx.executeSQL("alter table POPULATION drop column IF EXISTS fbargroupmin;"); + tx.executeSQL("alter table POPULATION drop column IF EXISTS fbargroupmax;"); + // add recruitment equation tx.executeSQL("alter table POPULATION add column IF NOT EXISTS RecruitmentEQUATION VARCHAR(255);"); // add abundanceReferenceMonth field Modified: trunk/src/main/resources/sensitivity.properties =================================================================== --- trunk/src/main/resources/sensitivity.properties 2015-06-23 14:46:29 UTC (rev 4284) +++ trunk/src/main/resources/sensitivity.properties 2015-06-23 14:46:50 UTC (rev 4285) @@ -38,8 +38,8 @@ Gear.standardisationFactor Metier.gearParameterValue Population.capturability -Population.groupMax -Population.groupMin +Population.fbarGroupMax +Population.fbarGroupMin Population.growth Population.growthReverse Population.mappingZoneReproZoneRecru Modified: trunk/src/test/resources/test-database/scripts/SiMatrix.java =================================================================== --- trunk/src/test/resources/test-database/scripts/SiMatrix.java 2015-06-23 14:46:29 UTC (rev 4284) +++ trunk/src/test/resources/test-database/scripts/SiMatrix.java 2015-06-23 14:46:50 UTC (rev 4285) @@ -1980,8 +1980,8 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); - int groupMin = pop.getGroupMin(); - int groupMax = pop.getGroupMax(); + int groupMin = pop.getFbarGroupMin(); + int groupMax = pop.getFbarGroupMax(); int Nbre = (int)groupMax - (int)groupMin + 1; //log.info("Nbre = " + Nbre);

1 0