Author: echatellier Date: 2014-04-10 17:53:28 +0200 (Thu, 10 Apr 2014) New Revision: 3945 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3945 Log: Remove _ use in scripts Modified: branches/4.0.1/src/main/resources/templates/script/equation.ftl branches/4.0.1/src/main/resources/templates/script/export.ftl branches/4.0.1/src/main/resources/templates/script/objective.ftl branches/4.0.1/src/main/resources/templates/script/optimization.ftl branches/4.0.1/src/main/resources/templates/script/rule.ftl branches/4.0.1/src/main/resources/templates/script/script.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl branches/4.0.1/src/main/resources/templates/script/simulator.ftl Modified: branches/4.0.1/src/main/resources/templates/script/equation.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/equation.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/equation.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 Modified: branches/4.0.1/src/main/resources/templates/script/export.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/export.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/export.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -47,7 +47,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; import org.nuiton.math.matrix.*; import scripts.ResultName; @@ -94,7 +93,7 @@ } public String getDescription() { - return _("TODO export description"); + return "TODO export description"; } public void export(SimulationStorage simulation, Writer out) throws Exception { Modified: branches/4.0.1/src/main/resources/templates/script/objective.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/objective.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/objective.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -42,8 +42,6 @@ package objectives; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,7 +92,7 @@ @Override public String getDescription() throws Exception { // TODO change description - return _("TODO ${name} description plan"); + return "TODO ${name} description plan"; } /** Modified: branches/4.0.1/src/main/resources/templates/script/optimization.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/optimization.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/optimization.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -42,8 +42,6 @@ package optimizations; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,7 +92,7 @@ @Override public String getDescription() throws Exception { // TODO change description - return _("TODO ${name} description plan"); + return "TODO ${name} description plan"; } /** Modified: branches/4.0.1/src/main/resources/templates/script/rule.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/rule.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/rule.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -42,8 +42,6 @@ package rules; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -93,7 +91,7 @@ */ public String getDescription() throws Exception { // TODO - return _("TODO description rule"); + return "TODO description rule"; } /** Modified: branches/4.0.1/src/main/resources/templates/script/script.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/script.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/script.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -42,8 +42,6 @@ package sensitivityanalysis; -import static org.nuiton.i18n.I18n._; - import java.util.List; import org.apache.commons.logging.Log; @@ -82,7 +80,7 @@ */ public String getDescription() { // TODO change descrition - return _("TODO ${name} description plan"); + return "TODO ${name} description plan"; } /** @@ -102,7 +100,7 @@ * scenarios à prendre en compte pour les simulations. * * @param plan plan a analyser - * @param outputdirectory master sensitivity export directory + * @param outputDirectory master sensitivity export directory * * @return un {@link SensitivityScenarios} * @throws SensitivityException if calculator impl fail to execute @@ -111,7 +109,7 @@ * @see Scenario * @see SensitivityScenarios */ - public SensitivityScenarios compute(DesignPlan plan, File outputdirectory) + public SensitivityScenarios compute(DesignPlan plan, File outputDirectory) throws SensitivityException { SensitivityScenarios sensitivityScenarios = new SensitivityScenarios(); @@ -128,14 +126,14 @@ * @param simulationStorages * ensemble des {@link SimulationStorage} qui ont résultés des * simulations - * @param outputdirectory master sensitivity export directory + * @param outputDirectory master sensitivity export directory * @throws SensitivityException * if calculator impl fail to execute * * @see SensitivityScenarios */ public void analyzeResult(List<SimulationStorage> simulationStorages, - File outputdirectory) throws SensitivityException { + File outputDirectory) throws SensitivityException { } } Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -47,7 +47,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; import org.nuiton.math.matrix.*; import scripts.ResultName; @@ -94,7 +93,7 @@ } public String getDescription() { - return _("TODO export description"); + return "TODO export description"; } public void export(SimulationStorage simulation, Writer out) throws Exception { Modified: branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -42,8 +42,6 @@ package simulationplans; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -99,7 +97,7 @@ @Override public String getDescription() throws Exception { // TODO change description - return _("TODO ${name} description plan"); + return "TODO ${name} description plan"; } /** Modified: branches/4.0.1/src/main/resources/templates/script/simulator.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2014-04-10 15:42:42 UTC (rev 3944) +++ branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2014-04-10 15:53:28 UTC (rev 3945) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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