Author: echatellier Date: 2015-01-05 16:13:05 +0000 (Mon, 05 Jan 2015) New Revision: 4170 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4170 Log: Fix tests Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java trunk/src/main/resources/templates/script/exportStep.ftl Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,6 +1,28 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * 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% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; import java.util.ArrayList; import java.util.HashMap; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * 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% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import java.util.List; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * 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% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; /** Modified: trunk/src/main/resources/templates/script/exportStep.ftl =================================================================== --- trunk/src/main/resources/templates/script/exportStep.ftl 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/resources/templates/script/exportStep.ftl 2015-01-05 16:13:05 UTC (rev 4170) @@ -5,7 +5,7 @@ $Id: export.ftl 4156 2014-12-09 11:27:18Z echatellier $ $HeadURL: http://svn.forge.codelutin.com/svn/isis-fish/trunk/src/main/resources/templa... $ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2014 - 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 @@ -56,6 +56,7 @@ import fr.ifremer.isisfish.export.ExportStep; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.types.TimeStep; /** * ${name}.java