Author: echatellier Date: 2014-03-21 10:30:13 +0100 (Fri, 21 Mar 2014) New Revision: 3902 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3902 Log: refs #4803: Refactoring des noms le package/classes Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationMethodUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationUI.jaxx Removed: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationMethodUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationUI.jaxx Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2014-03-21 09:29:21 UTC (rev 3901) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2014-03-21 09:30:13 UTC (rev 3902) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2006 - 2010 Ifremer, Code Lutin + Copyright (C) 2006 - 2014 Ifremer, Code Lutin, 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 @@ -30,7 +30,7 @@ fr.ifremer.isisfish.ui.input.InputSaveVerifier fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier fr.ifremer.isisfish.ui.sensitivity.SensitivityInputHandler - fr.ifremer.isisfish.ui.calibration.CalibrationHandler + fr.ifremer.isisfish.ui.optimization.OptimizationHandler javax.swing.ImageIcon </import> @@ -60,8 +60,8 @@ constructorParams='new JAXXInitialContext().add(new InputAction()).add(new SensitivitySaveVerifier()).add(new SimulAction()).add(new SensitivityInputHandler()).add(this)' /> </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/SimulationLauncher.gif"))}'> - <fr.ifremer.isisfish.ui.calibration.CalibrationUI id="calibrationUI" - constructorParams='new JAXXInitialContext().add(new InputAction()).add(new SensitivitySaveVerifier()).add(new SimulAction()).add(new CalibrationHandler()).add(this)' /> + <fr.ifremer.isisfish.ui.optimization.OptimizationUI id="optimizationUI" + constructorParams='new JAXXInitialContext().add(new InputAction()).add(new SensitivitySaveVerifier()).add(new SimulAction()).add(new OptimizationHandler()).add(this)' /> </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'> <fr.ifremer.isisfish.ui.result.ResultUI /> Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java 2014-03-19 09:16:24 UTC (rev 3892) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationHandler.java 2014-03-21 09:30:13 UTC (rev 3902) @@ -1,51 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2013 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.ui.calibration; - -import javax.swing.DefaultComboBoxModel; -import javax.swing.DefaultListModel; - -import fr.ifremer.isisfish.ui.input.InputHandler; - -public class CalibrationHandler extends InputHandler { - - public void init(CalibrationMethodUI view) { - DefaultComboBoxModel<String> methodModel = new DefaultComboBoxModel<String>(); - methodModel.addElement("Simplex"); - methodModel.addElement("ABC"); - methodModel.addElement("Génétique"); - view.getFieldCalibrationMethodSelect().setModel(methodModel); - - DefaultListModel<String> objectiveModel = new DefaultListModel<String>(); - objectiveModel.addElement("Moindres carrés indice abondance"); - objectiveModel.addElement("Moindres carrés debarquements par flottille"); - view.getAvailableCalibrationObjectives().setModel(objectiveModel); - - DefaultComboBoxModel<String> criteriaModel = new DefaultComboBoxModel<String>(); - criteriaModel.addElement("Min"); - criteriaModel.addElement("Max"); - criteriaModel.addElement("Seuil à dépasser"); - criteriaModel.addElement("Epsilon"); - view.getFieldCalibrationCriteriaSelect().setModel(criteriaModel); - } -} Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationMethodUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx 2014-03-19 09:16:24 UTC (rev 3892) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationMethodUI.jaxx 2014-03-21 09:30:13 UTC (rev 3902) @@ -1,120 +0,0 @@ -<!-- - #%L - IsisFish - - $Id$ - $HeadURL$ - %% - Copyright (C) 2013 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% - --> -<Table> - <import> - java.awt.CardLayout - javax.swing.ComboBoxModel - javax.swing.table.DefaultTableModel - </import> - - <script><![CDATA[ - protected void $afterCompleteSetup() { - getContextValue(CalibrationHandler.class).init(this); - } - ]]></script> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.calibration.select"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldCalibrationMethodSelect" /> - </cell> - </row> - <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="simulCalibrationMethodParam" rowHeight='24' /> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> - <JPanel id="factorCardinalityPanel" layout="{new CardLayout()}"> - <JLabel text="isisfish.calibration.methodfactorsupported" horizontalAlignment="center" - border="{BorderFactory.createEtchedBorder()}" font-style="italic" constraints='"factorCardinalitySupported"'/> - <JScrollPane id="factorCardinalityScrollPane" constraints='"factorCardinalityNotSupported"'> - <JTable id="factorCardinality" rowHeight='24' /> - </JScrollPane> - </JPanel> - </cell> - </row> - <row> - <cell fill="both" columns='3' weightx="1.0"> - <JLabel text="isisfish.calibration.objectives"/> - </cell> - </row> - <row> - <cell columns='2' fill="both" weightx="1.0" weighty="1.0"> - <Table> - <row> - <cell fill="both" weightx="0.5" weighty="1.0"> - <JScrollPane> - <JList id="availableCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> - </JScrollPane> - </cell> - <cell fill="both" weighty="1.0"> - <Table> - <row> - <cell fill="both"> - <JButton id="addObjectiveButton" text="isisfish.common.add" enabled="false" /> - </cell> - </row> - <row> - <cell fill="both"> - <JButton id="removeObjectiveButton" text="isisfish.common.remove" enabled="false" /> - </cell> - </row> - <row> - <cell fill="both"> - <JButton id="clearObjectiveButton" text="isisfish.common.clear" enabled="false" /> - </cell> - </row> - </Table> - </cell> - <cell fill="both" weightx="0.5" weighty="1.0"> - <JScrollPane> - <JList id="selectedCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> - </JScrollPane> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell fill="both" columns='2' weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="objectiveParamsTable" rowHeight='24' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.calibration.optimization"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldCalibrationCriteriaSelect" /> - </cell> - </row> -</Table> Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationUI.jaxx 2014-03-19 09:16:24 UTC (rev 3892) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/CalibrationUI.jaxx 2014-03-21 09:30:13 UTC (rev 3902) @@ -1,98 +0,0 @@ -<!-- - #%L - IsisFish - - $Id$ - $HeadURL$ - %% - Copyright (C) 2013 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% - --> -<fr.ifremer.isisfish.ui.SimulationUI> - - <import> - fr.ifremer.isisfish.ui.input.InputAction - jaxx.runtime.JAXXContext - jaxx.runtime.context.JAXXInitialContext - jaxx.runtime.SwingUtil - </import> - - <script><![CDATA[ - protected void $afterCompleteSetup() { - SwingUtil.getLayer(bodyTabbedPane).setUI(dummyLayer); - } - - /** - * Refresh all simulation launch UI. - */ - @Override - protected void regionStorageChanged() { - - } - - @Override - public void refresh() { - - } - - @Override - public void selectParametersTab() { - - } - - @Override - public void setEnabledPrescriptTab(boolean selected) { - // no prescript in AS - } - - @Override - public void setEnabledSimulationPlanTab(boolean selected) { - // no simulation plan in AS - } - - @Override - public void refreshFactorTree() { - - } - ]]></script> - - <CalibrationHandler id="handler" /> - - <fr.ifremer.isisfish.ui.widget.DummyLayerUI id="dummyLayer" /> - <JTabbedPane id="bodyTabbedPane"> - <tab title='isisfish.params.title'> - <fr.ifremer.isisfish.ui.simulator.ParamsUI id='paramsUI' sensitivity='true' regionStorage="{getRegionStorage()}" - constructorParams='new JAXXInitialContext().add(new InputAction()).add("SimulationUI", this).add(this)' /> - </tab> - <tab title='isisfish.sensitivity.title'> - <fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI id="sensitivityTabUI" - constructorParams='new JAXXInitialContext().add(new InputAction()).add("SimulationUI", this).add(this)' /> - </tab> - <tab title='isisfish.calibration.title'> - <CalibrationMethodUI id="calibrationMethodUI" constructorParams='this'/> - </tab> - <tab title='isisfish.export.title'> - <fr.ifremer.isisfish.ui.simulator.ExportUI id="exportUI" constructorParams='this'/> - </tab> - <tab title='isisfish.resultChoice.title'> - <fr.ifremer.isisfish.ui.simulator.ResultChoiceUI id="resultChoiceUI" constructorParams='this'/> - </tab> - <tab title='isisfish.advancedParameters.title'> - <fr.ifremer.isisfish.ui.simulator.AdvancedParamsUI id="advancedParamsUI" constructorParams='this'/> - </tab> - </JTabbedPane> -</fr.ifremer.isisfish.ui.SimulationUI> Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationHandler.java (from rev 3892, branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationHandler.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationHandler.java 2014-03-21 09:30:13 UTC (rev 3902) @@ -0,0 +1,51 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 - 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 + * 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.ui.optimization; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; + +import fr.ifremer.isisfish.ui.input.InputHandler; + +public class OptimizationHandler extends InputHandler { + + public void init(OptimizationMethodUI view) { + DefaultComboBoxModel<String> methodModel = new DefaultComboBoxModel<String>(); + methodModel.addElement("Simplex"); + methodModel.addElement("ABC"); + methodModel.addElement("Génétique"); + view.getFieldOptimizationMethodSelect().setModel(methodModel); + + DefaultListModel<String> objectiveModel = new DefaultListModel<String>(); + objectiveModel.addElement("Moindres carrés indice abondance"); + objectiveModel.addElement("Moindres carrés debarquements par flottille"); + view.getAvailableOptimizationObjectives().setModel(objectiveModel); + + DefaultComboBoxModel<String> criteriaModel = new DefaultComboBoxModel<String>(); + criteriaModel.addElement("Min"); + criteriaModel.addElement("Max"); + criteriaModel.addElement("Seuil à dépasser"); + criteriaModel.addElement("Epsilon"); + view.getFieldOptimizationCriteriaSelect().setModel(criteriaModel); + } +} Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationMethodUI.jaxx (from rev 3892, branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationMethodUI.jaxx (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationMethodUI.jaxx 2014-03-21 09:30:13 UTC (rev 3902) @@ -0,0 +1,120 @@ +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2013 - 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 + 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% + --> +<Table> + <import> + java.awt.CardLayout + javax.swing.ComboBoxModel + javax.swing.table.DefaultTableModel + </import> + + <script><![CDATA[ + protected void $afterCompleteSetup() { + getContextValue(OptimizationHandler.class).init(this); + } + ]]></script> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.optimization.select"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JComboBox id="fieldOptimizationMethodSelect" /> + </cell> + </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="simulOptimizationMethodParam" rowHeight='24' /> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <JPanel id="factorCardinalityPanel" layout="{new CardLayout()}"> + <JLabel text="isisfish.optimization.methodfactorsupported" horizontalAlignment="center" + border="{BorderFactory.createEtchedBorder()}" font-style="italic" constraints='"factorCardinalitySupported"'/> + <JScrollPane id="factorCardinalityScrollPane" constraints='"factorCardinalityNotSupported"'> + <JTable id="factorCardinality" rowHeight='24' /> + </JScrollPane> + </JPanel> + </cell> + </row> + <row> + <cell fill="both" columns='3' weightx="1.0"> + <JLabel text="isisfish.optimization.objectives"/> + </cell> + </row> + <row> + <cell columns='2' fill="both" weightx="1.0" weighty="1.0"> + <Table> + <row> + <cell fill="both" weightx="0.5" weighty="1.0"> + <JScrollPane> + <JList id="availableOptimizationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> + </JScrollPane> + </cell> + <cell fill="both" weighty="1.0"> + <Table> + <row> + <cell fill="both"> + <JButton id="addObjectiveButton" text="isisfish.common.add" enabled="false" /> + </cell> + </row> + <row> + <cell fill="both"> + <JButton id="removeObjectiveButton" text="isisfish.common.remove" enabled="false" /> + </cell> + </row> + <row> + <cell fill="both"> + <JButton id="clearObjectiveButton" text="isisfish.common.clear" enabled="false" /> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weightx="0.5" weighty="1.0"> + <JScrollPane> + <JList id="selectedOptimizationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="both" columns='2' weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="objectiveParamsTable" rowHeight='24' /> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.optimization.optimization"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JComboBox id="fieldOptimizationCriteriaSelect" /> + </cell> + </row> +</Table> Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationUI.jaxx (from rev 3892, branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationUI.jaxx) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationUI.jaxx (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationUI.jaxx 2014-03-21 09:30:13 UTC (rev 3902) @@ -0,0 +1,98 @@ +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2013 - 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 + 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% + --> +<fr.ifremer.isisfish.ui.SimulationUI> + + <import> + fr.ifremer.isisfish.ui.input.InputAction + jaxx.runtime.JAXXContext + jaxx.runtime.context.JAXXInitialContext + jaxx.runtime.SwingUtil + </import> + + <script><![CDATA[ + protected void $afterCompleteSetup() { + SwingUtil.getLayer(bodyTabbedPane).setUI(dummyLayer); + } + + /** + * Refresh all simulation launch UI. + */ + @Override + protected void regionStorageChanged() { + + } + + @Override + public void refresh() { + + } + + @Override + public void selectParametersTab() { + + } + + @Override + public void setEnabledPrescriptTab(boolean selected) { + // no prescript in AS + } + + @Override + public void setEnabledSimulationPlanTab(boolean selected) { + // no simulation plan in AS + } + + @Override + public void refreshFactorTree() { + + } + ]]></script> + + <OptimizationHandler id="handler" /> + + <fr.ifremer.isisfish.ui.widget.DummyLayerUI id="dummyLayer" /> + <JTabbedPane id="bodyTabbedPane"> + <tab title='isisfish.params.title'> + <fr.ifremer.isisfish.ui.simulator.ParamsUI id='paramsUI' sensitivity='true' regionStorage="{getRegionStorage()}" + constructorParams='new JAXXInitialContext().add(new InputAction()).add("SimulationUI", this).add(this)' /> + </tab> + <tab title='isisfish.sensitivity.title'> + <fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI id="sensitivityTabUI" + constructorParams='new JAXXInitialContext().add(new InputAction()).add("SimulationUI", this).add(this)' /> + </tab> + <tab title='isisfish.optimization.title'> + <OptimizationMethodUI id="optimizationMethodUI" constructorParams='this'/> + </tab> + <tab title='isisfish.export.title'> + <fr.ifremer.isisfish.ui.simulator.ExportUI id="exportUI" constructorParams='this'/> + </tab> + <tab title='isisfish.resultChoice.title'> + <fr.ifremer.isisfish.ui.simulator.ResultChoiceUI id="resultChoiceUI" constructorParams='this'/> + </tab> + <tab title='isisfish.advancedParameters.title'> + <fr.ifremer.isisfish.ui.simulator.AdvancedParamsUI id="advancedParamsUI" constructorParams='this'/> + </tab> + </JTabbedPane> +</fr.ifremer.isisfish.ui.SimulationUI> Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-03-21 09:29:21 UTC (rev 3901) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-03-21 09:30:13 UTC (rev 3902) @@ -98,11 +98,6 @@ isisfish.advancedParams.simulationCache=Simulation cache isisfish.advancedParams.simulationStatistique=Simulation statistics isisfish.advancedParams.simulatorUse=Simulator to Use -isisfish.calibration.methodfactorsupported= -isisfish.calibration.objectives= -isisfish.calibration.optimization= -isisfish.calibration.select= -isisfish.calibration.title= isisfish.cell.comments=Comments isisfish.cell.land=Land isisfish.cell.latitude=Latitude @@ -656,6 +651,11 @@ isisfish.month.november=november isisfish.month.october=october isisfish.month.september=september +isisfish.optimization.methodfactorsupported= +isisfish.optimization.objectives= +isisfish.optimization.optimization= +isisfish.optimization.select= +isisfish.optimization.title= isisfish.params.changeLogLev=Change from level '%1$s' to level '%2$s' isisfish.params.description=Description isisfish.params.loadOldSimulation=Load old simulation Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-03-21 09:29:21 UTC (rev 3901) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-03-21 09:30:13 UTC (rev 3902) @@ -98,11 +98,6 @@ isisfish.advancedParams.simulationCache=Simulation cache isisfish.advancedParams.simulationStatistique=Simulation statistique isisfish.advancedParams.simulatorUse=Simulateur à utiliser -isisfish.calibration.methodfactorsupported=La méthode de calibration choisie gère les cardinalités des facteurs -isisfish.calibration.objectives=Fonctions d'objectif -isisfish.calibration.optimization=Critère d'optimisation -isisfish.calibration.select=Méthode de calibration -isisfish.calibration.title=Calibration isisfish.cell.comments=Commentaires isisfish.cell.land=Terre isisfish.cell.latitude=Latitude @@ -656,6 +651,11 @@ isisfish.month.november=novembre isisfish.month.october=octobre isisfish.month.september=septembre +isisfish.optimization.methodfactorsupported=La méthode de calibration choisie gère les cardinalités des facteurs +isisfish.optimization.objectives=Fonctions d'objectif +isisfish.optimization.optimization=Critère d'optimisation +isisfish.optimization.select=Méthode de calibration +isisfish.optimization.title=Calibration isisfish.params.changeLogLev=Passe du niveau '%1$s' au niveau '%2$s' isisfish.params.description=Description isisfish.params.loadOldSimulation=Charger une ancienne simulation