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

r3914 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 02 Apr '14

02 Apr '14

Author: echatellier Date: 2014-04-02 11:42:00 +0200 (Wed, 02 Apr 2014) New Revision: 3914 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3914 Log: Fix caparmor job pattern Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2014-04-01 16:27:53 UTC (rev 3913) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2014-04-02 09:42:00 UTC (rev 3914) @@ -1172,8 +1172,8 @@ } String out = output.toString(); - // multiple jobs id are like : 78600[].service4 - if (out.trim().matches("\\d+\\.\\[\\]\\w+") && log.isInfoEnabled()) { + // multiple jobs id are like : 78600[].service4 ou 6199230.service0 + if (out.trim().matches("\\d+(\\[\\])?\\.\\w+") && log.isInfoEnabled()) { log.info("Job submitted with job id : " + out); } }

1 0

r3913 - in branches/4.0.1/src/main: java/fr/ifremer/isisfish/ui/config java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/input/variable java/fr/ifremer/isisfish/ui/result java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/vcs java/fr/ifremer/isisfish/ui/widget/filter resources/i18n
by echatellier＠users.forge.codelutin.com 01 Apr '14

01 Apr '14

Author: echatellier Date: 2014-04-01 18:27:53 +0200 (Tue, 01 Apr 2014) New Revision: 3913 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3913 Log: Finish i18n migration Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 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 @@ -35,7 +35,7 @@ ]]></script> - <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.connection"))}' + <Table border='{BorderFactory.createTitledBorder(t("isisfish.simulator.ssh.configuration.connection"))}' fill='horizontal'> <row> <cell> @@ -70,7 +70,7 @@ </cell> </row> </Table> - <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.environment"))}'> + <Table border='{BorderFactory.createTitledBorder(t("isisfish.simulator.ssh.configuration.environment"))}'> <row fill='horizontal'> <cell> <JLabel id='sshUserhomeLabel' text='isisfish.config.main.simulation.ssh.userhome' @@ -194,7 +194,7 @@ </cell> </row> </Table> - <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.status"))}'> + <Table border='{BorderFactory.createTitledBorder(t("isisfish.simulator.ssh.configuration.status"))}'> <row fill='horizontal'> <cell columns="2" fill='horizontal'> <JLabel id='messageLabel' text=' ' font-weight='bold' opaque='true' horizontalAlignment='center' Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -28,7 +28,7 @@ <fr.ifremer.isisfish.entities.Cell id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n java.awt.event.MouseEvent; fr.ifremer.isisfish.entities.Cell; com.bbn.openmap.gui.Tool; @@ -54,8 +54,8 @@ boolean cellChanged = true; protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continueZones")); - setNextPath(n_("isisfish.input.tree.zones")); + setButtonTitle(t("isisfish.input.continueZones")); + setNextPath(n("isisfish.input.tree.zones")); new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -148,7 +148,7 @@ </JScrollPane> </cell> <cell columns='2' fill='both' weightx='1.0'> - <Table border='{BorderFactory.createTitledBorder(_("isisfish.effortDescription.effortTitle"))}'> + <Table border='{BorderFactory.createTitledBorder(t("isisfish.effortDescription.effortTitle"))}'> <row> <cell anchor='east'> <JLabel text="isisfish.effortDescription.fishingOperation" enabled='{getEffortDescription() != null}'/> @@ -193,7 +193,7 @@ </row> <row> <cell columns='2' fill='both' weighty='1.0'> - <Table anchor='north' fill='both' weighty='1.0' border='{BorderFactory.createTitledBorder(_("isisfish.effortDescription.economicTitle"))}'> + <Table anchor='north' fill='both' weighty='1.0' border='{BorderFactory.createTitledBorder(t("isisfish.effortDescription.economicTitle"))}'> <row> <cell anchor='east' fill='none' weighty='0.0'> <JLabel text="isisfish.effortDescription.crewSize" enabled='{getEffortDescription() != null}'/> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -28,7 +28,7 @@ <fr.ifremer.isisfish.entities.FisheryRegion id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n fr.ifremer.isisfish.entities.FisheryRegion; fr.ifremer.isisfish.map.CopyMapToClipboardListener; com.bbn.openmap.gui.Tool; @@ -55,8 +55,8 @@ // add copy to clipboard support cellMap.addMapMouseListener(new CopyMapToClipboardListener(cellMap)); - setButtonTitle(_("isisfish.input.continueCells")); - setNextPath(n_("isisfish.input.tree.cells")); + setButtonTitle(t("isisfish.input.continueCells")); + setNextPath(n("isisfish.input.tree.cells")); addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -119,11 +119,11 @@ protected void check() { getContextValue(InputAction.class).checkFisheryRegion(getBean()); - setInfoText(_("isisfish.message.check.finished")); + setInfoText(t("isisfish.message.check.finished")); } protected void save() { - setInfoText(_("isisfish.message.checking.cell")); + setInfoText(t("isisfish.message.checking.cell")); // this make save done by verifier instead of saveFisheryRegion // and refresh tree is not working @@ -136,7 +136,7 @@ InputUI inputUI = getParentContainer(InputUI.class); inputUI.getHandler().reloadFisheryTree(inputUI); - setInfoText(_("isisfish.message.save.finished")); + setInfoText(t("isisfish.message.save.finished")); } ]]></script> <JPanel id="body"> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -27,15 +27,15 @@ <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; </import> <script><![CDATA[ protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continueMetiers")); - setNextPath(n_("isisfish.input.tree.metiers")); + setButtonTitle(t("isisfish.input.continueMetiers")); + setNextPath(n("isisfish.input.tree.metiers")); addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -154,7 +154,7 @@ // TODO binding don't work if (getText() == null) { - setText(_("isisfish.common.equation")); + setText(t("isisfish.common.equation")); } editor.getCurrentEditor().removeDocumentListener(listener); @@ -199,7 +199,7 @@ protected void saveModel() { getContextValue(InputAction.class).saveAsModel(formuleCategory, "Java", editor.getText()); setComboModel(); - setInfoText(_("isisfish.message.saveModel.finished")); + setInfoText(t("isisfish.message.saveModel.finished")); } /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -27,14 +27,14 @@ <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n._ - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.t + static org.nuiton.i18n.I18n.n </import> <script><![CDATA[ protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continueTripTypes")); - setNextPath(n_("isisfish.input.tree.triptypes")); + setButtonTitle(t("isisfish.input.continueTripTypes")); + setNextPath(n("isisfish.input.tree.triptypes")); // install change listener // (depends on sensitivity can't be done on constructor) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -82,8 +82,8 @@ */ protected void createGroups() { - int response = JOptionPane.showConfirmDialog(this, _("isisfish.populationBasics.confirmCreateGroups"), - _("isisfish.common.confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + int response = JOptionPane.showConfirmDialog(this, t("isisfish.populationBasics.confirmCreateGroups"), + t("isisfish.common.confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.YES_OPTION) { JFrame wizardFrame = new JFrame(); @@ -91,7 +91,7 @@ WizardGroupCreationUI wizard = new WizardGroupCreationUI(this); wizard.init(this); wizardFrame.add(wizard, BorderLayout.CENTER); - wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title")); + wizardFrame.setTitle(t("isisfish.wizardGroupCreation.title")); Species species = getBean().getSpecies(); wizard.setAgeType(species.getAgeGroupType()); if (wizard.isAgeType()) { @@ -129,7 +129,7 @@ // create node and select it Population population = getContextValue(InputAction.class).createPopulation(getTopiaContext(), species); inputUI.getHandler().insertTreeNode(inputUI, Population.class, population); - setInfoText(_("isisfish.message.creation.finished")); + setInfoText(t("isisfish.message.creation.finished")); } ]]> </script> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -163,17 +163,17 @@ <cell columns='2' fill='both' weightx='1.0' weighty='0.7'> <JPanel id="hidablePanel" layout='{new CardLayout()}'> <JTabbedPane id="fieldUseMatrix" constraints='"fieldUseMatrix"' enabled='{getPopInfo() != null}'> - <tab title='{_("isisfish.populationMigrationMigration.title")}'> + <tab title='{t("isisfish.populationMigrationMigration.title")}'> <PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' bean="{getBean()}" popInfo="{getPopInfo()}" active="{isActive() && getPopInfo() != null}" _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"MigrationMatrix"' /> </tab> - <tab title='{_("isisfish.populationMigrationImmigration.title")}'> + <tab title='{t("isisfish.populationMigrationImmigration.title")}'> <PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' bean="{getBean()}" popInfo="{getPopInfo()}" active="{isActive() && getPopInfo() != null}" _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"ImmigrationMatrix"' /> </tab> - <tab title='{_("isisfish.populationMigrationEmigration.title")}'> + <tab title='{t("isisfish.populationMigrationEmigration.title")}'> <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' bean="{getBean()}" popInfo="{getPopInfo()}" active="{isActive() && getPopInfo() != null}" _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"EmigrationMatrix"' /> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -77,7 +77,7 @@ if (log.isErrorEnabled()) { log.error("Can't (un)spacialize Matrix Change Of Group", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.spacializematrix"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.input.spacializematrix"), eee); } } @@ -98,7 +98,7 @@ } MatrixPanelEditor panel = new MatrixPanelEditor(false, 800, 300); panel.setMatrix(lengthChangeMatrix); - JOptionPane.showMessageDialog(this, panel, _("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(this, panel, t("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); } ]]></script> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -28,13 +28,13 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n </import> <script><![CDATA[ protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continueGears")); - setNextPath(n_("isisfish.input.tree.gears")); + setButtonTitle(t("isisfish.input.continueGears")); + setNextPath(n("isisfish.input.tree.gears")); // install change listener // (depends on sensitivity can't be done on constructor) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -28,7 +28,7 @@ <fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n fr.ifremer.isisfish.entities.Port fr.ifremer.isisfish.entities.Cell com.bbn.openmap.gui.Tool @@ -80,8 +80,8 @@ } }; - setButtonTitle(_("isisfish.input.continueSpecies")); - setNextPath(n_("isisfish.input.tree.species")); + setButtonTitle(t("isisfish.input.continueSpecies")); + setNextPath(n("isisfish.input.tree.species")); addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -27,13 +27,13 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n </import> <script><![CDATA[ protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continueStrategies")); - setNextPath(n_("isisfish.input.tree.strategies")); + setButtonTitle(t("isisfish.input.continueStrategies")); + setNextPath(n("isisfish.input.tree.strategies")); // install change listener // (depends on sensitivity can't be done on constructor) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -28,7 +28,7 @@ <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n fr.ifremer.isisfish.entities.Species; java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; @@ -42,7 +42,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continuePopulations")); + setButtonTitle(t("isisfish.input.continuePopulations")); addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -67,10 +67,10 @@ InputUI inputUI = getParentContainer(InputUI.class); if (inputUI != null) { if (getBean() == null) { - inputUI.getHandler().setTreeSelection(this, n_("isisfish.input.tree.species"), n_("isisfish.input.tree.populations")); + inputUI.getHandler().setTreeSelection(this, n("isisfish.input.tree.species"), n("isisfish.input.tree.populations")); } else { - inputUI.getHandler().setTreeSelection(this, getBean().getTopiaId(), n_("isisfish.input.tree.populations")); + inputUI.getHandler().setTreeSelection(this, getBean().getTopiaId(), n("isisfish.input.tree.populations")); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -43,7 +43,7 @@ org.apache.commons.lang3.StringUtils java.beans.PropertyChangeEvent java.beans.PropertyChangeListener - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t org.nuiton.math.matrix.gui.MatrixPanelEvent org.nuiton.math.matrix.MatrixND </import> @@ -193,55 +193,55 @@ <row> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJanuary' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo0()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.january"))}' /> + strategyMonthInfo="{getStrategyMonthInfo0()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.january"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyFebuary' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo1()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.february"))}' /> + strategyMonthInfo="{getStrategyMonthInfo1()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.february"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyMarch' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo2()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.march"))}' /> + strategyMonthInfo="{getStrategyMonthInfo2()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.march"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyApril' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo3()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.april"))}' /> + strategyMonthInfo="{getStrategyMonthInfo3()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.april"))}' /> </cell> </row> <row> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyMay' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo4()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.may"))}' /> + strategyMonthInfo="{getStrategyMonthInfo4()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.may"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJune' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo5()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.june"))}' /> + strategyMonthInfo="{getStrategyMonthInfo5()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.june"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJuly' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo6()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.july"))}' /> + strategyMonthInfo="{getStrategyMonthInfo6()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.july"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyAugust' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo7()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.august"))}' /> + strategyMonthInfo="{getStrategyMonthInfo7()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.august"))}' /> </cell> </row> <row> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategySeptember' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo8()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.september"))}' /> + strategyMonthInfo="{getStrategyMonthInfo8()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.september"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyOctober' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo9()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.october"))}' /> + strategyMonthInfo="{getStrategyMonthInfo9()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.october"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyNovember' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo10()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.november"))}' /> + strategyMonthInfo="{getStrategyMonthInfo10()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.november"))}' /> </cell> <cell fill='horizontal' weightx='1' insets='0'> <StrategyOneMonthInfoUI id='strategyDecember' bean="{getBean()}" active="{isActive()}" constructorParams='this' - strategyMonthInfo="{getStrategyMonthInfo11()}" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.december"))}' /> + strategyMonthInfo="{getStrategyMonthInfo11()}" strategieMonthText='{StringUtils.capitalize(t("isisfish.month.december"))}' /> </cell> </row> <row> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -28,7 +28,7 @@ <fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n fr.ifremer.isisfish.entities.TripType fr.ifremer.isisfish.types.TimeUnit java.beans.PropertyChangeEvent @@ -43,8 +43,8 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continueVesselTypes")); - setNextPath(n_("isisfish.input.tree.vesseltypes")); + setButtonTitle(t("isisfish.input.continueVesselTypes")); + setNextPath(n("isisfish.input.tree.vesseltypes")); addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -28,7 +28,7 @@ <fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n fr.ifremer.isisfish.entities.VesselType fr.ifremer.isisfish.entities.TripType fr.ifremer.isisfish.types.TimeUnit @@ -47,8 +47,8 @@ protected boolean init; protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continueSetOfVessels")); - setNextPath(n_("isisfish.input.tree.setofvessels")); + setButtonTitle(t("isisfish.input.continueSetOfVessels")); + setNextPath(n("isisfish.input.tree.setofvessels")); addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -270,10 +270,10 @@ int numberOfGroup = getNumberOfGroup(); double step = getGroupSize(); if (numberOfGroup < 0){ -// return new OutputView("Error.xml", "error", _("isisfish.error.number.classes.upper.zero")); +// return new OutputView("Error.xml", "error", t("isisfish.error.number.classes.upper.zero")); } if (step == 0){ -// return new OutputView("Error.xml", "error", _("isisfish.error.no.null.time.step")); +// return new OutputView("Error.xml", "error", t"isisfish.error.no.null.time.step")); } double maxLength = minLength; @@ -295,7 +295,7 @@ Equation equation = pop.getGrowth(); if(equation == null){ -// return new OutputView("Error.xml", "error", _("isisfish.error.growth.equation.before.create.group.population")); +// return new OutputView("Error.xml", "error", t("isisfish.error.growth.equation.before.create.group.population")); } double deltat = -1; double Lmin = minLength; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -27,13 +27,13 @@ <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n </import> <script><![CDATA[ protected void $afterCompleteSetup() { - setButtonTitle(_("isisfish.input.continuePorts")); - setNextPath(n_("isisfish.input.tree.ports")); + setButtonTitle(t("isisfish.input.continuePorts")); + setNextPath(n("isisfish.input.tree.ports")); // install change listener // (depends on sensitivity can't be done on constructor) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -52,7 +52,7 @@ <Table> <row> <cell fill="both" weightx='1.0' weighty='1.0'> - <Table border='{BorderFactory.createTitledBorder(_("isisfish.variables.variableslist"))}'> + <Table border='{BorderFactory.createTitledBorder(t("isisfish.variables.variableslist"))}'> <row> <cell fill="both" weightx='1.0' weighty='1.0'> <JScrollPane> @@ -73,7 +73,7 @@ </Table> </cell> <cell fill="both" weightx='3.0' weighty='1.0' rows="2"> - <Table border='{BorderFactory.createTitledBorder(_("isisfish.variables.variabledetail"))}'> + <Table border='{BorderFactory.createTitledBorder(t("isisfish.variables.variabledetail"))}'> <row> <cell fill="horizontal"> <JLabel text="isisfish.variables.entityname" Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -37,7 +37,7 @@  Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -91,7 +91,7 @@ Map<String, String> tagValues = getContextValue(SimulAction.class).getSimulationParameter().getTagValue(); // TODO make a table model for it - String columnName[] = { _("isisfish.common.tag"), _("isisfish.common.value")}; + String columnName[] = { t("isisfish.common.tag"), t("isisfish.common.value")}; if (tagValues != null) { DefaultTableModel model = new DefaultTableModel(columnName, tagValues.size()) { @Override @@ -212,7 +212,7 @@ </row> <row> <cell columns="5" fill="both" weighty="1" weightx="1"> - <Table border='{BorderFactory.createTitledBorder(_("isisfish.advancedParams.freeParameters"))}'> + <Table border='{BorderFactory.createTitledBorder(t("isisfish.advancedParams.freeParameters"))}'> <row> <cell fill="horizontal"> <JLabel text="isisfish.common.tag"/> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -87,7 +87,7 @@ getSimulAction().getSimulationParameter().setExportNames(exportNames); getSimulAction().saveExport(); - setInfoText(_("isisfish.export.saved")); + setInfoText(t("isisfish.export.saved")); } protected void setInfoText(String txt) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -114,14 +114,14 @@ log.debug(" selected " + selected); } if(selected != null && !selected.trim().isEmpty()) { - getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.loading.region")); + getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.loading.region")); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { simulAction.regionChange(ParamsUI.this, selected); refresh(); setSensitivityTabRegion(); - getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.region.loaded")); + getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.region.loaded")); } }); } @@ -176,7 +176,7 @@ final String selected = fieldSimulParamsSelect.getSelectedItem().toString(); // le premier item est " " pour ne pas avoir de selection par defaut if (selected != null && !selected.equals(" ")) { - getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.loading.old.simulation")); + getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.loading.old.simulation")); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { @@ -191,7 +191,7 @@ // regles ruleChooser.setRulesList(simulAction.getSimulationParameter().getRules()); - getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.old.simulation.loaded")); + getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.old.simulation.loaded")); } }); } @@ -327,7 +327,7 @@ <row> <cell fill="horizontal"> <JLabel id='lblName' - text='{isSensitivity() ? _("isisfish.params.sensitivityName") : _("isisfish.params.simulationName")}' + text='{isSensitivity() ? t("isisfish.params.sensitivityName") : t("isisfish.params.simulationName")}' minimumSize='{new Dimension(195,25)}' preferredSize='{new Dimension(195,25)}' /> </cell> @@ -403,7 +403,7 @@ <row> <cell columns="4" fill="both" weightx="1.0" weighty="0.6"> <JTabbedPane id="parametersTabbedPane" enabled="{getRegionStorage() != null}"> - <tab title='{_("isisfish.params.stategiesAndPopulations")}'> + <tab title='{t("isisfish.params.stategiesAndPopulations")}'> <Table> <row> <cell fill="horizontal"> @@ -453,7 +453,7 @@ </row> </Table> </tab> - <tab title='{_("isisfish.params.rules")}'> + <tab title='{t("isisfish.params.rules")}'> <Table> <row> <cell fill="both" weightx="1" weighty="1"> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -68,7 +68,7 @@ protected void saveConfigResultNames() { getContextValue(SimulAction.class).saveConfigurationResultNames(listResultNames.getSelectedValues()); - setStatusMessage(_("isisfish.resultChoice.saved")); + setStatusMessage(t("isisfish.resultChoice.saved")); } protected void setStatusMessage(String txt) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -76,9 +76,9 @@ StringBuilder builder = new StringBuilder(); builder.append("<a href='").append(DOC_URL).append("'>"); - builder.append(_("isisfish.vcs.howto.save.key")).append("</a><br/>"); + builder.append(t("isisfish.vcs.howto.save.key")).append("</a><br/>"); builder.append("<a href='").append(REGISTER_KEY_URL).append("'>"); - builder.append(_("isisfish.vcs.save.key")).append("</a>"); + builder.append(t("isisfish.vcs.save.key")).append("</a>"); helpEditor.setEditorKit(new HTMLEditorKit()); helpEditor.setText(builder.toString()); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2014-04-01 16:27:53 UTC (rev 3913) @@ -151,7 +151,7 @@ } protected void refreshResult() { if (model == null) return; - labelResult.setText(_("isisfish.filter.result.found", model.getNbResult(), model.getNbOriginal())); + labelResult.setText(t("isisfish.filter.result.found", model.getNbResult(), model.getNbOriginal())); if (getComboResult() != null) { if (modelResult == null) { 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-04-01 15:05:25 UTC (rev 3912) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-01 16:27:53 UTC (rev 3913) @@ -655,7 +655,9 @@ isisfish.month.september=september isisfish.optimisation.observation= isisfish.optimization.export= +isisfish.optimization.exports= isisfish.optimization.methodfactorsupported= +isisfish.optimization.objective= isisfish.optimization.objectives= isisfish.optimization.observation= isisfish.optimization.optimization=

1 0

r3912 - in branches/4.0.1: . src/main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com 01 Apr '14

01 Apr '14

Author: echatellier Date: 2014-04-01 17:05:25 +0200 (Tue, 01 Apr 2014) New Revision: 3912 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3912 Log: refs-50 #4288: Add rsyntaxtextarea Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-01 14:41:13 UTC (rev 3911) +++ branches/4.0.1/pom.xml 2014-04-01 15:05:25 UTC (rev 3912) @@ -103,7 +103,7 @@ <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> <version>2.5.0</version> - <scope>runtime</scope> + <scope>compile</scope> </dependency> <dependency> @@ -245,6 +245,13 @@ </dependency> <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.6</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> <version>5.0</version> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2014-04-01 15:05:25 UTC (rev 3912) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 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 @@ -41,9 +41,9 @@ simul.selTab(0); }*/ ]]></script> - <JScrollPane constraints='BorderLayout.CENTER'> - <JTextArea id="fieldSimulPreScript" onFocusLost='save()'/> - </JScrollPane> + <org.fife.ui.rtextarea.RTextScrollPane constraints='BorderLayout.CENTER'> + <org.fife.ui.rsyntaxtextarea.RSyntaxTextArea id="fieldSimulPreScript" syntaxEditingStyle="{org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_JAVA}" /> + </org.fife.ui.rtextarea.RTextScrollPane> <JButton constraints='BorderLayout.SOUTH' text="isisfish.preScript.backParameter" onActionPerformed='getParentContainer(fr.ifremer.isisfish.ui.SimulationUI.class).selectParametersTab()'/> </JPanel>

1 0

r3911 - in branches/4.0.1/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/models/common java/fr/ifremer/isisfish/ui/models/export java/fr/ifremer/isisfish/ui/models/optimization java/fr/ifremer/isisfish/ui/optimization java/fr/ifremer/isisfish/ui/result java/fr/ifremer/isisfish/ui/sensitivity java/fr/ifremer/isisfish/ui/simulator resources/i18n
by echatellier＠users.forge.codelutin.com 01 Apr '14

01 Apr '14

Author: echatellier Date: 2014-04-01 16:41:13 +0200 (Tue, 01 Apr 2014) New Revision: 3911 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3911 Log: ref #4803: Modification de l'interface pour les scripts de calibation Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/ExportObservationTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationMethodUI.out.xml Removed: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboModel.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 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 branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 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/input/InputHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -86,7 +86,7 @@ import fr.ifremer.isisfish.ui.input.tree.FisheryTreeRenderer; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeSelectionModel; import fr.ifremer.isisfish.ui.input.tree.loadors.PopulationsNodeLoador; -import fr.ifremer.isisfish.ui.models.common.StringComboModel; +import fr.ifremer.isisfish.ui.models.common.GenericComboModel; import fr.ifremer.isisfish.ui.sensitivity.wizard.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.wizard.SensitivityWizardHandler; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; @@ -251,7 +251,7 @@ */ protected void refreshRegionList(InputUI inputUI, String selectedItem) { // refresh region list - StringComboModel regionsModel = new StringComboModel(RegionStorage.getRegionNames()); + GenericComboModel regionsModel = new GenericComboModel(RegionStorage.getRegionNames()); inputUI.getFieldCurrentRegion().setModel(regionsModel); // event is fired by setSelectedItem to call #regionChange if (selectedItem != null) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 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 @@ -63,8 +63,8 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id="fieldCurrentRegion" onItemStateChanged='getHandler().regionChange(this, event)' - model='{new fr.ifremer.isisfish.ui.models.common.StringComboModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}'/> + <JComboBox id="fieldCurrentRegion" onItemStateChanged='getHandler().regionChange(this, event)' genericType="String" + model='{new fr.ifremer.isisfish.ui.models.common.GenericComboModel<String>(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}'/> </cell> </row> </Table> Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericComboModel.java (from rev 3910, branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericComboModel.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericComboModel.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -0,0 +1,117 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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.models.common; + +import java.util.List; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.JComboBox; + +/** + * Model pour pour la representation d'une liste de type generic. + * Utilisation dans les {@link JComboBox}. + * + * @param <E> generic type + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class GenericComboModel<E> extends DefaultComboBoxModel<E> { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + /** E list. */ + protected List<E> genericList; + + /** + * Empty constructor. + */ + public GenericComboModel() { + this(null); + } + + /** + * Constructor with export list. + * + * @param genericList E list + */ + public GenericComboModel(List<E> genericList) { + setGenericList(genericList); + } + + /** + * Get E list. + * + * @return E list + */ + public List<E> getGenericList() { + return genericList; + } + + /** + * Set E list. + * + * @param genericList E list to set + */ + public void setGenericList(List<E> genericList) { + this.genericList = genericList; + // reset selected + setSelectedItem(null); + } + + public void addElement(E elt) { + genericList.add(elt); + fireIntervalAdded(this, genericList.size() - 1, genericList.size()); + } + + public boolean containsElement(E elt) { + return genericList.contains(elt); + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public E getElementAt(int index) { + return genericList.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (genericList != null) { + size = genericList.size(); + } + return size; + } +} Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericListModel.java (from rev 3910, branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericListModel.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericListModel.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -0,0 +1,106 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.models.common; + +import java.util.List; + +import javax.swing.AbstractListModel; +import javax.swing.JList; + +/** + * Model pour pour la representation d'une liste de generic type. + * Utilisation dans les {@link JList}. + * + * @param <E> generic type + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class GenericListModel<E> extends AbstractListModel<E> { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + /** E list. */ + protected List<E> elementList; + + /** + * Empty constructor. + */ + public GenericListModel() { + this(null); + } + + /** + * Constructor with export list. + * + * @param elementList E list + */ + public GenericListModel(List<E> elementList) { + setElementList(elementList); + } + + /** + * Get E list. + * + * @return E list + */ + public List<E> getElementList() { + return elementList; + } + + /** + * Set E list. + * + * @param elementList E list to set + */ + public void setElementList(List<E> elementList) { + this.elementList = elementList; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public E getElementAt(int index) { + return elementList.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (elementList != null) { + size = elementList.size(); + } + return size; + } +} Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -1,116 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 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.models.common; - -import java.util.List; - -import javax.swing.DefaultComboBoxModel; -import javax.swing.JComboBox; - -/** - * Model pour pour la representation d'une liste de {@link String}. - * Utilisation dans les {@link JComboBox}. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class StringComboModel extends DefaultComboBoxModel<String> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - /** {@link String} list. */ - protected List<String> stringList; - - /** - * Empty constructor. - */ - public StringComboModel() { - this(null); - } - - /** - * Constructor with export list. - * - * @param stringList {@link String} list - */ - public StringComboModel(List<String> stringList) { - setStringList(stringList); - } - - /** - * Get {@link String} list. - * - * @return {@link String} list - */ - public List<String> getStringList() { - return stringList; - } - - /** - * Set {@link String} list. - * - * @param stringList {@link String} list to set - */ - public void setStringList(List<String> stringList) { - this.stringList = stringList; - // reset selected - setSelectedItem(null); - } - - public void addString(String string) { - stringList.add(string); - fireIntervalAdded(this, stringList.size() - 1, stringList.size()); - } - - public boolean containsString(String string) { - return stringList.contains(string); - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public String getElementAt(int index) { - return stringList.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (stringList != null) { - size = stringList.size(); - } - return size; - } -} Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -1,105 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 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.models.common; - -import java.util.List; - -import javax.swing.AbstractListModel; -import javax.swing.JList; - -/** - * Model pour pour la representation d'une liste de {@link String}. - * Utilisation dans les {@link JList}. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author: chatellier $ - */ -public class StringListModel extends AbstractListModel<String> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - /** {@link String} list. */ - protected List<String> stringList; - - /** - * Empty constructor. - */ - public StringListModel() { - this(null); - } - - /** - * Constructor with export list. - * - * @param stringList {@link String} list - */ - public StringListModel(List<String> stringList) { - setStringList(stringList); - } - - /** - * Get {@link String} list. - * - * @return {@link String} list - */ - public List<String> getStringList() { - return stringList; - } - - /** - * Set {@link String} list. - * - * @param stringList {@link String} list to set - */ - public void setStringList(List<String> stringList) { - this.stringList = stringList; - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public String getElementAt(int index) { - return stringList.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (stringList != null) { - size = stringList.size(); - } - return size; - } -} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -60,7 +60,6 @@ * @param exports exports */ public ExportListModel(List<Export> exports) { - super(); setExport(exports); } Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -0,0 +1,96 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin + * %% + * 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.models.optimization; + +import java.awt.Component; +import java.util.HashMap; +import java.util.Map; + +import javax.swing.DefaultListCellRenderer; +import javax.swing.JLabel; +import javax.swing.JList; + +import fr.ifremer.isisfish.simulator.Objective; + +/** + * Renderer pour la combo des script d'optimisation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ObjectiveComboRenderer extends DefaultListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + /** Objective cache. */ + protected Map<String, Objective> objectiveCache; + + /** + * Empty constructor. + */ + public ObjectiveComboRenderer() { + objectiveCache = new HashMap<String, Objective>(); + } + + /* + * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) + */ + @Override + public Component getListCellRendererComponent(JList<?> list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + + // this must be used to have alterned highlight rows and default + // selection color + JLabel c = (JLabel) super.getListCellRendererComponent(list, value, + index, isSelected, cellHasFocus); + + String objectiveName = (String) value; + c.setText(objectiveName); + + // c'est tres couteux d'avoir une instance + // on les met en cache + /*try { + Optimization optim = optimizationCache.get(optimizationName); + if (optim == null) { + SensitivityAnalysisStorage storage = SensitivityAnalysisStorage + .getSensitivityAnalysis(optimizationName); + optim = storage.getNewInstance(); + optimizationCache.put(optimizationName, optim); + } + + c.setToolTipText(optim.getDescription()); + } catch (Exception e) { + String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", sensitivityName)); + c.setToolTipText(errorTooltip); + }*/ + + return c; + } +} Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboModel.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboModel.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -1,109 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 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 - * 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.models.optimization; - -import java.util.List; - -import javax.swing.DefaultComboBoxModel; - -/** - * Model pour la liste des script d'optimization. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class OptimizationComboModel extends DefaultComboBoxModel<String> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - /** SensitivityAnalysis names. */ - protected List<String> optimizationNames; - - /** - * Empty constructor. - */ - public OptimizationComboModel() { - this(null); - } - - /** - * Constructor with calculator list. - * - * @param optimizationNames sensitivity analysis Names - */ - public OptimizationComboModel(List<String> optimizationNames) { - setOptimizationNames(optimizationNames); - } - - /** - * Get sensitivity analysis plan names. - * - * @return the sensitivity analysis plan names - */ - public List<String> getOptimizationNames() { - return optimizationNames; - } - - /** - * Set sensitivity analysis names. - * - * @param optimizationNames the names to set - */ - public void setOptimizationNames(List<String> optimizationNames) { - this.optimizationNames = optimizationNames; - - // default first selected - /* disable default selection - if (!sensitivityAnalysisNames.isEmpty()) { - setSelectedItem(sensitivityAnalysisNames.get(0)); - }*/ - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public String getElementAt(int index) { - return optimizationNames.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (optimizationNames != null) { - size = optimizationNames.size(); - } - return size; - } -} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.ui.models.optimization; -import static org.nuiton.i18n.I18n.t; - import java.awt.Component; import java.util.HashMap; import java.util.Map; @@ -35,10 +33,7 @@ import javax.swing.JLabel; import javax.swing.JList; -import fr.ifremer.isisfish.datastore.SensitivityAnalysisStorage; import fr.ifremer.isisfish.simulator.Optimization; -import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; -import fr.ifremer.isisfish.ui.util.TooltipHelper; /** * Renderer pour la combo des script d'optimisation. @@ -98,4 +93,5 @@ return c; } + } Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/ExportObservationTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/ExportObservationTableModel.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/ExportObservationTableModel.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -0,0 +1,53 @@ +package fr.ifremer.isisfish.ui.optimization; + +import static org.nuiton.i18n.I18n.t; + +import javax.swing.JComboBox; +import javax.swing.table.AbstractTableModel; + +public class ExportObservationTableModel extends AbstractTableModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 7555677813473489539L; + + /** Columns names. */ + public final static String[] COLUMN_NAMES = { + t("isisfish.optimization.export"), + t("isisfish.optimization.observation") + }; + + /* + * @see javax.swing.table.TableModel#getColumnCount() + */ + @Override + public int getColumnCount() { + int result = 2; + return result; + } + + /* + * @see javax.swing.table.TableModel#getRowCount() + */ + @Override + public int getRowCount() { + int result = 4; + return result; + } + + /* + * @see javax.swing.table.TableModel#getColumnName(int) + */ + @Override + public String getColumnName(int columnIndex) { + return COLUMN_NAMES[columnIndex]; + } + + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + if (columnIndex == 0) { + return "Export " + rowIndex; + } else { + return "Observation " + rowIndex; + } + } +} Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/ExportObservationTableModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: 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/OptimizationHandler.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationHandler.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -22,21 +22,27 @@ */ package fr.ifremer.isisfish.ui.optimization; -import java.awt.CardLayout; import java.util.ArrayList; import java.util.List; +import javax.swing.ComboBoxModel; +import javax.swing.ListModel; +import javax.swing.table.TableModel; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.ExportStorage; +import fr.ifremer.isisfish.datastore.ObjectiveStorage; import fr.ifremer.isisfish.datastore.OptimizationStorage; +import fr.ifremer.isisfish.simulator.Objective; import fr.ifremer.isisfish.simulator.Optimization; import fr.ifremer.isisfish.ui.input.InputHandler; +import fr.ifremer.isisfish.ui.models.common.GenericComboModel; import fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellEditor; import fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellRenderer; import fr.ifremer.isisfish.ui.models.common.ScriptParametersTableModel; -import fr.ifremer.isisfish.ui.models.optimization.OptimizationComboModel; import fr.ifremer.isisfish.ui.simulator.SimulAction; public class OptimizationHandler extends InputHandler { @@ -44,23 +50,7 @@ private static final Log log = LogFactory.getLog(OptimizationHandler.class); 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);*/ } /** @@ -68,7 +58,7 @@ * * @return model */ - public OptimizationComboModel getOptimizationComboModel() { + public ComboBoxModel<String> getOptimizationComboModel() { List<String> result = new ArrayList<String>(); for (String r : OptimizationStorage.getOptimizationNames()) { // there is some non java files in sensitivity directory @@ -79,7 +69,7 @@ } } - OptimizationComboModel model = new OptimizationComboModel(result); + GenericComboModel<String> model = new GenericComboModel<String>(result); return model; } @@ -94,9 +84,7 @@ // creation new instance only when name change to not lose parameters value Optimization optimization = simulAction.getOptimization(); - if (optimization != null && optimization.getClass().getSimpleName().equals(optimizationName)) { - optimization = simulAction.getOptimization(); - } else { + if (optimization == null || !optimization.getClass().getSimpleName().equals(optimizationName)) { try { OptimizationStorage optimizationStorage = OptimizationStorage.getOptimization(optimizationName); optimization = optimizationStorage.getNewInstance(); @@ -110,19 +98,96 @@ // can be null for example if analysis can't be compiled if (optimization != null) { simulAction.setOptimization(optimization); - - /*CardLayout factorPanelLayout = (CardLayout)view.getFactorCardinalityPanel().getLayout(); - if (sensitivityAnalysis.canManageCardinality()) { - factorPanelLayout.show(factorCardinalityPanel, "factorCardinalitySupported"); - } else { - factorPanelLayout.show(factorCardinalityPanel, "factorCardinalityNotSupported"); - }*/ // update model ScriptParametersTableModel parametersTableModel = new ScriptParametersTableModel(optimization); - view.getSimulOptimizationMethodParam().setModel(parametersTableModel); - view.getSimulOptimizationMethodParam().getColumnModel().getColumn(0).setCellRenderer(new ScriptParametersTableCellRenderer(optimization)); - view.getSimulOptimizationMethodParam().getColumnModel().getColumn(1).setCellEditor(new ScriptParametersTableCellEditor(optimization)); + view.getOptimizationMethodParam().setModel(parametersTableModel); + view.getOptimizationMethodParam().getColumnModel().getColumn(0).setCellRenderer(new ScriptParametersTableCellRenderer(optimization)); + view.getOptimizationMethodParam().getColumnModel().getColumn(1).setCellEditor(new ScriptParametersTableCellEditor(optimization)); } } + + /** + * Objective model for combo box. + * + * @return model + */ + public ComboBoxModel<String> getObjectiveComboModel() { + List<String> result = new ArrayList<String>(); + for (String r : ObjectiveStorage.getObjectiveNames()) { + // there is some non java files in sensitivity directory + if (r.endsWith(".java")) { + // Remove .java extention + // for example SensitivityStorage.getRuleName(String) + result.add(r.substring(0, r.length() - 5)); + } + } + + GenericComboModel<String> model = new GenericComboModel<String>(result); + return model; + } + + /** + * Selection d'une fonction d'objectif. + * + * @param view view + */ + public void objectiveChanged(OptimizationMethodUI view) { + String objectiveName = (String)view.getFieldObjectiveSelect().getSelectedItem(); + SimulAction simulAction = view.getContextValue(SimulAction.class); + + // creation new instance only when name change to not lose parameters value + Objective objective = simulAction.getObjective(); + if (objective == null || !objective.getClass().getSimpleName().equals(objectiveName)) { + try { + ObjectiveStorage objectiveStorage = ObjectiveStorage.getObjective(objectiveName); + objective = objectiveStorage.getNewInstance(); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't set optimization", e); + } + } + } + + // can be null for example if analysis can't be compiled + if (objective != null) { + simulAction.setObjective(objective); + + // update model + ScriptParametersTableModel parametersTableModel = new ScriptParametersTableModel(objective); + view.getObjectiveParamsTable().setModel(parametersTableModel); + view.getObjectiveParamsTable().getColumnModel().getColumn(0).setCellRenderer(new ScriptParametersTableCellRenderer(objective)); + view.getObjectiveParamsTable().getColumnModel().getColumn(1).setCellEditor(new ScriptParametersTableCellEditor(objective)); + } + } + + /** + * Export model for combo box. + * + * @return model + */ + public ListModel<String> getExportListModel() { + List<String> result = new ArrayList<String>(); + for (String r : ExportStorage.getExportNames()) { + // there is some non java files in sensitivity directory + if (r.endsWith(".java")) { + // Remove .java extention + // for example SensitivityStorage.getRuleName(String) + result.add(r.substring(0, r.length() - 5)); + } + } + + GenericComboModel<String> model = new GenericComboModel<String>(result); + return model; + } + + /** + * Export model for combo box. + * + * @return model + */ + public TableModel getExportObservationTableModel() { + ExportObservationTableModel model = new ExportObservationTableModel(); + return model; + } } Modified: 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/OptimizationMethodUI.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationMethodUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -26,8 +26,6 @@ <import> java.awt.CardLayout javax.swing.ComboBoxModel - javax.swing.table.DefaultTableModel - fr.ifremer.isisfish.ui.models.optimization.OptimizationComboRenderer </import> <script><![CDATA[ @@ -37,88 +35,78 @@ ]]></script> <OptimizationHandler id="handler" /> <row> - <cell fill="horizontal"> - <JLabel text="isisfish.optimization.select"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldOptimizationMethodSelect" model='{handler.getOptimizationComboModel()}' - renderer='{new OptimizationComboRenderer()}' onActionPerformed='handler.optimizationChanged(this)'/> - </cell> + <cell fill="horizontal"> + <JLabel text="isisfish.optimization.select" /> + </cell> + <cell fill="horizontal" weightx="1.0" columns="3"> + <JComboBox id="fieldOptimizationMethodSelect" + genericType="String" model='{handler.getOptimizationComboModel()}' + onActionPerformed='handler.optimizationChanged(this)' + renderer='{new fr.ifremer.isisfish.ui.models.optimization.OptimizationComboRenderer()}' /> + </cell> </row> <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="simulOptimizationMethodParam" rowHeight='24' /> - </JScrollPane> - </cell> + <cell columns="3" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="optimizationMethodParam" rowHeight='24' /> + </JScrollPane> + </cell> </row> - -  + <row> - <cell fill="both" columns='3' weightx="1.0"> - <JLabel text="isisfish.optimization.objectives"/> - </cell> + <cell fill="horizontal"> + <JLabel text="isisfish.optimization.objective" /> + </cell> + <cell fill="horizontal" weightx="1.0" columns="3"> + <JComboBox id="fieldObjectiveSelect" genericType="String" + model='{handler.getObjectiveComboModel()}' onActionPerformed='handler.objectiveChanged(this)' + renderer='{new fr.ifremer.isisfish.ui.models.optimization.ObjectiveComboRenderer()}' /> + </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> + <cell fill="both" columns='3' weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="objectiveParamsTable" rowHeight='24' /> + </JScrollPane> + </cell> + </row> + + <row> + <cell fill="both" columns='3'> + <JLabel text="isisfish.optimization.exports" /> + </cell> + </row> + <row> + <cell fill="both" weightx="0.2" weighty="1.0"> + <JScrollPane> + <JList id="fieldExportList" genericType="String" + model='{handler.getExportListModel()}' + cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' /> + </JScrollPane> + </cell> + <cell fill="horizontal" weighty="1.0"> + <Table> + <row> + <cell fill="horizontal"> + <JButton text="isisfish.common.add" /> + </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> + <cell fill="horizontal"> + <JButton text="isisfish.common.remove" /> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JButton text="isisfish.common.clear" /> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="exportObservationTable" model="{handler.getExportObservationTableModel()}" rowHeight='24' /> + </JScrollPane> + </cell> </row> </Table> Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationMethodUI.out.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationUI.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/optimization/OptimizationUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -33,7 +33,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - SwingUtil.getLayer(bodyTabbedPane).setUI(dummyLayer); + } /** @@ -72,7 +72,6 @@ <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()}" Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -60,7 +60,7 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; import fr.ifremer.isisfish.ui.CommonHandler; -import fr.ifremer.isisfish.ui.models.common.StringComboModel; +import fr.ifremer.isisfish.ui.models.common.GenericComboModel; /** * Handler for result UIs. @@ -92,8 +92,8 @@ } @Override public void simulationStop(SimulationService simService, SimulationJob job) { - StringComboModel model = (StringComboModel)resultUI.getSimulationComboBox().getModel(); - model.addString(job.getId()); + GenericComboModel<String> model = (GenericComboModel)resultUI.getSimulationComboBox().getModel(); + model.addElement(job.getId()); } @Override public void clearJobDone(SimulationService simService) { @@ -111,7 +111,7 @@ java.util.List<String> value = SimulationStorage.getSimulationNames(); //resultUI.getSimulationComboBox().setEditable(false); - StringComboModel model = new StringComboModel(value); + GenericComboModel model = new GenericComboModel(value); resultUI.getSimulationComboBox().setModel(model); resultUI.getSimulationComboBox().setSelectedItem(null); } @@ -200,7 +200,7 @@ matrixViewerPanel.addMatrixFilter(new SumByYearMatrixFilter()); // init available results list - StringComboModel model = new StringComboModel(resultStorage.getResultName()); + GenericComboModel model = new GenericComboModel(resultStorage.getResultName()); resultSimulationFrame.getResultsComboBox().setModel(model); resultSimulationFrame.getResultsComboBox().addItemListener(new ItemListener() { @Override Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 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 @@ -37,7 +37,7 @@ fr.ifremer.isisfish.simulator.sensitivity.Factor fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain - fr.ifremer.isisfish.ui.models.common.StringListModel + fr.ifremer.isisfish.ui.models.common.GenericListModel fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer @@ -149,12 +149,12 @@ factorCardinality.setModel(model); } - protected StringListModel getAvailableExportListModel() { + protected GenericListModel<String> getAvailableExportListModel() { List<String> exportNames = getSimulAction().getSensitivityExportNames(); - StringListModel model = new StringListModel(exportNames); + GenericListModel<String> model = new GenericListModel<String>(exportNames); return model; } - + /** * Add multiples export. * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 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 @@ -33,7 +33,7 @@ fr.ifremer.isisfish.simulator.launcher.SimulationJob fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener fr.ifremer.isisfish.ui.simulator.SimulAction - fr.ifremer.isisfish.ui.models.common.StringComboModel + fr.ifremer.isisfish.ui.models.common.GenericComboModel </import> <script><![CDATA[ @@ -53,12 +53,12 @@ if (log.isDebugEnabled()) { log.debug("Refresh second pass UI simulations list"); } - StringComboModel model = (StringComboModel)fieldSensitivitySimulationSelect.getModel(); + GenericComboModel<String> model = (GenericComboModel)fieldSensitivitySimulationSelect.getModel(); String simulationName = job.getId(); if (simulationName.startsWith("as_")) { String masterSensitivityName = simulationName.substring(0, simulationName.lastIndexOf("_")); - if (!model.containsString(masterSensitivityName)) { - model.addString(masterSensitivityName); + if (!model.containsElement(masterSensitivityName)) { + model.addElement(masterSensitivityName); } } } @@ -73,7 +73,7 @@ /** * Model de contenu de la liste des nom de simulations */ - public StringComboModel getSensitivitySimulationModel() { + public GenericComboModel<String> getSensitivitySimulationModel() { List<String> asNames = new ArrayList<String>(); for (String simulationName : SimulationStorage.getSimulationNames()) { if (simulationName.startsWith("as_")) { @@ -84,7 +84,7 @@ } } - StringComboModel model = new StringComboModel(asNames); + GenericComboModel<String> model = new GenericComboModel<String>(asNames); return model; } @@ -127,7 +127,7 @@ </script> <row> <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSensitivitySimulationSelect" model='{getSensitivitySimulationModel()}' /> + <JComboBox id="fieldSensitivitySimulationSelect" genericType="String" model='{getSensitivitySimulationModel()}' /> </cell> <cell fill="horizontal"> <JButton id="runSecondPassButton" text='isisfish.sensitivity.secondpass' onActionPerformed='launchSecondPass(event)' Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 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 @@ -25,7 +25,7 @@ <Table> <import> fr.ifremer.isisfish.ui.WelcomePanelUI; - fr.ifremer.isisfish.ui.models.common.StringListModel; + fr.ifremer.isisfish.ui.models.common.GenericListModel; javax.swing.event.ListSelectionEvent; java.util.LinkedList </import> @@ -54,7 +54,7 @@ // userExports = intersection(userExports,availableExports) userExports.retainAll(availableExports); - StringListModel exportModel = new StringListModel(availableExports); + GenericListModel<String> exportModel = new GenericListModel<String>(availableExports); listSimulExportChoose.setModel(exportModel); for (String userExport : userExports) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2012 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 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 @@ -40,7 +40,7 @@ fr.ifremer.isisfish.ui.SimulationUI fr.ifremer.isisfish.ui.WelcomePanelUI fr.ifremer.isisfish.ui.WelcomeTabUI - fr.ifremer.isisfish.ui.models.common.StringComboModel + fr.ifremer.isisfish.ui.models.common.GenericComboModel fr.ifremer.isisfish.ui.sensitivity.SensitivityUI fr.ifremer.isisfish.ui.widget.FilterableComboBox fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher @@ -66,7 +66,7 @@ regionStorageListener = new StorageChangeListener() { @Override public void versionDataChanged(StorageChangeEvent e) { - StringComboModel model = new StringComboModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()); + GenericComboModel<String> model = new GenericComboModel<String>(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()); fieldSimulParamsRegion.setModel(model); } }; @@ -80,8 +80,8 @@ @Override public void simulationStop(SimulationService simService, SimulationJob job) { - StringComboModel model = (StringComboModel)fieldSimulParamsSelect.getModel(); - model.addString(job.getId()); + GenericComboModel<String> model = (GenericComboModel)fieldSimulParamsSelect.getModel(); + model.addElement(job.getId()); } @Override @@ -285,9 +285,9 @@ return getSimulParamsSelectModel(false); } -protected ComboBoxModel getSimulParamsSelectModel(boolean force) { +protected ComboBoxModel<String> getSimulParamsSelectModel(boolean force) { List<String> items = simulAction.getFilteredOldSimulatorNames(force); - StringComboModel result = new StringComboModel(items); + GenericComboModel<String> result = new GenericComboModel<String>(items); return result; } @@ -348,8 +348,8 @@ <JLabel text="isisfish.common.region" /> </cell> <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsRegion" - model='{new fr.ifremer.isisfish.ui.models.common.StringComboModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}' + <JComboBox id="fieldSimulParamsRegion" genericType="String" + model='{new fr.ifremer.isisfish.ui.models.common.GenericComboModel<String>(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}' selectedItem='{getContextValue(SimulAction.class).getSimulationParameter().getRegionName()}' onActionPerformed='regionChange()' /> </cell> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 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 @@ -25,7 +25,7 @@ <JPanel layout='{new BorderLayout()}'> <import> fr.ifremer.isisfish.ui.WelcomePanelUI - fr.ifremer.isisfish.ui.models.common.StringListModel + fr.ifremer.isisfish.ui.models.common.GenericListModel javax.swing.event.ListSelectionEvent </import> <script><![CDATA[ @@ -53,7 +53,7 @@ // userResults = intersection(userResults,availableResult) userResults.retainAll(availableResults); - StringListModel resultModel = new StringListModel(availableResults); + GenericListModel<String> resultModel = new GenericListModel<String>(availableResults); listResultNames.setModel(resultModel); for (String userResult : userResults) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2014-04-01 14:41:13 UTC (rev 3911) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 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 @@ -80,7 +80,7 @@ <cell fill="both" rows="3" weightx="1" weighty="1"> <JScrollPane> <JList id="availableRuleList" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - model='{new fr.ifremer.isisfish.ui.models.common.StringListModel(fr.ifremer.isisfish.datastore.RuleStorage.getRuleNames())}' + model='{new fr.ifremer.isisfish.ui.models.common.GenericListModel<String>(fr.ifremer.isisfish.datastore.RuleStorage.getRuleNames())}' cellRenderer='{new fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer()}' onValueChanged='addRulesButton.setEnabled(availableRuleList.getSelectedIndex() != -1)' enabled="{isActive()}"/> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-03-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-04-01 14:41:13 UTC (rev 3911) @@ -79,6 +79,7 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.Objective; import fr.ifremer.isisfish.simulator.Optimization; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.SimulationParameterImpl; @@ -1336,4 +1337,12 @@ public void setOptimization(Optimization optimization) { param.setOptimization(optimization); } + + public Objective getObjective() { + return param.getObjective(); + } + + public void setObjective(Objective objective) { + param.setObjective(objective); + } } 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-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-01 14:41:13 UTC (rev 3911) @@ -653,8 +653,11 @@ isisfish.month.november=november isisfish.month.october=october isisfish.month.september=september +isisfish.optimisation.observation= +isisfish.optimization.export= isisfish.optimization.methodfactorsupported= isisfish.optimization.objectives= +isisfish.optimization.observation= isisfish.optimization.optimization= isisfish.optimization.select= isisfish.optimization.title= 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-25 22:04:05 UTC (rev 3910) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-01 14:41:13 UTC (rev 3911) @@ -653,8 +653,11 @@ isisfish.month.november=novembre isisfish.month.october=octobre isisfish.month.september=septembre +isisfish.optimization.export=Export +isisfish.optimization.exports=Exports et observations isisfish.optimization.methodfactorsupported=La méthode d'optimisation choisie gère les cardinalités des facteurs -isisfish.optimization.objectives=Fonctions d'objectif +isisfish.optimization.objective=Fonction d'objectif +isisfish.optimization.observation=Observations isisfish.optimization.optimization=Critère d'optimisation isisfish.optimization.select=Méthode d'optimisation isisfish.optimization.title=Optimisation

1 0

25 Mar '14

Author: echatellier Date: 2014-03-25 23:04:05 +0100 (Tue, 25 Mar 2014) New Revision: 3910 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3910 Log: Update i18n Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisTray.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/Month.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeStep.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 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/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/pom.xml 2014-03-25 22:04:05 UTC (rev 3910) @@ -474,7 +474,7 @@ <eugeneVersion>2.6.3</eugeneVersion> <topiaVersion>2.8.1.3</topiaVersion> <hibernateVersion>4.2.11.Final</hibernateVersion> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonI18nVersion>3.1-SNAPSHOT</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,8 +25,8 @@ package fr.ifremer.isisfish; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import java.io.File; import java.net.MalformedURLException; @@ -924,7 +924,7 @@ ClassLoader parent = Thread.currentThread().getContextClassLoader(); result = new URLClassLoader(cp, parent); } catch (MalformedURLException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.load.classloader", f, eee.getMessage()), eee); + throw new IsisFishRuntimeException(t("isisfish.error.load.classloader", f, eee.getMessage()), eee); } } return result; @@ -965,103 +965,103 @@ */ public static enum Option implements ConfigOptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), - ISIS_HOME_DIRECTORY("isis.home.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + majorVersion.toString()+"beta"), - 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"), - BACKUP_DIRECTORY("backup.directory", n_("isisfish.config.main.defaultBackupDirectory.description"), "${isis.home.directory}" + File.separator + "isis-backup"), + CONFIG_FILE(CONFIG_FILE_NAME, n("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), + ISIS_HOME_DIRECTORY("isis.home.directory", n("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + majorVersion.toString()+"beta"), + 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"), + BACKUP_DIRECTORY("backup.directory", n("isisfish.config.main.defaultBackupDirectory.description"), "${isis.home.directory}" + File.separator + "isis-backup"), - DEFAULT_EXPORT_NAMES("default.export.names", n_("isisfish.config.main.defaultExportNames.description"), ""), - DEFAULT_RESULT_NAMES("default.result.names", n_("isisfish.config.main.defaultResultNames.description"), ""), - DEFAULT_MAP_FILENAME("default.map.filename", n_("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"), - DEFAULT_TAG_VALUE("default.tagvalue", n_("isisfish.config.main.defaultTagValue.description"), ""), - ENCODING("encoding", n_("isisfish.config.main.encoding.description"), "UTF-8"), - JAVADOC_URL("javadoc.url", n_("isisfish.config.main.javadocURL.description"), "http://www.isis-fish.org/apidocs/"), + DEFAULT_EXPORT_NAMES("default.export.names", n("isisfish.config.main.defaultExportNames.description"), ""), + DEFAULT_RESULT_NAMES("default.result.names", n("isisfish.config.main.defaultResultNames.description"), ""), + DEFAULT_MAP_FILENAME("default.map.filename", n("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"), + DEFAULT_TAG_VALUE("default.tagvalue", n("isisfish.config.main.defaultTagValue.description"), ""), + ENCODING("encoding", n("isisfish.config.main.encoding.description"), "UTF-8"), + JAVADOC_URL("javadoc.url", n("isisfish.config.main.javadocURL.description"), "http://www.isis-fish.org/apidocs/"), - SIMULATOR_CLASSFILE("simulator.classfile", n_("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), + SIMULATOR_CLASSFILE("simulator.classfile", n("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ - SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", n_("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), - SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", n_("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), - SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", n_("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", n("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", n("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), + SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", n("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), /** Nombre maximum de thread de simulation in process. */ - SIMULATOR_IN_MAXTHREADS("simulation.in.max.threads", n_("isisfish.config.main.simulation.in.max.threads.description"), "1"), + SIMULATOR_IN_MAXTHREADS("simulation.in.max.threads", n("isisfish.config.main.simulation.in.max.threads.description"), "1"), /** Nombre max de sous processus à lancer (-1 = pas de limite). */ - SIMULATOR_SUB_MAXPROCESS("simulation.sub.max.process", n_("isisfish.config.main.simulation.sub.max.process.description"), "-1"), + SIMULATOR_SUB_MAXPROCESS("simulation.sub.max.process", n("isisfish.config.main.simulation.sub.max.process.description"), "-1"), /** Mémoire max (Xmx) allouée aux sous processus. */ - SIMULATOR_SUB_MAXMEMORY("simulation.sub.max.memory", n_("isisfish.config.main.simulation.sub.max.memory.description"), "1024M"), + SIMULATOR_SUB_MAXMEMORY("simulation.sub.max.memory", n("isisfish.config.main.simulation.sub.max.memory.description"), "1024M"), /** Serveur accessible par ssh : address */ - SIMULATOR_SSH_SERVER("simulation.ssh.server", n_("isisfish.config.main.simulation.ssh.server.description"), "caparmor-sftp"), + SIMULATOR_SSH_SERVER("simulation.ssh.server", n("isisfish.config.main.simulation.ssh.server.description"), "caparmor-sftp"), /** Serveur accessible par ssh : login */ - SIMULATOR_SSH_USER_NAME("simulation.ssh.username", n_("isisfish.config.main.simulation.ssh.username.description"), ""), + SIMULATOR_SSH_USER_NAME("simulation.ssh.username", n("isisfish.config.main.simulation.ssh.username.description"), ""), /** Serveur accessible par ssh : user home directory */ - SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", n_("isisfish.config.main.simulation.ssh.userhome.description"), ""), + SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", n("isisfish.config.main.simulation.ssh.userhome.description"), ""), /** Serveur accessible par ssh : remote data path */ - SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", n_("isisfish.config.main.simulation.ssh.datapath.description"), "isis-fish-" + majorVersion.toString() + "/isis-database"), + SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", n("isisfish.config.main.simulation.ssh.datapath.description"), "isis-fish-" + majorVersion.toString() + "/isis-database"), /** Serveur accessible par ssh : remote isis home install */ - SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", n_("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), + SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", n("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), /** Serveur accessible par ssh : remote tmp path */ - SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", n_("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), + SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", n("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), /** Serveur accessible par SSH : emplacement de Java (full path) */ - SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath64", n_("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk64/bin/java"), + SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath64", n("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk64/bin/java"), /** Serveur accessible par SSH : emplacement des executables pbs */ - SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", n_("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), + SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", n("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), /** Serveur accessible par SSH : option de l'executable qsub (defaut to -m n = no mail) */ - SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", n_("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), + SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", n("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), /** Serveur accessible par SSH : interval de check du fichier de control */ - SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", n_("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), + SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", n("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ - SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", n_("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), + SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", n("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), /** Serveur accessible par SSH : mémoire (Xmx) allouée pour les process java sur caparmor */ - SIMULATOR_SSH_MAXMEMORY("simulation.ssh.max.memory", n_("isisfish.config.main.simulation.ssh.max.memory.description"), "2000M"), + SIMULATOR_SSH_MAXMEMORY("simulation.ssh.max.memory", n("isisfish.config.main.simulation.ssh.max.memory.description"), "2000M"), /** Application locale (for i18n init). */ - LOCALE("locale", n_("isisfish.config.main.locale.description"), "fr_FR"), - SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", n_("isisfish.config.main.simulationShowOnlyError.description"), "false"), + LOCALE("locale", n("isisfish.config.main.locale.description"), "fr_FR"), + SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", n("isisfish.config.main.simulationShowOnlyError.description"), "false"), /** Perform ui launch option. */ - LAUNCH_UI("launch.ui", n_("isisfish.config.main.launchUI.description"), "true"), + LAUNCH_UI("launch.ui", n("isisfish.config.main.launchUI.description"), "true"), /** Perform data migration option. */ - PERFORM_MIGRATION("perform.migration", n_("isisfish.config.main.performmigration.description"), "true"), + PERFORM_MIGRATION("perform.migration", n("isisfish.config.main.performmigration.description"), "true"), /** Perform vcs update option. */ - PERFORM_VCS_UPDATE("perform.vcsupdate", n_("isisfish.config.main.performvcsupdate.description"), "true"), + PERFORM_VCS_UPDATE("perform.vcsupdate", n("isisfish.config.main.performvcsupdate.description"), "true"), /** Perform cron option. */ - PERFORM_CRON("perform.cron", n_("isisfish.config.main.performcron.description"), "true"), + PERFORM_CRON("perform.cron", n("isisfish.config.main.performcron.description"), "true"), /** Auto configure script parameter when addind it */ - SIMULATION_SCRIPT_AUTOCONFIG("script.autoconfig", n_("isisfish.config.main.script.autoconfig.description"), "true"), + SIMULATION_SCRIPT_AUTOCONFIG("script.autoconfig", n("isisfish.config.main.script.autoconfig.description"), "true"), /** Database lock mode (h2).*/ - DATABASE_LOCK_MODE("database.lockmode", n_("isisfish.config.database.lockmode.description"), "file"), + DATABASE_LOCK_MODE("database.lockmode", n("isisfish.config.database.lockmode.description"), "file"), // SSH (global, for both VCS and caparmor) - SSH_KEY_FILE("ssh.key.file", n_("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), + SSH_KEY_FILE("ssh.key.file", n("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), - DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), "${isis.home.directory}" + File.separator + "isis-database"), - VCS_TYPE(VCS.VCS_TYPE, n_("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), - VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.protocol.description"), "http"), - VCS_USER_NAME(VCS.VCS_USER_NAME, n_("isisfish.config.vcs.userName.description"), ""), - VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, n_("isisfish.config.vcs.userPassword.description"), ""), - VCS_HOST_NAME(VCS.VCS_HOST_NAME, n_("isisfish.config.vcs.hostName.description"), "svn.forge.codelutin.com"), - VCS_PATH(VCS.VCS_PATH, n_("isisfish.config.vcs.remotePath.description"), "/svn/isis-fish-data"), + DATABASE_DIRECTORY("database.directory", n("isisfish.config.vcs.localDatabasePath.description"), "${isis.home.directory}" + File.separator + "isis-database"), + VCS_TYPE(VCS.VCS_TYPE, n("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), + VCS_PROTOCOL(VCS.VCS_PROTOCOL, n("isisfish.config.vcs.protocol.description"), "http"), + VCS_USER_NAME(VCS.VCS_USER_NAME, n("isisfish.config.vcs.userName.description"), ""), + VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, n("isisfish.config.vcs.userPassword.description"), ""), + VCS_HOST_NAME(VCS.VCS_HOST_NAME, n("isisfish.config.vcs.hostName.description"), "svn.forge.codelutin.com"), + VCS_PATH(VCS.VCS_PATH, n("isisfish.config.vcs.remotePath.description"), "/svn/isis-fish-data"), // community vsc - COMMUNITY_DATABASE_DIRECTORY("community.database.directory", n_("isisfish.config.vcs.localCommunityDatabasePath.description"), "${isis.home.directory}" + File.separator + "isis-community-database"), - VCS_COMMUNITY_TYPE("vcs.community.type", n_("isisfish.config.vcs.community.type.description"), VCS.TYPE_SVN), - VCS_COMMUNITY_PROTOCOL("vcs.community.protocole", n_("isisfish.config.vcs.community.protocol.description"), "http"), - VCS_COMMUNITY_USER_NAME("vcs.community.username", n_("isisfish.config.vcs.community.username.description"), ""), - VCS_COMMUNITY_PASSWORD("vcs.community.password", n_("isisfish.config.vcs.community.password.description"), ""), - VCS_COMMUNITY_HOST_NAME("vcs.community.hostname", n_("isisfish.config.vcs.community.hostname.description"), "svn.forge.codelutin.com"), - VCS_COMMUNITY_PATH("vcs.community.path", n_("isisfish.config.vcs.community.remotepath.description"), "/svn/isis-fish-community"), + COMMUNITY_DATABASE_DIRECTORY("community.database.directory", n("isisfish.config.vcs.localCommunityDatabasePath.description"), "${isis.home.directory}" + File.separator + "isis-community-database"), + VCS_COMMUNITY_TYPE("vcs.community.type", n("isisfish.config.vcs.community.type.description"), VCS.TYPE_SVN), + VCS_COMMUNITY_PROTOCOL("vcs.community.protocole", n("isisfish.config.vcs.community.protocol.description"), "http"), + VCS_COMMUNITY_USER_NAME("vcs.community.username", n("isisfish.config.vcs.community.username.description"), ""), + VCS_COMMUNITY_PASSWORD("vcs.community.password", n("isisfish.config.vcs.community.password.description"), ""), + VCS_COMMUNITY_HOST_NAME("vcs.community.hostname", n("isisfish.config.vcs.community.hostname.description"), "svn.forge.codelutin.com"), + VCS_COMMUNITY_PATH("vcs.community.path", n("isisfish.config.vcs.community.remotepath.description"), "/svn/isis-fish-community"), // misc options - USER_NAME("user.name", n_("isisfish.config.main.userName.description"), System.getProperty("user.name")), - SMTP_SERVER("smtpServer", n_("isisfish.config.main.smtpServer.description"), "smtp"), - USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key), - MAPPED_RESULT_MATRIX_VECTOR_CLASS("mapped.result.matrix.vector.class", n_("isisfish.config.mapped.result.matrix.vector.class.description"), DoubleBigVector.class.getName()), - CACHE_BACKEND_FACTORY_CLASS("cache.backend.factory.class", n_("isisfish.config.cache.backend.factory.class.description"), IsisCacheBackendOnGuava.IsisCacheBackendOnGuavaFactory.class.getName()); + USER_NAME("user.name", n("isisfish.config.main.userName.description"), System.getProperty("user.name")), + SMTP_SERVER("smtpServer", n("isisfish.config.main.smtpServer.description"), "smtp"), + USER_MAIL("userMail", n("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key), + MAPPED_RESULT_MATRIX_VECTOR_CLASS("mapped.result.matrix.vector.class", n("isisfish.config.mapped.result.matrix.vector.class.description"), DoubleBigVector.class.getName()), + CACHE_BACKEND_FACTORY_CLASS("cache.backend.factory.class", n("isisfish.config.cache.backend.factory.class.description"), IsisCacheBackendOnGuava.IsisCacheBackendOnGuavaFactory.class.getName()); public String key; public String description; @@ -1086,7 +1086,7 @@ */ @Override public String getDescription() { - return _(description); + return t(description); } /* @@ -1151,49 +1151,49 @@ ////////////////////////////////////////////////// public static enum Action { - HELP(n_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"), - VERSION(n_("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"), + HELP(n("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"), + VERSION(n("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"), - IMPORT_EXPORT(n_(""), ImportAction.class.getName() + "#importExport", "--importExport"), - IMPORT_RULE(n_(""), ImportAction.class.getName() + "#importRule", "--importRule"), - IMPORT_SCRIPT(n_("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"), - IMPORT_SIMULATION_PLAN(n_(""), ImportAction.class.getName() + "#importSimulationPlan", "--importSimulationPlan"), - IMPORT_SIMULATOR(n_(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"), - IMPORT_FORMULA(n_(""), ImportAction.class.getName() + "#importFormula", "--importFormula"), - IMPORT_REGION(n_(""), ImportAction.class.getName() + "#importRegion", "--importRegion"), - IMPORT_REGION_AND_RENAME(n_(""), ImportAction.class.getName() + "#importRegionAndRename", "--importRegionAndRename"), - IMPORT_SIMULATION(n_(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"), - IMPORT_SCRIPT_MODULE(n_("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"), + IMPORT_EXPORT(n(""), ImportAction.class.getName() + "#importExport", "--importExport"), + IMPORT_RULE(n(""), ImportAction.class.getName() + "#importRule", "--importRule"), + IMPORT_SCRIPT(n("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"), + IMPORT_SIMULATION_PLAN(n(""), ImportAction.class.getName() + "#importSimulationPlan", "--importSimulationPlan"), + IMPORT_SIMULATOR(n(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"), + IMPORT_FORMULA(n(""), ImportAction.class.getName() + "#importFormula", "--importFormula"), + IMPORT_REGION(n(""), ImportAction.class.getName() + "#importRegion", "--importRegion"), + IMPORT_REGION_AND_RENAME(n(""), ImportAction.class.getName() + "#importRegionAndRename", "--importRegionAndRename"), + IMPORT_SIMULATION(n(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"), + IMPORT_SCRIPT_MODULE(n("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"), - LIST_EXPORT(n_(""), ExportAction.class.getName() + "#listExport", "--listExport"), - LIST_RULE(n_(""), ExportAction.class.getName() + "#listRule", "--listRule"), - LIST_SCRIPT(n_(""), ExportAction.class.getName() + "#listScript", "--listScript"), - LIST_SIMULATION_PLAN(n_(""), ExportAction.class.getName() + "#listSimulationPlan", "--listSimulationPlan"), - LIST_SIMULATOR(n_(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"), - LIST_FORMULA(n_(""), ExportAction.class.getName() + "#listFormula", "--listFormula"), - LIST_REGION(n_(""), ExportAction.class.getName() + "#listRegion", "--listRegion"), - LIST_SIMULATION(n_(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"), + LIST_EXPORT(n(""), ExportAction.class.getName() + "#listExport", "--listExport"), + LIST_RULE(n(""), ExportAction.class.getName() + "#listRule", "--listRule"), + LIST_SCRIPT(n(""), ExportAction.class.getName() + "#listScript", "--listScript"), + LIST_SIMULATION_PLAN(n(""), ExportAction.class.getName() + "#listSimulationPlan", "--listSimulationPlan"), + LIST_SIMULATOR(n(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"), + LIST_FORMULA(n(""), ExportAction.class.getName() + "#listFormula", "--listFormula"), + LIST_REGION(n(""), ExportAction.class.getName() + "#listRegion", "--listRegion"), + LIST_SIMULATION(n(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"), - EXPORT_EXPORT(n_(""), ExportAction.class.getName() + "#exportExport", "--exportExport"), - EXPORT_RULE(n_(""), ExportAction.class.getName() + "#exportRule", "--exportRule"), - EXPORT_SCRIPT(n_(""), ExportAction.class.getName() + "#exportScript", "--exportScript"), - EXPORT_SIMULATION_PLAN(n_(""), ExportAction.class.getName() + "#exportSimulationPlan", "--exportSimulationPlan"), - EXPORT_SIMULATOR(n_(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"), - EXPORT_FORMULA(n_(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"), - EXPORT_REGION(n_(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"), - EXPORT_SIMULATION(n_(""), ExportAction.class.getName() + "#exportSimulation", "--exportSimulation"), + EXPORT_EXPORT(n(""), ExportAction.class.getName() + "#exportExport", "--exportExport"), + EXPORT_RULE(n(""), ExportAction.class.getName() + "#exportRule", "--exportRule"), + EXPORT_SCRIPT(n(""), ExportAction.class.getName() + "#exportScript", "--exportScript"), + EXPORT_SIMULATION_PLAN(n(""), ExportAction.class.getName() + "#exportSimulationPlan", "--exportSimulationPlan"), + EXPORT_SIMULATOR(n(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"), + EXPORT_FORMULA(n(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"), + EXPORT_REGION(n(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"), + EXPORT_SIMULATION(n(""), ExportAction.class.getName() + "#exportSimulation", "--exportSimulation"), - VCS_SSH_CREATE_KEY(n_(""), VCSAction.class.getName() + "#sshCreateKey", "--sshCreateKey"), - VCS_UPDATE(n_(""), VCSAction.class.getName() + "#vcsUpdate", "--vcsUpdate"), - VCS_ADD(n_(""), VCSAction.class.getName() + "#vcsAdd", "--vcsAdd"), - VCS_REMOVE(n_(""), VCSAction.class.getName() + "#vcsRemove", "--vcsRemove"), - VCS_COMMIT(n_(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"), + VCS_SSH_CREATE_KEY(n(""), VCSAction.class.getName() + "#sshCreateKey", "--sshCreateKey"), + VCS_UPDATE(n(""), VCSAction.class.getName() + "#vcsUpdate", "--vcsUpdate"), + VCS_ADD(n(""), VCSAction.class.getName() + "#vcsAdd", "--vcsAdd"), + VCS_REMOVE(n(""), VCSAction.class.getName() + "#vcsRemove", "--vcsRemove"), + VCS_COMMIT(n(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"), - SIMULATE_WITH_REGION(n_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"), - SIMULATE_WITH_SIMULATION(n_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"), - SIMULATE_WITH_SIMULATION_AND_SCRIPT(n_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"), - SIMULATE_REMOTELLY(n_(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"), - SIMULATE_REMOTELLY_WITH_PRESCRIPT(n_(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript"); + SIMULATE_WITH_REGION(n(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"), + SIMULATE_WITH_SIMULATION(n(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"), + SIMULATE_WITH_SIMULATION_AND_SCRIPT(n(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"), + SIMULATE_REMOTELLY(n(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"), + SIMULATE_REMOTELLY_WITH_PRESCRIPT(n(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript"); protected String description; protected String action; @@ -1206,7 +1206,7 @@ } public String getDescription() { - return _(description); + return t(description); } public String getAction() { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.awt.Dimension; @@ -141,7 +141,7 @@ init(args); if (log.isDebugEnabled()) { - log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); + log.debug(t("isisfish.launch.init.done", config.getElapsedTimeAsString())); } // action after init @@ -156,14 +156,14 @@ initCommunityVCS(); checkDuplicatedFiles(); } catch (Exception eee) { - log.warn(_("Error during vcs initialisation"), eee); + log.warn(t("Error during vcs initialisation"), eee); } // nuiton matrix semantics mapper MatrixFactory.setSemanticMapper(new IsisMatrixSemanticMapper()); if (log.isInfoEnabled()) { - log.info(_("isisfish.launching", config.getElapsedTimeAsString())); + log.info(t("isisfish.launching", config.getElapsedTimeAsString())); } // after init vcs and local data @@ -265,14 +265,14 @@ public boolean canDoAction(VCS vcs, VCSActionEvent action, File... files) { boolean result = true; if (action == VCSActionEvent.SWITCH_PROTOCOL) { - result = ask(_("isisfish.vcs.switchprotocol.confirm")); + result = ask(t("isisfish.vcs.switchprotocol.confirm")); if (!result) { // l'utilisateur ne souhaite pas changer de protocol, // on force le repo en read-only pour eviter les erreurs vcs.setWriteable(false); } } else if (action == VCSActionEvent.SWITCH) { - result = ask(_("isisfish.vcs.switchversion.confirm", IsisConfig.getVersion())); + result = ask(t("isisfish.vcs.switchversion.confirm", IsisConfig.getVersion())); if (!result) { // l'utilisateur ne souhaite pas changer de branche, // on force le repo en read-only pour eviter les erreurs @@ -290,7 +290,7 @@ } // FIXME maybe make a JAXX UI ? - JLabel labelModifiedFiles = new JLabel(_("isisfish.vcs.updaterepository.confirm")); + JLabel labelModifiedFiles = new JLabel(t("isisfish.vcs.updaterepository.confirm")); JTextArea areaModifiedFiles = new JTextArea(modifiedFiles); areaModifiedFiles.setEditable(false); areaModifiedFiles.setAutoscrolls(true); @@ -340,28 +340,28 @@ // Si le repo local exist mais n'est pas du bon type, on renome ce repertoire File local = config.getDatabaseDirectory(); if (log.isInfoEnabled()) { - log.info(_("Check state of local repository: %s", local)); + log.info(t("Check state of local repository: %s", local)); } if (local.exists()) { if (!vcs.isValidLocalRepository()) { if (log.isInfoEnabled()) { - log.info(_("Local repository exists but it's not valide for current vcs: %s", + log.info(t("Local repository exists but it's not valide for current vcs: %s", config.getOption(VCS.VCS_TYPE))); } - if (ask(_("isisfish.vcs.init.wrongprotocol", local))) { + if (ask(t("isisfish.vcs.init.wrongprotocol", local))) { File localBackup = new File(local.getParentFile(), local.getName() + "-" + new SimpleDateFormat("yyyy-mm-dd-HH-mm-ss").format(new java.util.Date())); if (log.isInfoEnabled()) { - log.info(_("Rename data directory to %s", localBackup)); + log.info(t("Rename data directory to %s", localBackup)); } if (!local.renameTo(localBackup)) { throw new IsisFishRuntimeException( "Can't rename local repository that don't use svn"); } } else { - log.info(_("Switch repository type to none")); + log.info(t("Switch repository type to none")); config.setOption(IsisConfig.Option.VCS_TYPE.key, VCS.TYPE_NONE); config.saveForUser(); vcs = VCSFactory.createVCS(config); @@ -372,10 +372,10 @@ // Si le repo local n'existe pas on fait un check out complet if (!local.exists()) { if (log.isInfoEnabled()) { - log.info(_("Local repository don't exist")); + log.info(t("Local repository don't exist")); } if (!vcs.isConnected()) { - ErrorHelper.showErrorDialog(_("isisfish.vcs.init.notfoundcantdownload", + ErrorHelper.showErrorDialog(t("isisfish.vcs.init.notfoundcantdownload", IsisConfig.getApiVersion()), null); } else { // Si on utilise pas le bon tag on change de tag @@ -434,7 +434,7 @@ // si on est sur une branche, on est en developpement, on ne fait donc rien if (vcs.getTag().startsWith("branches")) { - log.info(_("Use branches, switch not needed")); + log.info(t("Use branches, switch not needed")); } else { // Si on utilise pas le bon tag on change de tag Version tag = IsisConfig.getApiVersion(); @@ -452,7 +452,7 @@ // for now, display a simple warning message // si refus de l'utilisateur, c'est null aussi if (filesInClonflict != null && !filesInClonflict.isEmpty()) { - warnFileListDialog(_("isisfish.error.warning.title"), _("isisfish.vcs.switchtag.warningconflict"), filesInClonflict); + warnFileListDialog(t("isisfish.error.warning.title"), t("isisfish.vcs.switchtag.warningconflict"), filesInClonflict); } } @@ -460,7 +460,7 @@ // WARNING : this do the real svn update filesInClonflict = vcs.checkFileStatus(); if (filesInClonflict != null && !filesInClonflict.isEmpty()) { - warnFileListDialog(_("isisfish.error.warning.title"), _("isisfish.vcs.update.warningconflict"), filesInClonflict); + warnFileListDialog(t("isisfish.error.warning.title"), t("isisfish.vcs.update.warningconflict"), filesInClonflict); } } @@ -499,22 +499,22 @@ if (local.exists()) { if (!communityVcs.isValidLocalRepository()) { if (log.isInfoEnabled()) { - log.info(_("Local repository exists but it's not valide for current vcs: %s", + log.info(t("Local repository exists but it's not valide for current vcs: %s", config.getOption(VCS.VCS_TYPE))); } - if (ask(_("isisfish.vcs.init.wrongprotocol", local))) { + if (ask(t("isisfish.vcs.init.wrongprotocol", local))) { File localBackup = new File(local.getParentFile(), local.getName() + "-" + new SimpleDateFormat("yyyy-mm-dd-HH-mm-ss").format(new java.util.Date())); if (log.isInfoEnabled()) { - log.info(_("Rename data directory to %s", localBackup)); + log.info(t("Rename data directory to %s", localBackup)); } if (!local.renameTo(localBackup)) { throw new IsisFishRuntimeException( "Can't rename local repository that don't use svn"); } } else { - log.info(_("Switch repository type to none")); + log.info(t("Switch repository type to none")); config.setOption(IsisConfig.Option.VCS_COMMUNITY_TYPE.key, VCS.TYPE_NONE); config.saveForUser(); communityVcs = VCSFactory.createPublicVCS(config); @@ -525,10 +525,10 @@ // Si le repo local n'existe pas on fait un check out complet if (!local.exists()) { if (log.isInfoEnabled()) { - log.info(_("Local repository don't exist")); + log.info(t("Local repository don't exist")); } if (!communityVcs.isConnected()) { - ErrorHelper.showErrorDialog(_("isisfish.vcs.init.notfoundcantdownload", + ErrorHelper.showErrorDialog(t("isisfish.vcs.init.notfoundcantdownload", "trunk"), null); } else { // initialise le repo local @@ -549,7 +549,7 @@ // WARNING : this do the real svn update List<File> filesInClonflict = communityVcs.checkFileStatus(); if (filesInClonflict != null && !filesInClonflict.isEmpty()) { - warnFileListDialog(_("isisfish.error.warning.title"), _("isisfish.vcs.update.warningconflict"), filesInClonflict); + warnFileListDialog(t("isisfish.error.warning.title"), t("isisfish.vcs.update.warningconflict"), filesInClonflict); } } @@ -666,7 +666,7 @@ } } - ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.message"), cause); + ErrorHelper.showErrorDialog(null, t("isisfish.error.linkageerror.message"), cause); } else { if (log.isErrorEnabled()) { @@ -704,7 +704,7 @@ // lauch first UI (welcomeUI) WelcomeUI welcome = new WelcomeUI(); - welcome.setTitle(_("isisfish.welcome.title", IsisConfig.getVersion())); + welcome.setTitle(t("isisfish.welcome.title", IsisConfig.getVersion())); // Set to exit on close welcome.setDefaultCloseOperation(WelcomeUI.DO_NOTHING_ON_CLOSE); welcome.addWindowListener(new WindowAdapter() { @@ -752,7 +752,7 @@ } else { if (log.isInfoEnabled()) { - log.info(_("isisfish.message.launchui.notlaunch")); + log.info(t("isisfish.message.launchui.notlaunch")); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisTray.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisTray.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisTray.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,8 +25,8 @@ package fr.ifremer.isisfish; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import java.awt.AWTException; import java.awt.SystemTray; @@ -69,7 +69,7 @@ protected static final ImageIcon TRAY_IMAGE_START = Resource.getIcon("/images/BulbG.gif"); /** Non running simulation tooltip text. */ - private static final String NO_SIMULATION_TEXT = n_("isisfish.tray.simulation.no"); + private static final String NO_SIMULATION_TEXT = n("isisfish.tray.simulation.no"); /** * Texte a utiliser pour afficher l'etat de la simulation en cours. @@ -78,10 +78,10 @@ * <li>1 = pas de temps courant de la simulation * <li>2 = nombre total de pas de temps attendu */ - private static final String SIMULATION_TEXT = n_("isisfish.tray.simulation"); + private static final String SIMULATION_TEXT = n("isisfish.tray.simulation"); /** System tray tooltip when multiple simulation are running. */ - private static final String MULTI_SIMULATION_TEXT = n_("isisfish.tray.simulation.multi"); + private static final String MULTI_SIMULATION_TEXT = n("isisfish.tray.simulation.multi"); /** Tray implementation instance. */ private static IsisTray instance = null; @@ -116,7 +116,7 @@ if (log.isInfoEnabled()) { log.info("Use system tray: " + instance.getClass().getName()); } - instance.setToolTip(_(NO_SIMULATION_TEXT)); + instance.setToolTip(t(NO_SIMULATION_TEXT)); SimulationService.getService().addSimulationServiceListener( instance); } @@ -132,7 +132,7 @@ SimulationControl control = job.getItem().getControl(); control.addPropertyChangeListener(this); getInstance().setToolTip( - _(SIMULATION_TEXT, control.getId(), control.getProgress(), + t(SIMULATION_TEXT, control.getId(), control.getProgress(), control.getProgressMax())); getInstance().setImage(TRAY_IMAGE_START); } @@ -144,7 +144,7 @@ public void simulationStop(SimulationService simService, SimulationJob job) { SimulationControl control = job.getItem().getControl(); control.removePropertyChangeListener(this); - getInstance().setToolTip(_(NO_SIMULATION_TEXT)); + getInstance().setToolTip(t(NO_SIMULATION_TEXT)); getInstance().setImage(TRAY_IMAGE_STOP); } @@ -163,7 +163,7 @@ public void propertyChange(PropertyChangeEvent evt) { SimulationControl control = (SimulationControl) evt.getSource(); getInstance().setToolTip( - _(SIMULATION_TEXT, control.getId(), control.getProgress(), + t(SIMULATION_TEXT, control.getId(), control.getProgress(), control.getProgressMax())); } @@ -248,7 +248,7 @@ /// ... add other items // construct a TrayIcon trayIcon = new java.awt.TrayIcon(TRAY_IMAGE_STOP.getImage(), - _(NO_SIMULATION_TEXT), null); + t(NO_SIMULATION_TEXT), null); trayIcon.setImageAutoSize(true); // set the TrayIcon properties //trayIcon.addActionListener(trayListener); @@ -258,14 +258,14 @@ tray.add(trayIcon); } catch (AWTException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.add.tray"), eee); + log.warn(t("isisfish.error.add.tray"), eee); } } // ... } else { // disable tray option in your application or // perform other actions - log.info(_("isisfish.message.tray.disabled")); + log.info(t("isisfish.message.tray.disabled")); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.actions; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.ArrayList; @@ -153,12 +153,12 @@ public void exportRegion(File file, String name, boolean force) throws Exception { log.info("file:" + file + ", name:" + name); if (!force && file.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); + throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); } if (!RegionStorage.exists(name)) { // fatal error - throw new IllegalArgumentException(_("could not found region %s", name)); + throw new IllegalArgumentException(t("could not found region %s", name)); } DataStorage data = RegionStorage.getRegion(name); if (data != null) { @@ -170,12 +170,12 @@ public void exportSimulation(File file, String name, boolean force) throws Exception { log.info("exportSimulation in file " + file + " ( " + name + ", force = " + force + ")"); if (!force && file.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); + throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); } if (!SimulationStorage.exists(name)) { // fatal error - throw new IllegalArgumentException(_("could not found simulation %s", name)); + throw new IllegalArgumentException(t("could not found simulation %s", name)); } DataStorage data = SimulationStorage.getSimulation(name); if (data != null) { @@ -185,11 +185,11 @@ public void exportSimulationPlan(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); + throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); } SimulationPlanStorage storage = SimulationPlanStorage.getSimulationPlan(name); if (!storage.exists()) { - throw new IllegalArgumentException(_("could not found %s", name)); + throw new IllegalArgumentException(t("could not found %s", name)); } String content = storage.getContent(); FileUtils.writeStringToFile(file, content); @@ -197,11 +197,11 @@ public void exportRule(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); + throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); } RuleStorage storage = RuleStorage.getRule(name); if (!storage.exists()) { - throw new IllegalArgumentException(_("could not found %s", name)); + throw new IllegalArgumentException(t("could not found %s", name)); } String content = storage.getContent(); FileUtils.writeStringToFile(file, content); @@ -209,11 +209,11 @@ public void exportScript(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); + throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); } ScriptStorage storage = ScriptStorage.getScript(name); if (!storage.exists()) { - throw new IllegalArgumentException(_("could not found %s", name)); + throw new IllegalArgumentException(t("could not found %s", name)); } String content = storage.getContent(); FileUtils.writeStringToFile(file, content); @@ -221,11 +221,11 @@ public void exportExport(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); + throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); } ExportStorage storage = ExportStorage.getExport(name); if (!storage.exists()) { - throw new IllegalArgumentException(_("could not found %s", name)); + throw new IllegalArgumentException(t("could not found %s", name)); } String content = storage.getContent(); FileUtils.writeStringToFile(file, content); @@ -233,11 +233,11 @@ public void exportSimulator(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); + throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); } SimulatorStorage storage = SimulatorStorage.getSimulator(name); if (!storage.exists()) { - throw new IllegalArgumentException(_("could not found %s", name)); + throw new IllegalArgumentException(t("could not found %s", name)); } String content = storage.getContent(); FileUtils.writeStringToFile(file, content); @@ -245,11 +245,11 @@ public void exportFormula(File file, String category, String name, boolean force) throws Exception { if (!force && file.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); + throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); } FormuleStorage storage = FormuleStorage.getFormule(category, name); if (!storage.exists()) { - throw new IllegalArgumentException(_("could not found %s", name)); + throw new IllegalArgumentException(t("could not found %s", name)); } String content = storage.getContent(); FileUtils.writeStringToFile(file, content); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.actions; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; @@ -62,7 +62,7 @@ String name = file.getName(); SimulationPlanStorage storage = SimulationPlanStorage.getSimulationPlan(name); if(!force && storage.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); + throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } String content = FileUtils.readFileToString(file); storage.setContent(content); @@ -72,7 +72,7 @@ String name = file.getName(); ExportStorage storage = ExportStorage.getExport(name); if(!force && storage.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); + throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } String content = FileUtils.readFileToString(file); storage.setContent(content); @@ -82,7 +82,7 @@ String name = file.getName(); RuleStorage storage = RuleStorage.getRule(name); if(!force && storage.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); + throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } String content = FileUtils.readFileToString(file); storage.setContent(content); @@ -92,7 +92,7 @@ String name = file.getName(); ScriptStorage storage = ScriptStorage.getScript(name); if(!force && storage.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); + throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } String content = FileUtils.readFileToString(file); storage.setContent(content); @@ -102,7 +102,7 @@ String name = file.getName(); SimulatorStorage storage = SimulatorStorage.getSimulator(name); if(!force && storage.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); + throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } String content = FileUtils.readFileToString(file); storage.setContent(content); @@ -110,12 +110,12 @@ public void importFormula(boolean force, String formulaType, File file) throws Exception { if (!FormuleStorage.getCategories().contains(formulaType)) { - throw new IllegalArgumentException(_("Could not found formule type %s autorised type are %s", formulaType, FormuleStorage.getCategories())); + throw new IllegalArgumentException(t("Could not found formule type %s autorised type are %s", formulaType, FormuleStorage.getCategories())); } String name = file.getName(); FormuleStorage storage = FormuleStorage.getFormule(formulaType, name); if(!force && storage.exists()) { - throw new IllegalArgumentException(_("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); + throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile())); } String content = FileUtils.readFileToString(file); storage.setContent(content); @@ -142,7 +142,7 @@ public void importRegionAndRename(boolean force, File file, String name) throws Exception { if (RegionStorage.exists(name) && !force) { // fatal error - throw new IllegalArgumentException(_("region already exists %s use 'force' argument to force overwrite", name)); + throw new IllegalArgumentException(t("region already exists %s use 'force' argument to force overwrite", name)); } RegionStorage.importAndRenameZip(file, name); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.actions; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.FileInputStream; @@ -97,7 +97,7 @@ RegionStorage.importAndRenameZip(region, regionName); } else { if (log.isWarnEnabled()) { - log.warn(_("Region %s allready exist in repository. Can't import", + log.warn(t("Region %s allready exist in repository. Can't import", regionName)); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.IOException; @@ -125,7 +125,7 @@ tx.backup(file, true); tx.closeContext(); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.prepare.data"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.prepare.data"), eee); } } @@ -241,7 +241,7 @@ root.clear(true); } } catch (TopiaException eee) { - throw new StorageException(_("isisfish.error.delete.database"), eee); + throw new StorageException(t("isisfish.error.delete.database"), eee); } super.delete(cvsDelete); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.List; @@ -166,7 +166,7 @@ result = export.getDescription(); } } catch (Exception e) { - log.warn(_("isisfish.error.not.found.description",this)); + log.warn(t("isisfish.error.not.found.description",this)); } return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.PrintWriter; @@ -152,7 +152,7 @@ compile(false, null); Class<E> result = (Class<E>)CompileHelper.loadClass(fqn); if (result == null) { - throw new IsisFishException(_("isisfish.error.load.class", fqn)); + throw new IsisFishException(t("isisfish.error.load.class", fqn)); } return result; } @@ -196,7 +196,7 @@ try { result = getFieldDoc(object.getClass(), PARAM_PREFIX + paramName); } catch (Exception e) { - log.warn(_("isisfish.error.not.found.field", paramName, object)); + log.warn(t("isisfish.error.not.found.field", paramName, object)); } return result; } @@ -212,7 +212,7 @@ Class<?> clazz = getCodeClass(); result = getFieldDoc(clazz, PARAM_PREFIX + paramName); } catch (Exception e) { - log.warn(_("isisfish.error.not.found.field", paramName, this)); + log.warn(t("isisfish.error.not.found.field", paramName, this)); } return result; } @@ -241,7 +241,7 @@ result = getParameterNames(instance); } } catch (Exception eee) { - log.info(_("isisfish.error.compiled.parameter"), eee); + log.info(t("isisfish.error.compiled.parameter"), eee); } // si on ne reussi pas avec la classe compilé on essai en parsant le // source @@ -249,7 +249,7 @@ try { //String code = getContent(); log.fatal("FIXME a faire recherche des parametre dans le source"); - throw new IsisFishException(_("isisfish.error.source.parameter")); + throw new IsisFishException(t("isisfish.error.source.parameter")); // TODO implanter la recherche des parametres. // Se sont les attributs commencant par 'param_' et ils doivent // etre public non static, non transient. @@ -257,7 +257,7 @@ // Lorsqu'on ajoute un champs dans la map il ne faut pas mettre // le prefix param. } catch (Exception eee) { - throw new IsisFishException(_("isisfish.error.source.parameter"), eee); + throw new IsisFishException(t("isisfish.error.source.parameter"), eee); } } return result; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -37,7 +37,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.util.ZipUtil; @@ -177,7 +177,7 @@ fireDataChanged(new StorageChangeEvent(this)); } catch (TopiaException eee) { - throw new StorageException(_("isisfish.error.rename.region", toName), eee); + throw new StorageException(t("isisfish.error.rename.region", toName), eee); } } @@ -455,7 +455,7 @@ return result; } catch (TopiaException eee) { - throw new StorageException(_("isisfish.error.import.file", file), eee); + throw new StorageException(t("isisfish.error.import.file", file), eee); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.Arrays; @@ -262,7 +262,7 @@ } } catch (IsisFishException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.instanciate.export", + log.warn(t("isisfish.error.instanciate.export", exportName), eee); } } @@ -696,7 +696,7 @@ // recuperation des noms des dimensions String[] dimNames = new String[1 + mat.getDimCount()]; - dimNames[0] = _("isisfish.common.date"); + dimNames[0] = t("isisfish.common.date"); for (int i = 1; i < dimNames.length; i++) { dimNames[i] = mat.getDimensionName(i - 1); } @@ -770,7 +770,7 @@ try { doAddResult(step, name, mat, context.getDbResult()); } catch (TopiaException eee) { - log.warn(_("Can't add result '%1$s' at date %2$s", name, step), eee); + log.warn(t("Can't add result '%1$s' at date %2$s", name, step), eee); } } @@ -784,7 +784,7 @@ result = getMatrix(step, name, context.getDbResult()); } catch (TopiaException eee) { if (log.isWarnEnabled()) { - log.warn(_("Can't get result: %1$s", name), eee); + log.warn(t("Can't get result: %1$s", name), eee); } } return result; @@ -800,7 +800,7 @@ result = getMatrix(name, context.getDbResult()); } catch (TopiaException eee) { if (log.isWarnEnabled()) { - log.warn(_("Can't get result: %1$s", name), eee); + log.warn(t("Can't get result: %1$s", name), eee); } } return result; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.IOException; @@ -616,7 +616,7 @@ } } catch (IsisFishException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.instanciate.export", + log.warn(t("isisfish.error.instanciate.export", exportName), eee); } } @@ -805,7 +805,7 @@ // recuperation des noms des dimensions String[] dimNames = new String[1 + mat.getDimCount()]; - dimNames[0] = _("isisfish.common.date"); + dimNames[0] = t("isisfish.common.date"); for (int i = 1; i < dimNames.length; i++) { dimNames[i] = mat.getDimensionName(i - 1); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.Arrays; @@ -147,7 +147,7 @@ } } catch (IsisFishException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.instanciate.export", + log.warn(t("isisfish.error.instanciate.export", exportName), eee); } } @@ -384,7 +384,7 @@ if (mats.size() > 0) { // recuperation des noms des dimensions String[] dimNames = new String[1 + matExample.getDimCount()]; - dimNames[0] = _("isisfish.common.date"); + dimNames[0] = t("isisfish.common.date"); for (int i = 1; i < dimNames.length; i++) { dimNames[i] = matExample.getDimensionName(i - 1); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.List; @@ -208,7 +208,7 @@ Rule rule = getNewInstance(); result = rule == null ? null : rule.getDescription(); } catch (Exception e) { - log.warn(_("isisfish.error.not.found.description",this)); + log.warn(t("isisfish.error.not.found.description",this)); } return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.List; @@ -215,7 +215,7 @@ SensitivityAnalysis sensitivityAnalysis = getNewInstance(); result = sensitivityAnalysis == null ? null : sensitivityAnalysis.getDescription(); } catch (Exception e) { - log.warn(_("isisfish.error.not.found.description", this)); + log.warn(t("isisfish.error.not.found.description", this)); } return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.FileReader; @@ -99,7 +99,7 @@ info.load(reader); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.read.simulation", file + log.warn(t("isisfish.error.read.simulation", file .getPath()), eee); } } finally { @@ -207,7 +207,7 @@ info.store(writer, "Simulation Information"); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.write.simulation", file.getPath()), + log.warn(t("isisfish.error.write.simulation", file.getPath()), eee); } } finally { @@ -233,7 +233,7 @@ result = dateFormat.parse(d); } catch (ParseException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.parse.date", d), eee); + log.warn(t("isisfish.error.parse.date", d), eee); } } } @@ -260,7 +260,7 @@ result = dateFormat.parse(d); } catch (ParseException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.parse.date", d), eee); + log.warn(t("isisfish.error.parse.date", d), eee); } } } @@ -295,7 +295,7 @@ value = Long.valueOf(t); } catch (NumberFormatException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.parse.long", t), eee); + log.warn(t("isisfish.error.parse.long", t), eee); } } } @@ -326,7 +326,7 @@ result = Long.parseLong(t); } catch (NumberFormatException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.parse.long", t), eee); + log.warn(t("isisfish.error.parse.long", t), eee); } } } @@ -356,7 +356,7 @@ previousTime = Long.parseLong(previousTimeAsString); } catch (NumberFormatException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.parse.long", + log.warn(t("isisfish.error.parse.long", previousTimeAsString), eee); } } @@ -455,7 +455,7 @@ result = Long.parseLong(t); } catch (NumberFormatException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.parse.long", t), eee); + log.warn(t("isisfish.error.parse.long", t), eee); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.List; @@ -205,7 +205,7 @@ SimulationPlan simulationPlan = getNewInstance(); result = simulationPlan == null ? null : simulationPlan.getDescription(); } catch (Exception e) { - log.warn(_("isisfish.error.not.found.description", this)); + log.warn(t("isisfish.error.not.found.description", this)); } return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.FileInputStream; @@ -364,7 +364,7 @@ out = new FileOutputStream(file); prop.store(out, "Parameters"); } catch (IOException eee) { - throw new IsisFishRuntimeException(_( + throw new IsisFishRuntimeException(t( "isisfish.error.save.simulation.parameters", file), eee); } finally { IOUtils.closeQuietly(out); @@ -395,7 +395,7 @@ parameter = new SimulationParameterImpl(); parameter.fromProperties(prop); } catch (IOException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.read.simulation.parameters", file), eee); + throw new IsisFishRuntimeException(t("isisfish.error.read.simulation.parameters", file), eee); } finally { IOUtils.closeQuietly(in); } @@ -426,7 +426,7 @@ parameter = new SimulationParameterImpl(); parameter.fromProperties(prop); } catch (IOException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.read.simulation.parameters", file), eee); + throw new IsisFishRuntimeException(t("isisfish.error.read.simulation.parameters", file), eee); } finally { IOUtils.closeQuietly(in); } @@ -724,7 +724,7 @@ directory.mkdirs(); } if (!directory.isDirectory()) { - throw new IllegalArgumentException(_( + throw new IllegalArgumentException(t( "directory %s must be a directory", directory .getAbsolutePath())); } @@ -735,14 +735,14 @@ renameTo = newName + "/$1"; } if (log.isInfoEnabled()) { - log.info(_("Import simulation file %s in directory %s and rename from %s to %s", + log.info(t("Import simulation file %s in directory %s and rename from %s to %s", file, directory, renameFrom, renameTo)); } String lastEntry = ZipUtil.uncompressAndRename(file, directory, renameFrom, renameTo); String name = lastEntry.substring(0, lastEntry.indexOf("/")); if (log.isInfoEnabled()) { - log.info(_("Last entry was %s extract name %s", lastEntry, name)); + log.info(t("Last entry was %s extract name %s", lastEntry, name)); } File simDir = new File(directory, name); SimulationStorage result = new SimulationStorage(simDir, name, null); @@ -802,7 +802,7 @@ throw new StorageException("Can't extract region", ex); } finally { if (tmpDir != null && !FileUtils.deleteQuietly(tmpDir)) { - log.warn(_("isisfish.error.delete.file", tmpDir)); + log.warn(t("isisfish.error.delete.file", tmpDir)); } } } @@ -825,7 +825,7 @@ useLog = true; } catch (Exception eee) { useLog = false; - log.warn(_("Can't create simulation logger", eee)); + log.warn(t("Can't create simulation logger", eee)); // we do not throw any exception, this is a shame but not required } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.IOException; @@ -309,10 +309,10 @@ } try { - getCurrentVCS().delete(files, _("isisfish.versionStorage.removed")); + getCurrentVCS().delete(files, t("isisfish.versionStorage.removed")); } catch (VCSException eee) { throw new StorageException( - _("isisfish.error.delete.vcs.files"), eee); + t("isisfish.error.delete.vcs.files"), eee); } } //TODO There is a bug to fix ? some files are not deleted! Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.datastore.migration; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.List; @@ -105,8 +105,8 @@ boolean result = false; int answer = JOptionPane.showConfirmDialog( - null, _("isisfish.misc.databasemigration.question", dbVersion, versions.get(versions.size() - 1)), - _("isisfish.misc.databasemigration.title"), + null, t("isisfish.misc.databasemigration.question", dbVersion, versions.get(versions.size() - 1)), + t("isisfish.misc.databasemigration.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (answer == JOptionPane.YES_OPTION) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.datastore.migration; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.math.BigInteger; import java.util.List; @@ -153,7 +153,7 @@ equation.update(); } else { EquationEditorPaneUI frame = new EquationEditorPaneUI(); - frame.setTitle(_("isisfish.message.import.equation.convert")); + frame.setTitle(t("isisfish.message.import.equation.convert")); try { frame.setEquation(equation.getCategory(), equation.getName(), Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.datastore.update; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -198,14 +198,14 @@ */ private File convertXML(File file, String versionStart, String versionEnd) throws Exception { if(VersionUtil.greaterThan(versionStart, versionEnd)){ - throw new Exception(_("isisfish.error.import.recent.files")); + throw new Exception(t("isisfish.error.import.recent.files")); }else if(VersionUtil.smallerThan(versionStart, versionEnd)){ // upgrate du fichier try{ // recherche des fichiers XSL de conversion URL [] xslurl = getXSLFile(versionStart, versionEnd); if(xslurl == null){ - throw new Exception(_("isisfish.error.import.convertible")); + throw new Exception(t("isisfish.error.import.convertible")); } File dest = file; for (URL aXslurl : xslurl) { @@ -215,7 +215,7 @@ } file = dest; }catch(Exception eee){ - throw new Exception(_("isisfish.error.conversion.data"), eee); + throw new Exception(t("isisfish.error.conversion.data"), eee); } } return file; @@ -357,7 +357,7 @@ log.info("Ask user for manual equation conversion"); // EquationEditorFrame frame = new EquationEditorFrame(true, true); EquationEditorPaneUI frame = new EquationEditorPaneUI(); - frame.setTitle(_("isisfish.message.import.equation.convert")); + frame.setTitle(t("isisfish.message.import.equation.convert")); for (String id : equationId) { context = storage.getStorage().beginTransaction(); Equation eq = (Equation)context.findByTopiaId(id); @@ -511,7 +511,7 @@ pop3.setReproductionEquationContent(getEquationStringValue(pop, "equationReproduction")); convertEquation(pop3.getReproductionEquation(), getStringValue(pop, "equationReproduction")); pop3.setMonthGapBetweenReproRecrutement(getIntValue(pop, "nbMoisEntreReproRecrutement")); - pop3.setRecruitmentDistribution(getMatrixValue(pop, "etalementRecrutement")); //TODO la semantique devrait etre: sem.add(_("isisfish.common.month", i)); + pop3.setRecruitmentDistribution(getMatrixValue(pop, "etalementRecrutement")); //TODO la semantique devrait etre: sem.add(t("isisfish.common.month", i)); pop3.setComment(getStringValue(pop, "commentaire")); List<Zone> zones = getZoneValue(pop, "zonePopulation"); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * EffortDescriptionImpl. @@ -48,7 +48,7 @@ */ @Override public String toString() { - String result = _("isisfish.effortDescription.toString", + String result = t("isisfish.effortDescription.toString", getSetOfVessels(), getPossibleMetiers()); return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.HashMap; import java.util.Map; @@ -75,15 +75,15 @@ double result = ((Number) val).doubleValue(); return result; } else { - throw new IsisFishRuntimeException(_("isisfish.error.equation.return.number", eq)); + throw new IsisFishRuntimeException(t("isisfish.error.equation.return.number", eq)); } } else { // TODO other language support - throw new IsisFishRuntimeException(_("isisfish.error.unsupported.equation.langage", + throw new IsisFishRuntimeException(t("isisfish.error.unsupported.equation.langage", getLanguage(), eq)); } } catch (Exception eee) { - throw new IsisFishRuntimeException(_("isisfish.error.evaluate.equation", eq), eee); + throw new IsisFishRuntimeException(t("isisfish.error.evaluate.equation", eq), eee); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.List; @@ -68,7 +68,7 @@ result = targetSpecies.getTargetFactor(group); } else { if (log.isDebugEnabled()) { - log.debug(_("isisfish.error.no.target.species", this, group)); + log.debug(t("isisfish.error.no.target.species", this, group)); } } return result; @@ -88,7 +88,7 @@ */ @Override public String toString() { - String result = _("isisfish.metierSeasonInfo.toString", this + String result = t("isisfish.metierSeasonInfo.toString", this .getMetier(), this.getFirstMonth(), this.getLastMonth()); return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -202,7 +202,7 @@ @Override public String toString() { - return _("isisfish.populationGroup.toString", this.getPopulation(), + return t("isisfish.populationGroup.toString", this.getPopulation(), this.getId()); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,8 +25,8 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import java.util.Arrays; import java.util.Collection; @@ -170,7 +170,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -201,7 +201,7 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.change.equation"), + throw new IsisFishRuntimeException(t("isisfish.change.equation"), eee); } } @@ -234,7 +234,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -266,7 +266,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -298,7 +298,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -329,7 +329,7 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.change.equation"), + throw new IsisFishRuntimeException(t("isisfish.change.equation"), eee); } } @@ -361,7 +361,7 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.change.equation"), + throw new IsisFishRuntimeException(t("isisfish.change.equation"), eee); } } @@ -394,7 +394,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -524,10 +524,10 @@ getPopulationSeasonInfo(),}; MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.population.capturability"), + n("isisfish.population.capturability"), newsems, - new String[] { n_("isisfish.population.group"), - n_("isisfish.population.season") }); + new String[] { n("isisfish.population.group"), + n("isisfish.population.season") }); newmat.paste(value); value = newmat; } @@ -551,19 +551,19 @@ if (mat == null) { log.debug("Capturability is null, create new matrix"); mat = MatrixFactory.getInstance().create( - n_("isisfish.population.capturability"), + n("isisfish.population.capturability"), sems, - new String[] { n_("isisfish.population.group"), - n_("isisfish.population.season") }); + new String[] { n("isisfish.population.group"), + n("isisfish.population.season") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.population.capturability"), + n("isisfish.population.capturability"), sems, - new String[] { n_("isisfish.population.group"), - n_("isisfish.population.season") }); + new String[] { n("isisfish.population.group"), + n("isisfish.population.season") }); boolean allNull = true; for (List l : mat.getSemantics()) { @@ -631,7 +631,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -648,19 +648,19 @@ List[] sems = new List[] { getReproductionZone(), getRecruitmentZone(), }; if (mat == null) { mat = MatrixFactory.getInstance().create( - n_("isisfish.population.mappingZoneReproZoneRecru"), + n("isisfish.population.mappingZoneReproZoneRecru"), sems, - new String[] { n_("isisfish.population.reproduction"), - n_("isisfish.population.recruitment") }); + new String[] { n("isisfish.population.reproduction"), + n("isisfish.population.recruitment") }); // we don't call setMappingZoneReproZoneRecru because is better to create a valid // matrix when MappingZoneReproZoneRecru is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.population.mappingZoneReproZoneRecru"), + n("isisfish.population.mappingZoneReproZoneRecru"), sems, - new String[] { n_("isisfish.population.reproduction"), - n_("isisfish.population.recruitment") }); + new String[] { n("isisfish.population.reproduction"), + n("isisfish.population.recruitment") }); newmat.paste(mat); mat = newmat; } @@ -679,7 +679,7 @@ int maxY = N.getDim(1); MatrixND result = MatrixFactory.getInstance().create( - n_("isisfish.population.matrixAbundance1D"), + n("isisfish.population.matrixAbundance1D"), new int[] { 1, maxX * maxY }); for (int x = 0; x < maxX; x++) { @@ -703,10 +703,10 @@ int nbZone = zones.size(); MatrixND result = MatrixFactory.getInstance().create( - n_("isisfish.population.matrixAbundance"), + n("isisfish.population.matrixAbundance"), new List[] { groups, zones }, - new String[] { n_("isisfish.population.groups"), - n_("isisfish.population.zones") }); + new String[] { n("isisfish.population.groups"), + n("isisfish.population.zones") }); try { int c = 0; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,8 +25,8 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import java.util.ArrayList; import java.util.Arrays; @@ -87,9 +87,9 @@ if (!months.equals(oldMonths)) { MatrixND tmp = MatrixFactory.getInstance().create( - n_("isisfish.populationSeasonInfo.distributionSpawing"), + n("isisfish.populationSeasonInfo.distributionSpawing"), new List[] { months }, - new String[] { n_("isisfish.populationSeasonInfo.months") }); + new String[] { n("isisfish.populationSeasonInfo.months") }); tmp.pasteSemantics(result); result = tmp; } @@ -117,23 +117,23 @@ if (mat == null) { mat = MatrixFactory.getInstance().create( - n_("isisfish.populationSeasonInfo.migration"), + n("isisfish.populationSeasonInfo.migration"), sems, new String[] { - n_("isisfish.populationSeasonInfo.group"), - n_("isisfish.populationSeasonInfo.departure"), - n_("isisfish.populationSeasonInfo.arrival") }); + n("isisfish.populationSeasonInfo.group"), + n("isisfish.populationSeasonInfo.departure"), + n("isisfish.populationSeasonInfo.arrival") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.populationSeasonInfo.migration"), + n("isisfish.populationSeasonInfo.migration"), sems, new String[] { - n_("isisfish.populationSeasonInfo.group"), - n_("isisfish.populationSeasonInfo.departure"), - n_("isisfish.populationSeasonInfo.arrival") }); + n("isisfish.populationSeasonInfo.group"), + n("isisfish.populationSeasonInfo.departure"), + n("isisfish.populationSeasonInfo.arrival") }); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user @@ -157,21 +157,21 @@ if (mat == null) { mat = MatrixFactory.getInstance().create( - n_("isisfish.populationSeasonInfo.emigration"), + n("isisfish.populationSeasonInfo.emigration"), sems, new String[] { - n_("isisfish.populationSeasonInfo.group"), - n_("isisfish.populationSeasonInfo.departure") }); + n("isisfish.populationSeasonInfo.group"), + n("isisfish.populationSeasonInfo.departure") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.populationSeasonInfo.emigration"), + n("isisfish.populationSeasonInfo.emigration"), sems, new String[] { - n_("isisfish.populationSeasonInfo.group"), - n_("isisfish.populationSeasonInfo.departure") }); + n("isisfish.populationSeasonInfo.group"), + n("isisfish.populationSeasonInfo.departure") }); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user @@ -195,21 +195,21 @@ if (mat == null) { mat = MatrixFactory.getInstance().create( - n_("isisfish.populationSeasonInfo.immigration"), + n("isisfish.populationSeasonInfo.immigration"), sems, new String[] { - n_("isisfish.populationSeasonInfo.group"), - n_("isisfish.populationSeasonInfo.arrival") }); + n("isisfish.populationSeasonInfo.group"), + n("isisfish.populationSeasonInfo.arrival") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.populationSeasonInfo.immigration"), + n("isisfish.populationSeasonInfo.immigration"), sems, new String[] { - n_("isisfish.populationSeasonInfo.group"), - n_("isisfish.populationSeasonInfo.arrival") }); + n("isisfish.populationSeasonInfo.group"), + n("isisfish.populationSeasonInfo.arrival") }); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user @@ -396,7 +396,7 @@ c++; } if (c >= groups.size()) { - log.warn(_("isisfish.error.acceptable.population") + log.warn(t("isisfish.error.acceptable.population") + " (group=" + group + " new length: " + length[l] + ")"); // pas retrouver une classe pour cette longueur, on le laisse dans la meme classe. @@ -733,7 +733,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -767,7 +767,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -801,7 +801,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } @@ -839,7 +839,7 @@ } public String toString() { - String result = _("isisfish.populationSeasonInfo.toString", this + String result = t("isisfish.populationSeasonInfo.toString", this .getPopulation(), this.getFirstMonth(), this.getLastMonth()); return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -29,7 +29,7 @@ import java.util.List; import fr.ifremer.isisfish.types.Month; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /*** * SeasonImpl. @@ -104,7 +104,7 @@ */ @Override public String toString() { - String result = _("isisfish.season.toString", this.getFirstMonth(), + String result = t("isisfish.season.toString", this.getFirstMonth(), this.getLastMonth()); return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.nuiton.topia.TopiaException; @@ -110,7 +110,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -135,7 +135,7 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.change.equation"), + throw new IsisFishRuntimeException(t("isisfish.change.equation"), eee); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.Arrays; @@ -98,7 +98,7 @@ List<StrategyMonthInfo> result = super.getStrategyMonthInfo(); if (result == null || result.size() != Month.NUMBER_OF_MONTH) { if (result != null) { - log.warn(_("isisfish.error.strategy.order", getName(), + log.warn(t("isisfish.error.strategy.order", getName(), result.size())); clearStrategyMonthInfo(); } else { @@ -201,7 +201,7 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.change.equation"), + throw new IsisFishRuntimeException(t("isisfish.change.equation"), eee); } } @@ -235,10 +235,10 @@ List<Month> months = Arrays.asList(Month.MONTH); MatrixND result = MatrixFactory.getInstance().create( - _("isisfish.strategy.proportionMetier"), + t("isisfish.strategy.proportionMetier"), new List[] { metiers, months}, - new String[] { _("isisfish.strategyMonthInfo.metier"), - _("isisfish.common.months")}); + new String[] { t("isisfish.strategyMonthInfo.metier"), + t("isisfish.common.months")}); // copy sub StrategyMonthInfo's proportionMetier to current if (getStrategyMonthInfo() != null) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.Collection; @@ -117,14 +117,14 @@ if (result == null) { result = MatrixFactory.getInstance().create( - _("isisfish.strategyMonthInfo.proportion"), + t("isisfish.strategyMonthInfo.proportion"), new List[] { metiers }, - new String[] { _("isisfish.strategyMonthInfo.metier") }); + new String[] { t("isisfish.strategyMonthInfo.metier") }); } else if (!result.getSemantic(0).equals(metiers)) { MatrixND tmp = MatrixFactory.getInstance().create( - _("isisfish.strategyMonthInfo.proportion"), + t("isisfish.strategyMonthInfo.proportion"), new List[] { metiers }, - new String[] { _("isisfish.strategyMonthInfo.metier") }); + new String[] { t("isisfish.strategyMonthInfo.metier") }); tmp.pasteSemantics(result); result = tmp; } @@ -170,7 +170,7 @@ */ @Override public String toString() { - String result = _("isisfish.strategyMonthInfo.toString", this + String result = t("isisfish.strategyMonthInfo.toString", this .getStrategy(), this.getMonth()); return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -73,7 +73,7 @@ setTargetFactorEquation(eq); } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.create.equation"), eee); + t("isisfish.error.create.equation"), eee); } } @@ -102,7 +102,7 @@ } catch (TopiaException eee) { throw new IsisFishRuntimeException( - _("isisfish.error.change.equation"), eee); + t("isisfish.error.change.equation"), eee); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.apache.commons.beanutils.BeanUtils; import org.nuiton.topia.TopiaException; @@ -115,7 +115,7 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.change.equation"), eee); + throw new IsisFishRuntimeException(t("isisfish.change.equation"), eee); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -36,7 +36,7 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.IOException; @@ -137,10 +137,10 @@ Logger.getRootLogger().addAppender(appender); if (log.isDebugEnabled()) { - log.debug(_("isisfish.log.addAppender", appenderId)); + log.debug(t("isisfish.log.addAppender", appenderId)); } } catch (IOException ex) { - log.error(_("isisfish.error.log.createAppender", appenderId, ex.getMessage())); + log.error(t("isisfish.error.log.createAppender", appenderId, ex.getMessage())); throw new IsisFishException("Can't add appender", ex); } @@ -153,7 +153,7 @@ */ public static void removeSimulationAppender(String appenderId) { if (log.isDebugEnabled()) { - log.debug(_("isisfish.log.removeAppender", appenderId)); + log.debug(t("isisfish.log.removeAppender", appenderId)); } removeAppender(null, appenderId); // push back to original levels @@ -182,12 +182,12 @@ String smtpServer = IsisFish.config.getSmtpServer(); String defaultFrom = IsisFish.config.getUserMail(); - String title = _("isisfish.simulation.log.console.title", simulationName); + String title = t("isisfish.simulation.log.console.title", simulationName); LogConsole.newConsole(logFile, smtpServer, defaultFrom, null, title); if (log.isInfoEnabled()) { - log.info(_("isisfish.simulation.log.showConsole", simulationName)); + log.info(t("isisfish.simulation.log.showConsole", simulationName)); } } @@ -218,7 +218,7 @@ // we found a logger to keep at his level result.put(logger.getName(), logger.getLevel()); if (log.isDebugEnabled()) { - log.debug(_("isisfish.log.swapLogLevel", loggerName, logger.getLevel(), logLevel)); + log.debug(t("isisfish.log.swapLogLevel", loggerName, logger.getLevel(), logLevel)); } // change to new level logger.setLevel(level); @@ -242,7 +242,7 @@ if (logger != null) { Level oldLevel = entry.getValue(); if (log.isDebugEnabled()) { - log.debug(_("isisfish.log.restoreLogLevel", logger.getName(), logger.getLevel(), oldLevel)); + log.debug(t("isisfish.log.restoreLogLevel", logger.getName(), logger.getLevel(), oldLevel)); } logger.setLevel(oldLevel); } @@ -262,16 +262,16 @@ // get logger for the category Logger logger = category == null ? Logger.getRootLogger() : Logger.getLogger(category); if (logger == null) { - Logger.getRootLogger().warn(_("isisfish.error.log.closeAppender", name, category)); + Logger.getRootLogger().warn(t("isisfish.error.log.closeAppender", name, category)); return; } // get the required appender Appender app = logger.getAppender(name); if (app == null) { - logger.warn(_("isisfish.error.log.foundAppender", name, category)); + logger.warn(t("isisfish.error.log.foundAppender", name, category)); return; } - logger.info(_("isisfish.log.closeAppender", name, category)); + logger.info(t("isisfish.log.closeAppender", name, category)); // close appender app.close(); // and remove it from the logger Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.logging.console; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.EventQueue; import java.awt.event.ActionEvent; @@ -96,7 +96,7 @@ defaultFrom, String defaultTo, String title) throws IOException, IllegalArgumentException { if (!logFile.exists()) { - String message1 = _("could not found log file %1$s", logFile); + String message1 = t("could not found log file %1$s", logFile); log.warn(message1); throw new IllegalArgumentException(message1); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -29,7 +29,7 @@ import static fr.ifremer.isisfish.logging.console.LogConsole.RESET_CHANGED_PROPERTY; import static fr.ifremer.isisfish.logging.console.LogConsole.TEXT_CHANGED_PROPERTY; import static org.apache.commons.logging.LogFactory.getLog; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.event.AdjustmentEvent; import java.awt.event.AdjustmentListener; @@ -143,7 +143,7 @@ try { levelsReader.close(); } catch (IOException e) { - log.warn(_("could not close reader %1$s", levelsReader)); + log.warn(t("could not close reader %1$s", levelsReader)); } } @@ -151,7 +151,7 @@ try { reader.close(); } catch (IOException e) { - log.warn(_("could not close reader %1$s", reader)); + log.warn(t("could not close reader %1$s", reader)); } } } @@ -212,7 +212,7 @@ dontAdjust = true; read(newOffset); } catch (IOException e1) { - log.warn(_("could not read at offset %1$s for reason %2$s", newOffset, e1.getMessage())); + log.warn(t("could not read at offset %1$s for reason %2$s", newOffset, e1.getMessage())); } } @@ -225,7 +225,7 @@ dontAdjust = true; read(e.getValue()); } catch (IOException e1) { - log.warn(_("could not read at offset %1$s for reason %2$s", e.getValue(), e1.getMessage())); + log.warn(t("could not read at offset %1$s for reason %2$s", e.getValue(), e1.getMessage())); } } @@ -240,7 +240,7 @@ try { close(); } catch (Exception e) { - log.warn(_("isisfish.error.log.console.dispose" ,this,e.getMessage())); + log.warn(t("isisfish.error.log.console.dispose" ,this,e.getMessage())); } return; } @@ -360,7 +360,7 @@ read(0); dontAdjust = true; model.fireStateChanged(); - getStatusBar().setStatus(_("filter loaded in %1$s ms : found %2$s lines.", (System.currentTimeMillis() - t0), reader.getNbLines())); + getStatusBar().setStatus(t("filter loaded in %1$s ms : found %2$s lines.", (System.currentTimeMillis() - t0), reader.getNbLines())); } catch (IOException e) { log.warn("could not open reader [" + this.reader + "] for reason " + e.getMessage()); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.logging.console; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -97,7 +97,7 @@ protected StatusBar statusBar; public LogMail(final StatusBar statusBar, String from, File logFile, File simulationFile, final String smtpServer) { - setTitle(_("isisfish.log.mail.send.title", simulationFile.getName())); + setTitle(t("isisfish.log.mail.send.title", simulationFile.getName())); this.from = from; this.logFile = logFile; this.simulationFile = simulationFile; @@ -108,9 +108,9 @@ public void actionPerformed(ActionEvent e) { try { sendMail(mailTo.getText(), content.getText(), sendAll.isSelected()); - statusBar.setStatus(_("isisfish.log.mail.send" , to)); + statusBar.setStatus(t("isisfish.log.mail.send" , to)); } catch (Exception eee) { - statusBar.setStatus(_("isisfish.log.mail.failed", smtpServer)); + statusBar.setStatus(t("isisfish.log.mail.failed", smtpServer)); } finally { dispose(); } @@ -157,7 +157,7 @@ BodyPart attPart = new MimeBodyPart(); // -- Set the subject and body text -- - String subject = _("isisfish.log.simulation.name",simulationFile.getName()); + String subject = t("isisfish.log.simulation.name",simulationFile.getName()); msg.setSubject(subject); final File zipFile; @@ -252,7 +252,7 @@ if (tmpDirectory != null) { if (!FileUtils.deleteQuietly(tmpDirectory)) { - log.warn(_("isisfish.error.remove.directory", tmpDirectory)); + log.warn(t("isisfish.error.remove.directory", tmpDirectory)); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Graphics; import java.awt.GraphicsEnvironment; @@ -87,7 +87,7 @@ menu = new JPopupMenu(); JMenuItem copyClicboardItem = new JMenuItem(); - copyClicboardItem.setText(_("isisfish.input.map.copytoclicboard")); + copyClicboardItem.setText(t("isisfish.input.map.copytoclicboard")); copyClicboardItem.setActionCommand(COPY_TO_CLICBOARD_COMMAND); copyClicboardItem.addActionListener(this); menu.add(copyClicboardItem); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.ArrayList; @@ -605,7 +605,7 @@ for (String filename : getFisheryRegion().getMapFilePath()) { if (!StringUtils.isEmpty(filename)) { if (log.isDebugEnabled()) { - log.debug(_("isisfish.message.load.map", filename)); + log.debug(t("isisfish.message.load.map", filename)); } addLayer(filename, filename, "ff000000", "ffbdde83"); shapeLoaded = true; @@ -624,7 +624,7 @@ } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("isisfish.error.init.map"), eee); + log.error(t("isisfish.error.init.map"), eee); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.awt.Component; @@ -358,11 +358,11 @@ for (Object datamap : datamaps) { DefaultDataMap dataMap = (DefaultDataMap) datamap; if (dataMap.getInfo() != null) { - info += _("Info") + ": " + dataMap.getInfo().getLabels() - + " " + _("isisfish.common.value") + ":" + dataMap.getValue() + "\n"; + info += t("Info") + ": " + dataMap.getInfo().getLabels() + + " " + t("isisfish.common.value") + ":" + dataMap.getValue() + "\n"; } else { - info += " " + _("isisfish.common.value") + ":" + dataMap.getValue() + "\n"; + info += " " + t("isisfish.common.value") + ":" + dataMap.getValue() + "\n"; } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; import java.util.ArrayList; import java.util.Collection; @@ -160,7 +160,7 @@ result = MatrixFactory.getInstance().create( name, new List[] {strategies, metiers}, - new String[] {n_("isisfish.metierMonitor.strategies"), n_("isisfish.metierMonitor.metiers")}); + new String[] {n("isisfish.metierMonitor.strategies"), n("isisfish.metierMonitor.metiers")}); setNoActivity(step, result); } return result; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.Collection; import java.util.HashSet; @@ -129,7 +129,7 @@ } } catch (IsisFishException eee) { if (log.isWarnEnabled()) { - log.warn(_("Can't instanciate export %1$s", exportName), eee); + log.warn(t("Can't instanciate export %1$s", exportName), eee); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.ArrayList; import java.util.List; @@ -97,7 +97,7 @@ // make exports if (!allExports.isEmpty()) { - control.setText(_("isisfish.message.export.export")); + control.setText(t("isisfish.message.export.export")); File exportDir = SimulationStorage .getResultExportDirectory(rootDirectory); exportDir.mkdirs(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -29,7 +29,7 @@ import fr.ifremer.isisfish.ui.widget.filter.FilterParamModel; import fr.ifremer.isisfish.ui.widget.filter.ValueGetter; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -116,7 +116,7 @@ result = dateFormat.parse(d); } catch (ParseException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.parse.date", d), eee); + log.warn(t("isisfish.error.parse.date", d), eee); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -276,7 +276,7 @@ region = RegionStorage.getRegion(getRegionName()); } else { if (log.isDebugEnabled()) { - log.debug(_("Region %s already inited", getRegionName())); + log.debug(t("Region %s already inited", getRegionName())); } } return this.region; @@ -1210,7 +1210,7 @@ @Override public void setSimulLogLevel(String logLevel) { if (log.isDebugEnabled()) { - log.debug(_("isisfish.params.changeLogLev", simulLogLevel, + log.debug(t("isisfish.params.changeLogLev", simulLogLevel, logLevel)); } this.simulLogLevel = logLevel; @@ -1240,7 +1240,7 @@ @Override public void setScriptLogLevel(String logLevel) { if (log.isDebugEnabled()) { - log.debug(_("isisfish.params.changeLogLev", scriptLogLevel, + log.debug(t("isisfish.params.changeLogLev", scriptLogLevel, logLevel)); } this.scriptLogLevel = logLevel; @@ -1268,7 +1268,7 @@ @Override public void setLibLogLevel(String logLevel) { if (log.isDebugEnabled()) { - log.debug(_("isisfish.params.changeLogLev", libLogLevel, logLevel)); + log.debug(t("isisfish.params.changeLogLev", libLogLevel, logLevel)); } this.libLogLevel = logLevel; } @@ -1464,25 +1464,25 @@ public String toString() { StringBuffer result = new StringBuffer(); result.append( - _("isisfish.params.toString.simulation.done", + t("isisfish.params.toString.simulation.done", getIsisFishVersion())).append('\n'); result.append("--------------------\n"); result.append(getDescription()).append('\n'); result.append("--------------------\n"); if (getUseSimulationPlan()) { - result.append(_("isisfish.params.toString.plan.number", + result.append(t("isisfish.params.toString.plan.number", getSimulationPlanNumber())); } RegionStorage region = getRegion(); - result.append(_("isisfish.params.toString.fishery", region.getName())); - result.append(_("isisfish.params.toString.number.years", + result.append(t("isisfish.params.toString.fishery", region.getName())); + result.append(t("isisfish.params.toString.number.years", getNumberOfYear())); // startegies List<Strategy> strs = getStrategies(); - result.append(_("isisfish.params.toString.strategies")); + result.append(t("isisfish.params.toString.strategies")); String sep = ""; for (Strategy str : strs) { result.append(sep).append(str.getName()); @@ -1491,7 +1491,7 @@ result.append("\n\n"); // populations - result.append(_("isisfish.params.toString.populations")); + result.append(t("isisfish.params.toString.populations")); sep = ""; for (Population pop : getPopulations()) { result.append(sep).append(pop.getName()); @@ -1511,7 +1511,7 @@ + name, eee); } } - result.append(_("isisfish.params.toString.rule", name)); + result.append(t("isisfish.params.toString.rule", name)); result.append('\n'); result.append(param); result.append("\n"); @@ -1531,24 +1531,24 @@ + name, eee); } } - result.append(_("isisfish.params.toString.plan", name)); + result.append(t("isisfish.params.toString.plan", name)); result.append('\n'); result.append(param); result.append('\n'); } result.append('\n'); - result.append(_("isisfish.params.toString.script.presimulation")) + result.append(t("isisfish.params.toString.script.presimulation")) .append(":\n"); result.append(getPreScript()); result.append('\n'); - result.append(_("isisfish.params.toString.simul.logger.level", + result.append(t("isisfish.params.toString.simul.logger.level", simulLogLevel)); result.append('\n'); - result.append(_("isisfish.params.toString.script.logger.level", + result.append(t("isisfish.params.toString.script.logger.level", scriptLogLevel)); result.append('\n'); - result.append(_("isisfish.params.toString.lib.logger.level", + result.append(t("isisfish.params.toString.lib.logger.level", libLogLevel)); result.append('\n'); return result.toString(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.HashMap; import java.util.Map; @@ -62,7 +62,7 @@ @Override public void beforeSimulation(SimulationContext context) { try { - context.message(_("isisfish.message.presimulation.script.execution")); + context.message(t("isisfish.message.presimulation.script.execution")); SimulationStorage simulation = context.getSimulationStorage(); SimulationParameter parameters = simulation.getParameter(); @@ -82,7 +82,7 @@ } } catch (Exception eee) { throw new SimulationException( - _("Can't evaluate simulation prescript"), eee); + t("Can't evaluate simulation prescript"), eee); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.BufferedReader; import java.io.File; @@ -81,7 +81,7 @@ } catch (IOException e) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.load.file", file)); + log.warn(t("isisfish.error.load.file", file)); } } finally { IOUtils.closeQuietly(reader); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -111,7 +111,7 @@ out.close(); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.simulation.resultXml.close",eee.getMessage()), eee); + log.warn(t("isisfish.error.simulation.resultXml.close",eee.getMessage()), eee); } } } @@ -133,7 +133,7 @@ out.write("<outData>\n"); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.simulation.resultXml.open",eee.getMessage()), eee); + log.warn(t("isisfish.error.simulation.resultXml.open",eee.getMessage()), eee); } } } @@ -158,7 +158,7 @@ out.write(" </m>\n"); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.simulation.resultXml.write",eee.getMessage()), eee); + log.warn(t("isisfish.error.simulation.resultXml.write",eee.getMessage()), eee); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.net.MalformedURLException; @@ -101,7 +101,7 @@ String id = control.getId(); if (log.isInfoEnabled()) { - log.info(_("simulate %s with file %s", id, simulationZip)); + log.info(t("simulate %s with file %s", id, simulationZip)); } try { @@ -147,7 +147,7 @@ simulation = localSimulate(control, simulation); } catch (Exception eee) { - log.error(_("Can't do simulation %s", id), eee); + log.error(t("Can't do simulation %s", id), eee); if (simulation != null) { simulation.getInformation().setException(eee); } @@ -189,7 +189,7 @@ @Override public String toString() { - return _("isisfish.simulator.launcher.inprocess"); + return t("isisfish.simulator.launcher.inprocess"); } /** @@ -232,7 +232,7 @@ libLogLevel, simThread.getName()); } catch (Exception e) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.add.logger.simulation", e)); + log.warn(t("isisfish.error.add.logger.simulation", e)); } } try { @@ -241,7 +241,7 @@ simThread.join(); } catch (InterruptedException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.wait.simThread"), eee); + log.warn(t("isisfish.error.wait.simThread"), eee); } } } finally { @@ -293,7 +293,7 @@ // on leve un runtime, car normalement cette erreur est pratiquement // impossible car on creer l'url a partir d'un File ce qui ne pose // noralement pas de probleme - throw new IsisFishRuntimeException(_("isisfish.error.change.classloader", directory), eee); + throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); } } @@ -353,11 +353,11 @@ if (parameters.getUseStatistic() || parameters.getUseOptimization()) { if (parameters.getUseStatistic()) { - message(control, _("isisfish.message.setting.trace.aspects")); + message(control, t("isisfish.message.setting.trace.aspects")); classLoader.deploy(TraceAspect.class); } if (parameters.getUseOptimization()) { - message(control, _("isisfish.message.setting.cache.aspects")); + message(control, t("isisfish.message.setting.cache.aspects")); classLoader.deploy(CacheAspect.class); } } @@ -382,7 +382,7 @@ // // Lancement du script de simulation selectionné // - message(control, _("isisfish.message.simulation.execution")); + message(control, t("isisfish.message.simulation.execution")); // // Call listener simulation (used per example for prescript) @@ -393,7 +393,7 @@ // // Ajout des nouveaux objets créés durant la simulation // - message(control, _("isisfish.message.add.objets.simulation")); + message(control, t("isisfish.message.add.objets.simulation")); // on ajoute sur le DBResult car pour les exports peut-etre auront // nous besoin de ces nouveaux objets, et durant la simulation // les resultats sont recuperer dans le DBResult @@ -410,7 +410,7 @@ // context.fireAfterSimulation(); - message(control, _("isisfish.message.simulation.ended")); + message(control, t("isisfish.message.simulation.ended")); simulation.getInformation().setSimulationEnd(new java.util.Date()); @@ -428,14 +428,14 @@ resultStorage.close(); } catch (OutOfMemoryError eee) { - log.error(_("isisfish.error.during.simulation"), eee); + log.error(t("isisfish.error.during.simulation"), eee); simulation.getInformation().setException(eee); - throw new SimulationException(_("isisfish.error.out.memory"), eee); + throw new SimulationException(t("isisfish.error.out.memory"), eee); } catch (Exception eee) { - log.error(_("isisfish.error.during.simulation"), eee); + log.error(t("isisfish.error.during.simulation"), eee); simulation.getInformation().setException(eee); throw new SimulationException( - _("isisfish.error.during.simulation"), eee); + t("isisfish.error.during.simulation"), eee); } finally { // // Finaly close all TopiaContext used during simulation Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.BufferedInputStream; import java.io.File; @@ -203,7 +203,7 @@ */ @Override public String toString() { - return _("isisfish.simulator.launcher.remote"); + return t("isisfish.simulator.launcher.remote"); } /** @@ -285,18 +285,18 @@ String simulationid = control.getId(); // connection - message(control, _("isisfish.simulation.remote.message.connection")); + message(control, t("isisfish.simulation.remote.message.connection")); Session sshSession = getSSHSession(); //Session sshSftpSession = getSSHSftpSession(); // upload simulation on server - message(control, _("isisfish.simulation.remote.message.upload")); + message(control, t("isisfish.simulation.remote.message.upload")); String simulationRemotePath = uploadSimulationIfNecessary(sshSession, simulationItem, simulationid, simulationZip); String remoteResultZip = getRemoteResultArchivePath(simulationid); // build du contenu du script - message(control,_("isisfish.simulation.remote.message.waitingstart")); + message(control,t("isisfish.simulation.remote.message.waitingstart")); String simulationPreScriptPath = uploadPreScriptIfNecessary( sshSession, control.getId(), simulationPrescript); @@ -305,10 +305,10 @@ } catch (Exception e) { if (log.isErrorEnabled()) { - log.error(_("isisfish.error.simulation.remote.global")); + log.error(t("isisfish.error.simulation.remote.global")); } throw new RemoteException( - _("isisfish.error.simulation.remote.global"), e); + t("isisfish.error.simulation.remote.global"), e); } } @@ -388,7 +388,7 @@ // file doesn't exist if (log.isDebugEnabled()) { // not add ,e plz :) - log.debug(_("Remote control file doesn't exists %s", e.getMessage())); + log.debug(t("Remote control file doesn't exists %s", e.getMessage())); } } @@ -401,7 +401,7 @@ File md5ControlFile = downloadResultsMD5File(sshSession, control.getId()); if (md5ControlFile != null) { - control.setText(_("isisfish.simulation.remote.message.downloadresults")); + control.setText(t("isisfish.simulation.remote.message.downloadresults")); String md5sum = FileUtils.readFileToString(md5ControlFile); @@ -444,7 +444,7 @@ } catch(SSHException e) { if (log.isDebugEnabled()) { - log.debug(_("Can't download archive : %s", e.getMessage())); + log.debug(t("Can't download archive : %s", e.getMessage())); } } @@ -481,14 +481,14 @@ // file doesn't exist if (log.isDebugEnabled()) { // not add ,e plz :) - log.debug(_("Remote information file doesn't exists %s", e + log.debug(t("Remote information file doesn't exists %s", e .getMessage())); } } } catch (IOException e) { if (log.isErrorEnabled()) { // not add ,e plz :) - log.error(_("Can't download file"), e); + log.error(t("Can't download file"), e); } } } @@ -533,7 +533,7 @@ port = Integer.parseInt(sPort); } catch (NumberFormatException e) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.simulation.remote.wrongportvalue", + log.warn(t("isisfish.error.simulation.remote.wrongportvalue", sPort)); } } @@ -541,7 +541,7 @@ } if (log.isInfoEnabled()) { - log.info(_("Try to log on %s@%s:%d", username, host, port)); + log.info(t("Try to log on %s@%s:%d", username, host, port)); } // add ssh key @@ -549,7 +549,7 @@ File sshKey = IsisFish.config.getSSHPrivateKeyFilePath(); if (sshKey.canRead()) { if (log.isInfoEnabled()) { - log.info(_("Ssh key found '%s' will be used to connect to", + log.info(t("Ssh key found '%s' will be used to connect to", sshKey.getAbsoluteFile(), host)); } jsch.addIdentity(sshKey.getAbsolutePath()); @@ -557,7 +557,7 @@ } else { if (log.isInfoEnabled()) { - log.info(_("Can't read ssh key : %s", sshKey)); + log.info(t("Can't read ssh key : %s", sshKey)); } } @@ -638,12 +638,12 @@ } } catch (IOException e) { if (log.isErrorEnabled()) { - log.error(_("Error while uploading public key to remote serveur authorized_keys"), + log.error(t("Error while uploading public key to remote serveur authorized_keys"), e); } } catch (SSHException e) { if (log.isErrorEnabled()) { - log.error(_("Error while uploading public key to remote serveur authorized_keys"), + log.error(t("Error while uploading public key to remote serveur authorized_keys"), e); } } @@ -715,7 +715,7 @@ int exit = SSHUtils.exec(session, command); if (exit != 0) { - throw new SSHException(_("Command '%s' fail to execute", command)); + throw new SSHException(t("Command '%s' fail to execute", command)); } SSHUtils.scpTo(session, simulationFile, remoteSimulationZipPath); @@ -891,7 +891,7 @@ protected void clearSimulationFiles(Session session, SimulationControl control) throws IOException, SSHException { - control.setText(_("isisfish.simulation.remote.message.deletingfiles")); + control.setText(t("isisfish.simulation.remote.message.deletingfiles")); // execute rm -f "isis-tmp/simulation-$id-"* // on remote. Note * outside quotes !!! @@ -1119,10 +1119,10 @@ } catch (TemplateException e) { if (log.isErrorEnabled()) { - log.error(_("Process template error"), e); + log.error(t("Process template error"), e); } - throw new IOException(_("Process template error"), e); + throw new IOException(t("Process template error"), e); } return scriptContent; @@ -1168,7 +1168,7 @@ int exit = SSHUtils.exec(session, command, output); if (exit != 0) { - throw new SSHException(_("Command '%s' fail to execute", command)); + throw new SSHException(t("Command '%s' fail to execute", command)); } String out = output.toString(); @@ -1204,7 +1204,7 @@ // can fail, already stopped /*if (exit != 0) { - throw new SSHException(_("Command '%s' fail to execute", command)); + throw new SSHException(t("Command '%s' fail to execute", command)); }*/ } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -27,7 +27,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -77,7 +77,7 @@ this.simulationService = simulationService; this.launcher = launcher; lastCorePoolSize = prestartAllCoreThreads(); - log.info(_("SimulationExecutor started with %s thread for %s", + log.info(t("SimulationExecutor started with %s thread for %s", lastCorePoolSize, launcher)); } @@ -134,7 +134,7 @@ SimulationService.getService().resubmit((SimulationJob) r); } throw new RuntimeException( - _("Normal stop thread, this is not an error")); + t("Normal stop thread, this is not an error")); } if (r instanceof SimulationJob) { SimulationJob job = (SimulationJob) r; @@ -156,7 +156,7 @@ job.setLauncher(launcher); } } else { - log.warn(_("Jobs submited is not ItemSimulation but was %s", r + log.warn(t("Jobs submited is not ItemSimulation but was %s", r .getClass().getName())); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.rmi.RemoteException; import java.util.HashSet; @@ -201,7 +201,7 @@ if (control.isStopSimulationRequest() || (getParentJob() != null && getParentJob().getItem() .getControl().isStopSimulationRequest())) { - log.info(_("Not start simulation %s because user ask stop", + log.info(t("Not start simulation %s because user ask stop", id)); return; } @@ -218,7 +218,7 @@ SimulationService.PrepareSimulationJob i = new SimulationService.PrepareSimulationJob( simulationService, this); while (!control.isStopSimulationRequest() && i.hasNext()) { - log.info(_("Generate next simulation")); + log.info(t("Generate next simulation")); SimulationJob subjob = i.next(); subjob.setLauncher(getLauncher()); // c'est bloquant seulement le temps du lancement @@ -320,7 +320,7 @@ .getName(), id); } } catch (Exception eee) { - log.error(_("Can't export simulation %s", id), eee); + log.error(t("Can't export simulation %s", id), eee); } try { @@ -335,20 +335,20 @@ } } } catch (Exception eee) { - log.error(_("Can't delete simulation %s ", id), eee); + log.error(t("Can't delete simulation %s ", id), eee); } for (PostAction action : postActions) { try { action.finished(this, simulation); } catch (Exception eee) { - log.error(_("Can't do post action %s", action), eee); + log.error(t("Can't do post action %s", action), eee); } }*/ } } catch (Throwable eee) { - log.warn(_("Can't simulate %s", item.getControl().getId()), eee); + log.warn(t("Can't simulate %s", item.getControl().getId()), eee); if (eee instanceof RemoteException) { simulationService.reportError(getLauncher(), this); } else { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -615,7 +615,7 @@ action.finished(job, simulation); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("Can't do post action %s", action), eee); + log.error(t("Can't do post action %s", action), eee); } } } @@ -680,7 +680,7 @@ // display user text "Looking for last simulation" SimulationControl control = job.getItem().getControl(); - control.setText(_("isisfish.simulation.message.lookingforlast")); + control.setText(t("isisfish.simulation.message.lookingforlast")); // this is a sensitivity simulation String simulationId = job.getId(); @@ -694,7 +694,7 @@ // et on l'envoie au script d'analyse de sensibilite if (numberFinished == numberOfSimulation) { - control.setText(_("isisfish.simulation.message.analyzeResults")); + control.setText(t("isisfish.simulation.message.analyzeResults")); SensitivityAnalysis sensitivityAnalysis = params.getSensitivityAnalysis(); if (sensitivityAnalysis != null) { @@ -723,7 +723,7 @@ } } - control.setText(_("isisfish.message.simulation.ended")); + control.setText(t("isisfish.message.simulation.ended")); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -194,7 +194,7 @@ .newInstance(value); addSimulationLauncher(sl); } catch (Exception eee) { - log.warn(_("Can't instantiate %s", value), eee); + log.warn(t("Can't instantiate %s", value), eee); } } @@ -726,7 +726,7 @@ } } // dernier recours on ajoute a la queue sans launcher - log.info(_("Add to default queue")); + log.info(t("Add to default queue")); queue.add(job); } @@ -813,7 +813,7 @@ i.setValue(i.intValue() + 1); // si on a plus de N error, on stop l'executor associe if (i.intValue() >= 50) { - log.error(_("Launcher %s will be stopped because there are too many error (%s)", + log.error(t("Launcher %s will be stopped because there are too many error (%s)", launcher, i.intValue())); SimulationExecutor e = executors.get(launcher); e.pause(); @@ -871,9 +871,9 @@ // we are in a thread, IsisFishRuntimeException is displayed // outside a log if (log.isErrorEnabled()) { - log.error(_("isisfish.error.evaluate.preplan.script"), eee); + log.error(t("isisfish.error.evaluate.preplan.script"), eee); } - throw new IsisFishRuntimeException(_("isisfish.error.evaluate.preplan.script"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.evaluate.preplan.script"), eee); } } @@ -897,7 +897,7 @@ simulationService.submitSubJob(subJob); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("Can't add simulation: %s", job.getItem() + log.error(t("Can't add simulation: %s", job.getItem() .getControl().getId()), eee); } } @@ -938,7 +938,7 @@ } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("Can't add simulation: %s", job.getItem() + log.error(t("Can't add simulation: %s", job.getItem() .getControl().getId()), eee); } } @@ -972,7 +972,7 @@ int planNumber = planContext.getNumber(); if (planNumber > MAX_PLAN_SIMULATION) { - log.error(_("Analyse plan error, too many simulation for %s : %s", + log.error(t("Analyse plan error, too many simulation for %s : %s", id, planNumber)); doNext = false; result = false; @@ -1023,7 +1023,7 @@ // quoi qu'il arrive on supprime le repertoire temporaire if (!FileUtils.deleteQuietly(tmpDirectory)) { - log.warn(_("isisfish.error.remove.directory", + log.warn(t("isisfish.error.remove.directory", tmpDirectory)); } } @@ -1036,7 +1036,7 @@ return result; } catch (Exception eee) { throw new IsisFishRuntimeException( - _("isisfish.error.evalute.plan.script"), eee); + t("isisfish.error.evalute.plan.script"), eee); } } @@ -1071,7 +1071,7 @@ boolean result = plan.afterSimulation(planContext, sim); doNext = doNext && result; } catch (Exception eee) { - log.error(_("Stop simulation plan, because can't call afterSimulation correctly on plan %s", + log.error(t("Stop simulation plan, because can't call afterSimulation correctly on plan %s", plan.getClass().getName()), eee); doNext = false; } @@ -1146,13 +1146,13 @@ // backup pour toutes les simulations, pour eviter que l'utilisateur // ne puisse le modifier en meme temps - control.setText(_("isisfish.message.backup.database.progress")); + control.setText(t("isisfish.message.backup.database.progress")); RegionStorage region = RegionStorage.getRegion(param .getRegionName()); TopiaContext tc = region.getStorage().beginTransaction(); tc.backup(regionXML, true); tc.closeContext(); - control.setText(_("isisfish.message.backup.database.finished")); + control.setText(t("isisfish.message.backup.database.finished")); // copie de toutes regles a utiliser List<Rule> rules = param.getRules(); @@ -1262,16 +1262,16 @@ // poussin 20071015: remove temp directory if (!FileUtils.deleteQuietly(tmpDirectory)) { - log.warn(_("isisfish.error.remove.directory", tmpDirectory)); + log.warn(t("isisfish.error.remove.directory", tmpDirectory)); } return result; } catch (IOException eee) { throw new SimulationException( - _("isisfish.error.prepare.information.simulation"), eee); + t("isisfish.error.prepare.information.simulation"), eee); } catch (TopiaException eee) { throw new SimulationException( - _("isisfish.error.prepare.information.simulation"), eee); + t("isisfish.error.prepare.information.simulation"), eee); } } @@ -1331,7 +1331,7 @@ */ protected void compileAllFile(SimulationControl control, File directory) { - control.setText(_("isisfish.simulation.message.scriptscompilation")); + control.setText(t("isisfish.simulation.message.scriptscompilation")); long currentTime = System.nanoTime(); // @@ -1363,7 +1363,7 @@ CompileHelper.compile(directory, fileToCompile, directory, null); long time = System.nanoTime() - currentTime; - control.setText(_("isisfish.message.compilation.time", + control.setText(t("isisfish.message.compilation.time", DurationFormatUtils.formatDuration(time / 1000000, "s'.'S"))); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -69,11 +69,11 @@ /** Columns names. */ protected final static String[] columnHeader = new String[] { - _("isisfish.queue.id"), - _("isisfish.queue.plan"), - _("isisfish.queue.launcher"), - _("isisfish.queue.status"), - _("isisfish.queue.progression"), }; + t("isisfish.queue.id"), + t("isisfish.queue.plan"), + t("isisfish.queue.launcher"), + t("isisfish.queue.status"), + t("isisfish.queue.progression"), }; /** Columns types. */ protected Class<?>[] columnClass = new Class[] { @@ -249,9 +249,9 @@ case 2: if (job.getLauncher() == null) { if (param.getUseSimulationPlan()) { - result = _("isisfish.queue.masterplan"); + result = t("isisfish.queue.masterplan"); } else { - result = _("isisfish.queue.notstarted"); + result = t("isisfish.queue.notstarted"); } } else { result = job.getLauncher().toString(); @@ -259,7 +259,7 @@ break; case 3: if (control.isStopSimulationRequest()) { - result = _("isisfish.launch.stop"); + result = t("isisfish.launch.stop"); } else { result = control.getText(); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.BufferedReader; import java.io.File; @@ -73,7 +73,7 @@ @Override public String toString() { - return _("isisfish.simulator.launcher.subprocess"); + return t("isisfish.simulator.launcher.subprocess"); } @Override @@ -93,7 +93,7 @@ simulation = subProcessSimulate(control, simulationZip, simulationPrescript); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("Can't do simulation %s", simulationId), eee); + log.error(t("Can't do simulation %s", simulationId), eee); } // FIXME simulation is always null if exception if (simulation != null) { @@ -151,7 +151,7 @@ public SimulationStorage subProcessSimulate(SimulationControl control, File simulationZip, String simulationPrescript) throws Exception { - message(control, _("isisfish.message.simulation.prepare")); + message(control, t("isisfish.message.simulation.prepare")); String simulationId = control.getId(); // on ferme le SimulationStorage pour ne pas interferer avec le process @@ -239,7 +239,7 @@ // demarrage du process Process process = processBuilder.start(); if (log.isInfoEnabled()) { - log.info(_("SubProcess start: %s %s", process, processBuilder.command())); + log.info(t("SubProcess start: %s %s", process, processBuilder.command())); } // prepare de thread de surveillance du process si control n'est pas null @@ -325,7 +325,7 @@ } } catch (IOException e) { if (log.isErrorEnabled()) { - log.error( _("isisfish.simulator.subprocess.readoutput.error"), + log.error( t("isisfish.simulator.subprocess.readoutput.error"), e); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator.sensitivity; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.IOException; @@ -218,7 +218,7 @@ * @return user edited r instruction */ protected String editRInstruction(String rCall) { - JLabel label = new JLabel(_("Modifier le code R envoyé si vous le souhaitez")); + JLabel label = new JLabel(t("Modifier le code R envoyé si vous le souhaitez")); JTextPane text = new JTextPane(); text.setText(rCall); text.setSize(400, 400); @@ -228,7 +228,7 @@ box.add(label); box.add(new JScrollPane(text)); - JOptionPane.showMessageDialog(null, box, _("R modif"), JOptionPane.QUESTION_MESSAGE); + JOptionPane.showMessageDialog(null, box, t("R modif"), JOptionPane.QUESTION_MESSAGE); return text.getText(); } @@ -243,7 +243,7 @@ throws SensitivityException { for (Factor factor : factors) { if (factor.getDomain() instanceof DiscreteDomain) { - throw new SensitivityException(_("%s has a discrete domain, this is not acceptable for this method.", factor.getName())); + throw new SensitivityException(t("%s has a discrete domain, this is not acceptable for this method.", factor.getName())); } } } @@ -262,10 +262,10 @@ ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); Distribution distribution = domain.getDistribution(); if (distribution != Distribution.QUNIFPC && distribution != Distribution.QUNIFMM) { - throw new SensitivityException(_("%s has a non uniform distribution, this is not acceptable for this method.", factor.getName())); + throw new SensitivityException(t("%s has a non uniform distribution, this is not acceptable for this method.", factor.getName())); } } else { - throw new SensitivityException(_("%s has a discrete domain, this is not acceptable for this method.", factor.getName())); + throw new SensitivityException(t("%s has a discrete domain, this is not acceptable for this method.", factor.getName())); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.simulator.sensitivity; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import jdistlib.Binomial; import jdistlib.Cauchy; import jdistlib.ChiSquare; @@ -47,61 +47,61 @@ */ public enum Distribution { - QUNIFPC(_("QUnif %"), + QUNIFPC(t("QUnif %"), "runif", Uniform.class, - new DistributionParam("reference", _("Reference value"), true), - new DistributionParam("coefficient", _("Coefficient"), false)), - QUNIFMM(_("QUnif Min/Max"), + new DistributionParam("reference", t("Reference value"), true), + new DistributionParam("coefficient", t("Coefficient"), false)), + QUNIFMM(t("QUnif Min/Max"), "runif", Uniform.class, - new DistributionParam("min", _("Minimum value"), true), - new DistributionParam("max", _("Maximum value"), true)), - DBINOM(_("Dbimom"), + new DistributionParam("min", t("Minimum value"), true), + new DistributionParam("max", t("Maximum value"), true)), + DBINOM(t("Dbimom"), "rbinom", Binomial.class, - new DistributionParam("size", _("number of trials (zero or more)")), - new DistributionParam("prob", _("probability of success on each trial"))), - DCAUCHY(_("dcauchy"), + new DistributionParam("size", t("number of trials (zero or more)")), + new DistributionParam("prob", t("probability of success on each trial"))), + DCAUCHY(t("dcauchy"), "rcauchy", Cauchy.class, - new DistributionParam("location", _("location and scale parameters. (location = 0, scale = 1)")), - new DistributionParam("scale", _("location and scale parameters. (location = 0, scale = 1)"))), - DCHISQ(_("dchisq"), + new DistributionParam("location", t("location and scale parameters. (location = 0, scale = 1)")), + new DistributionParam("scale", t("location and scale parameters. (location = 0, scale = 1)"))), + DCHISQ(t("dchisq"), "rchisq", ChiSquare.class, - new DistributionParam("df", _("degrees of freedom (non-negative, but can be non-integer)"))), - DEXP(_("dexp"), + new DistributionParam("df", t("degrees of freedom (non-negative, but can be non-integer)"))), + DEXP(t("dexp"), "rexp", Exponential.class, - new DistributionParam("rate", _("vector of rates"))), - DF(_("df"), + new DistributionParam("rate", t("vector of rates"))), + DF(t("df"), "rf", F.class, - new DistributionParam("df1", _("degrees of freedom. 'Inf' is allowed")), - new DistributionParam("df2", _("degrees of freedom. 'Inf' is allowed")), - new DistributionParam("ncp", _("non-centrality parameter. If omitted the central F is assumed"))), - DGAMMA(_("dgamma"), + new DistributionParam("df1", t("degrees of freedom. 'Inf' is allowed")), + new DistributionParam("df2", t("degrees of freedom. 'Inf' is allowed")), + new DistributionParam("ncp", t("non-centrality parameter. If omitted the central F is assumed"))), + DGAMMA(t("dgamma"), "rgamma", Gamma.class, - new DistributionParam("shape", _("shape and scale parameters. Must be positive, 'scale' strictly")), - new DistributionParam("rate", _("an alternative way to specify the scale.")), - new DistributionParam("scale", _("shape and scale parameters. Must be positive, 'scale' strictly"))), - DGEOM(_("dgeom"), + new DistributionParam("shape", t("shape and scale parameters. Must be positive, 'scale' strictly")), + new DistributionParam("rate", t("an alternative way to specify the scale.")), + new DistributionParam("scale", t("shape and scale parameters. Must be positive, 'scale' strictly"))), + DGEOM(t("dgeom"), "rgeom", Geometric.class, - new DistributionParam("prob", _("probability of success in each trial. '0 < prob <= 1'"))), - DHYPER(_("dhyper"), + new DistributionParam("prob", t("probability of success in each trial. '0 < prob <= 1'"))), + DHYPER(t("dhyper"), "rhyper", HyperGeometric.class, - new DistributionParam("m", _("the number of white balls in the urn.")), - new DistributionParam("n", _("the number of black balls in the urn.")), - new DistributionParam("k", _("the number of balls drawn from the urn."))), - DLNORM(_("dlnorm"), + new DistributionParam("m", t("the number of white balls in the urn.")), + new DistributionParam("n", t("the number of black balls in the urn.")), + new DistributionParam("k", t("the number of balls drawn from the urn."))), + DLNORM(t("dlnorm"), "rlnorm", Normal.class, - new DistributionParam("meanlog", _("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively."), false), - new DistributionParam("sdlog", _("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively."), false)); + new DistributionParam("meanlog", t("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively."), false), + new DistributionParam("sdlog", t("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively."), false)); protected String description; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/Month.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/Month.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.types; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.Serializable; import java.util.ArrayList; @@ -146,29 +146,29 @@ public String toString() { switch (getMonthNumber()) { case 0: - return _("isisfish.month.january"); + return t("isisfish.month.january"); case 1: - return _("isisfish.month.february"); + return t("isisfish.month.february"); case 2: - return _("isisfish.month.march"); + return t("isisfish.month.march"); case 3: - return _("isisfish.month.april"); + return t("isisfish.month.april"); case 4: - return _("isisfish.month.may"); + return t("isisfish.month.may"); case 5: - return _("isisfish.month.june"); + return t("isisfish.month.june"); case 6: - return _("isisfish.month.july"); + return t("isisfish.month.july"); case 7: - return _("isisfish.month.august"); + return t("isisfish.month.august"); case 8: - return _("isisfish.month.september"); + return t("isisfish.month.september"); case 9: - return _("isisfish.month.october"); + return t("isisfish.month.october"); case 10: - return _("isisfish.month.november"); + return t("isisfish.month.november"); case 11: - return _("isisfish.month.december"); + return t("isisfish.month.december"); default: return "" + getMonthNumber(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeStep.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeStep.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeStep.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -26,7 +26,7 @@ package fr.ifremer.isisfish.types; import java.io.Serializable; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * This object can't be modified. If this behavior is modified pay attention @@ -184,7 +184,7 @@ */ @Override public String toString() { - String result = _("isisfish.date.toString", getMonth(), getYear()); + String result = t("isisfish.date.toString", getMonth(), getYear()); return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.types; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.Serializable; @@ -111,9 +111,9 @@ public String toString() { String result = ""; if (getDay() >= 1) { - result += getDay() + _("isisfish.timeUnit.day"); + result += getDay() + t("isisfish.timeUnit.day"); } else { - result += getHour() + _("isisfish.timeUnit.hours"); + result += getHour() + t("isisfish.timeUnit.hours"); } return result; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.Color; @@ -137,7 +137,7 @@ context.add(new SimulAction()); context.add(this); SimulUI simulUI = new SimulUI(context); - openFrame(welcomeUI, simulUI, _("isisfish.simulation.title")); + openFrame(welcomeUI, simulUI, t("isisfish.simulation.title")); } /** @@ -145,7 +145,7 @@ * @param welcomeUI */ public void newResultFrame(WelcomeUI welcomeUI) { - openFrame(welcomeUI, new ResultUI(), _("isisfish.result.title")); + openFrame(welcomeUI, new ResultUI(), t("isisfish.result.title")); } /** @@ -153,7 +153,7 @@ * @param welcomeUI */ public void newInputFrame(WelcomeUI welcomeUI) { - openFrame(welcomeUI, new InputUI(new JAXXInitialContext().add(verifier).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title")); + openFrame(welcomeUI, new InputUI(new JAXXInitialContext().add(verifier).add(new InputAction()).add(new InputSaveVerifier()).add(this)), t("isisfish.input.title")); } /** @@ -161,7 +161,7 @@ * @param welcomeUI */ public void newScriptFrame(WelcomeUI welcomeUI) { - openFrame(welcomeUI, new ScriptUI(), _("isisfish.script.title")); + openFrame(welcomeUI, new ScriptUI(), t("isisfish.script.title")); } /** @@ -169,7 +169,7 @@ * @param welcomeUI */ public void newSensitivityFrame(WelcomeUI welcomeUI) { - openFrame(welcomeUI, new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new SensitivitySaveVerifier()).add(new SimulAction()).add(this)), _("isisfish.sensitivity.title")); + openFrame(welcomeUI, new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new SensitivitySaveVerifier()).add(new SimulAction()).add(this)), t("isisfish.sensitivity.title")); } /** @@ -177,7 +177,7 @@ * @param welcomeUI */ public void newQueueFrame(WelcomeUI welcomeUI) { - openFrame(welcomeUI, new QueueUI(), _("isisfish.queue.title")); + openFrame(welcomeUI, new QueueUI(), t("isisfish.queue.title")); } /** @@ -208,7 +208,7 @@ ConfigUIHelper modelBuilder = new ConfigUIHelper(IsisFish.config); // category main - modelBuilder.addCategory(_("isisfish.config.category.main"), _("isisfish.config.category.main.description")); + modelBuilder.addCategory(t("isisfish.config.category.main"), t("isisfish.config.category.main.description")); modelBuilder.addOption(IsisConfig.Option.CONFIG_FILE); modelBuilder.addOption(IsisConfig.Option.DATABASE_DIRECTORY); modelBuilder.addOption(IsisConfig.Option.COMMUNITY_DATABASE_DIRECTORY); @@ -221,14 +221,14 @@ modelBuilder.addOption(IsisConfig.Option.SIMULATION_SCRIPT_AUTOCONFIG); // category simulation - modelBuilder.addCategory(_("isisfish.config.category.simulation"), _("isisfish.config.category.simulation.description")); + modelBuilder.addCategory(t("isisfish.config.category.simulation"), t("isisfish.config.category.simulation.description")); modelBuilder.addOption(IsisConfig.Option.SIMULATOR_IN_MAXTHREADS); modelBuilder.addOption(IsisConfig.Option.SIMULATOR_SUB_MAXPROCESS); modelBuilder.addOption(IsisConfig.Option.SIMULATOR_SUB_MAXMEMORY); modelBuilder.addOption(IsisConfig.Option.MAPPED_RESULT_MATRIX_VECTOR_CLASS); // category database vcs - modelBuilder.addCategory(_("isisfish.config.category.officialvcs"), _("isisfish.config.category.officialvcs.description")); + modelBuilder.addCategory(t("isisfish.config.category.officialvcs"), t("isisfish.config.category.officialvcs.description")); modelBuilder.addOption(IsisConfig.Option.VCS_TYPE); modelBuilder.addOption(IsisConfig.Option.VCS_PROTOCOL); modelBuilder.addOption(IsisConfig.Option.VCS_HOST_NAME); @@ -237,7 +237,7 @@ modelBuilder.addOption(IsisConfig.Option.VCS_USER_PASSWORD); // category community vcs - modelBuilder.addCategory(_("isisfish.config.category.communityvcs"), _("isisfish.config.category.communityvcs.description")); + modelBuilder.addCategory(t("isisfish.config.category.communityvcs"), t("isisfish.config.category.communityvcs.description")); modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_TYPE); modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_PROTOCOL); modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_HOST_NAME); @@ -246,14 +246,14 @@ modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_PASSWORD); // category misc - modelBuilder.addCategory(_("isisfish.config.category.misc"), _("isisfish.config.category.misc.description")); + modelBuilder.addCategory(t("isisfish.config.category.misc"), t("isisfish.config.category.misc.description")); modelBuilder.addOption(IsisConfig.Option.SSH_KEY_FILE); modelBuilder.addOption(IsisConfig.Option.USER_NAME); modelBuilder.addOption(IsisConfig.Option.SMTP_SERVER); modelBuilder.addOption(IsisConfig.Option.USER_MAIL); - ConfigUI configUI = modelBuilder.buildUI(welcomeUI, _("isisfish.config.category.main")); - JDialog dialogUI = new JDialog(welcomeUI, _("isisfish.config.title")); + ConfigUI configUI = modelBuilder.buildUI(welcomeUI, t("isisfish.config.category.main")); + JDialog dialogUI = new JDialog(welcomeUI, t("isisfish.config.title")); dialogUI.add(configUI); dialogUI.pack(); dialogUI.setLocationRelativeTo(welcomeUI); @@ -328,10 +328,10 @@ */ public void about(WelcomeUI welcomeUI) { AboutFrame about = new AboutFrame(); - about.setTitle(_("isisfish.about.title")); + about.setTitle(t("isisfish.about.title")); about.setIconPath("images/isislogo.png"); - about.setAboutHtmlText(_("isisfish.about.abouthtmltext", IsisConfig.getVersion())); - about.setLicenseText(_("isisfish.about.licensetext")); + about.setAboutHtmlText(t("isisfish.about.abouthtmltext", IsisConfig.getVersion())); + about.setLicenseText(t("isisfish.about.licensetext")); about.setBackgroundColor(Color.WHITE); about.setSize(640, 520); about.setLocationRelativeTo(welcomeUI); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.config; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.io.File; @@ -73,11 +73,11 @@ String systemPath = System.getenv("PATH"); String rBinPath = rHome + File.separator + "bin"; if (systemPath.contains(rBinPath)) { - rconfigUI.getSystemPathField().setText(_("isisfish.simulator.configuration.r.systempathok", rBinPath)); + rconfigUI.getSystemPathField().setText(t("isisfish.simulator.configuration.r.systempathok", rBinPath)); } else { rconfigUI.getSystemPathField().setBackground(Color.RED); - rconfigUI.getSystemPathField().setText(_("isisfish.simulator.configuration.r.systempathnok", rBinPath)); + rconfigUI.getSystemPathField().setText(t("isisfish.simulator.configuration.r.systempathnok", rBinPath)); } rconfigUI.getSystemPathField().setToolTipText(systemPath); } @@ -100,8 +100,8 @@ if (log.isWarnEnabled()) { log.warn("Can find 'lhs'", ex); } - JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.lhsnotinstalled"), - _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(rconfigUI, t("isisfish.simulator.configuration.r.lhsnotinstalled"), + t("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); error = true; } try { @@ -111,22 +111,22 @@ if (log.isWarnEnabled()) { log.warn("Can find 'sensitivity'", ex); } - JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.sensitivitynotinstalled"), - _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(rconfigUI, t("isisfish.simulator.configuration.r.sensitivitynotinstalled"), + t("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); error = true; } if (!error) { - JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.testok"), - _("isisfish.simulator.configuration.r.title"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(rconfigUI, t("isisfish.simulator.configuration.r.testok"), + t("isisfish.simulator.configuration.r.title"), JOptionPane.INFORMATION_MESSAGE); } } catch (RException ex) { if (log.isWarnEnabled()) { log.warn("Can find call R", ex); } - JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.cantinit", ex.getMessage()), - _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(rconfigUI, t("isisfish.simulator.configuration.r.cantinit", ex.getMessage()), + t("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.config; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.io.File; @@ -122,8 +122,8 @@ configUI.setConnected(false); configUI.getMessageLabel().setText(""); - configUI.getStatusFreeDatabaseLabel().setText(_("isisfish.simulator.ssh.configuration.freespace.label", "isis-database", "0")); - configUI.getStatusFreeTempLabel().setText(_("isisfish.simulator.ssh.configuration.freespace.label", "isis-tmp", "0")); + configUI.getStatusFreeDatabaseLabel().setText(t("isisfish.simulator.ssh.configuration.freespace.label", "isis-database", "0")); + configUI.getStatusFreeTempLabel().setText(t("isisfish.simulator.ssh.configuration.freespace.label", "isis-tmp", "0")); } @@ -275,14 +275,14 @@ boolean sshKeyUsed = false; if (currentSSHKey.canRead()) { if (log.isInfoEnabled()) { - log.info(_("Ssh key found '%s' will be used to connect to", + log.info(t("Ssh key found '%s' will be used to connect to", currentSSHKey.getAbsoluteFile(), host)); } jsch.addIdentity(currentSSHKey.getAbsolutePath()); sshKeyUsed = true; } else { if (log.isInfoEnabled()) { - log.info(_("Can't read ssh key : %s", currentSSHKey)); + log.info(t("Can't read ssh key : %s", currentSSHKey)); } } @@ -294,14 +294,14 @@ String passphrase = null; passphrase = SSHAgent.getAgent().getPassphrase(currentSSHKey); ui.setPassphrase(passphrase); - setTestMessage(_("isisfish.simulator.ssh.configuration.connectingpk"), false); + setTestMessage(t("isisfish.simulator.ssh.configuration.connectingpk"), false); } else { - setTestMessage(_("isisfish.simulator.ssh.configuration.connecting"), false); + setTestMessage(t("isisfish.simulator.ssh.configuration.connecting"), false); } session.setUserInfo(ui); session.connect(10000); // timeout - setTestMessage(_("isisfish.simulator.ssh.configuration.connectionok"), false); + setTestMessage(t("isisfish.simulator.ssh.configuration.connectionok"), false); // get user home currentSSHUserhome = getUserHomeDirectory(session); @@ -309,8 +309,8 @@ // get space disk String databaseSize = getFolderSize(session, currentSSHDatapath); String temppathSize = getFolderSize(session, currentSSHTempPath); - configUI.getStatusFreeDatabaseLabel().setText(_("isisfish.simulator.ssh.configuration.freespace.label", currentSSHDatapath, databaseSize)); - configUI.getStatusFreeTempLabel().setText(_("isisfish.simulator.ssh.configuration.freespace.label", currentSSHTempPath, temppathSize)); + configUI.getStatusFreeDatabaseLabel().setText(t("isisfish.simulator.ssh.configuration.freespace.label", currentSSHDatapath, databaseSize)); + configUI.getStatusFreeTempLabel().setText(t("isisfish.simulator.ssh.configuration.freespace.label", currentSSHTempPath, temppathSize)); session.disconnect(); configUI.setConnected(true); @@ -318,26 +318,26 @@ if (log.isErrorEnabled()) { log.error("Can't connect", e); } - setTestMessage(_("isisfish.error.simulation.remote.wrongportvalue", + setTestMessage(t("isisfish.error.simulation.remote.wrongportvalue", sPort), true); } catch (JSchException e) { if (log.isErrorEnabled()) { log.error("Can't connect", e); } - setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e + setTestMessage(t("isisfish.simulator.ssh.configuration.connectionerror", e .getMessage()), true); } catch (SSHException e) { if (log.isErrorEnabled()) { log.error("Can't connect", e); } - setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e + setTestMessage(t("isisfish.simulator.ssh.configuration.connectionerror", e .getMessage()), true); } catch (InvalidPassphraseException e) { if (log.isErrorEnabled()) { log.error("Can't connect", e); } setTestMessage( - _("isisfish.simulator.ssh.configuration.invalidpassphrase"), + t("isisfish.simulator.ssh.configuration.invalidpassphrase"), true); } } @@ -356,7 +356,7 @@ int exit = SSHUtils.exec(session, command, output); if (exit != 0) { - throw new SSHException(_("Command '%s' fail to execute", command)); + throw new SSHException(t("Command '%s' fail to execute", command)); } String out = output.toString(); @@ -408,8 +408,8 @@ throw new IllegalArgumentException("Can't delete directory : " + path); } - int response = JOptionPane.showConfirmDialog(configUI, _("isisfish.simulator.ssh.configuration.freespace.confirmdelete", path), - _("isisfish.common.confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + int response = JOptionPane.showConfirmDialog(configUI, t("isisfish.simulator.ssh.configuration.freespace.confirmdelete", path), + t("isisfish.common.confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.YES_OPTION) { JSch jsch = new JSch(); @@ -429,14 +429,14 @@ boolean sshKeyUsed = false; if (currentSSHKey.canRead()) { if (log.isInfoEnabled()) { - log.info(_("Ssh key found '%s' will be used to connect to", + log.info(t("Ssh key found '%s' will be used to connect to", currentSSHKey.getAbsoluteFile(), host)); } jsch.addIdentity(currentSSHKey.getAbsolutePath()); sshKeyUsed = true; } else { if (log.isInfoEnabled()) { - log.info(_("Can't read ssh key : %s", currentSSHKey)); + log.info(t("Can't read ssh key : %s", currentSSHKey)); } } @@ -463,20 +463,20 @@ // get space disk String databaseSize = getFolderSize(session, currentSSHDatapath); String temppathSize = getFolderSize(session, currentSSHTempPath); - configUI.getStatusFreeDatabaseLabel().setText(_("isisfish.simulator.ssh.configuration.freespace.label", currentSSHDatapath, databaseSize)); - configUI.getStatusFreeTempLabel().setText(_("isisfish.simulator.ssh.configuration.freespace.label", currentSSHTempPath, temppathSize)); + configUI.getStatusFreeDatabaseLabel().setText(t("isisfish.simulator.ssh.configuration.freespace.label", currentSSHDatapath, databaseSize)); + configUI.getStatusFreeTempLabel().setText(t("isisfish.simulator.ssh.configuration.freespace.label", currentSSHTempPath, temppathSize)); session.disconnect(); session.disconnect(); if (exit != 0) { - throw new SSHException(_("Command '%s' fail to execute", command)); + throw new SSHException(t("Command '%s' fail to execute", command)); } } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Can't connect", e); } - setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e.getMessage()), true); + setTestMessage(t("isisfish.simulator.ssh.configuration.connectionerror", e.getMessage()), true); } } else { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.input; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.geom.Point2D; import java.io.File; @@ -127,7 +127,7 @@ if (log.isErrorEnabled()) { log.error("Can't create entity", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.region.new"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.region.new"), eee); } return null; }*/ @@ -158,7 +158,7 @@ if (log.isErrorEnabled()) { log.error("Can't save region", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.save"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.input.save"), eee); } return selected; }*/ @@ -187,7 +187,7 @@ if (log.isErrorEnabled()) { log.error("Can't cancel modification in region", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.region.cancel"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.region.cancel"), eee); } return selected; }*/ @@ -210,21 +210,21 @@ boolean doDelete; List<TopiaEntity> allWillBeRemoved = selected.getComposite(); if (allWillBeRemoved.size() > 0) { - String text = _("isisfish.message.delete.object", selected + String text = t("isisfish.message.delete.object", selected .toString()); for (TopiaEntity e : allWillBeRemoved) { text += ClassUtils.getShortClassName(e.getClass()) + " - " + e.toString() + "\n"; } int resp = JOptionPane.showConfirmDialog(null, text, - _("isisfish.message.delete.entities"), + t("isisfish.message.delete.entities"), JOptionPane.YES_NO_OPTION); doDelete = resp == JOptionPane.YES_OPTION; } else { - String text = _("isisfish.message.confirm.delete.object", + String text = t("isisfish.message.confirm.delete.object", selected.toString()); int resp = JOptionPane.showConfirmDialog(null, text, - _("isisfish.message.delete.entity"), + t("isisfish.message.delete.entity"), JOptionPane.YES_NO_OPTION); doDelete = resp == JOptionPane.YES_OPTION; } @@ -232,9 +232,9 @@ if (doDelete) { selected.delete(); selected.getTopiaContext().commitTransaction(); - msg = _("isisfish.message.remove.finished"); + msg = t("isisfish.message.remove.finished"); } else { - msg = _("isisfish.message.remove.canceled"); + msg = t("isisfish.message.remove.canceled"); } } catch (Exception eee) { if (log.isErrorEnabled()) { @@ -256,7 +256,7 @@ if (eq != null) { String name = showInputDialog(""); //if ("".equals(name)) { - // showMsgBox("Error " +_("isisfish.error.invalid.equation.name")); + // showMsgBox("Error " +t("isisfish.error.invalid.equation.name")); //} if (name != null) { FormuleStorage storage = FormuleStorage.createFormule(eq @@ -284,9 +284,9 @@ public Object saveAsModel(String category, String language, String content) { try { String name = JOptionPane - .showInputDialog(_("isisfish.message.saveModel.dialog")); + .showInputDialog(t("isisfish.message.saveModel.dialog")); /*if ("".equals(name)) { - showMsgBox("Error " +_("isisfish.error.invalid.equation.name")); + showMsgBox("Error " +t("isisfish.error.invalid.equation.name")); }*/ if (name != null) { FormuleStorage storage = FormuleStorage.createFormule(category, @@ -298,7 +298,7 @@ if (log.isErrorEnabled()) { log.error("Can't save equation as model", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.equation.savemodel"), + ErrorHelper.showErrorDialog(t("isisfish.error.equation.savemodel"), eee); } return null; @@ -323,7 +323,7 @@ log.error("Can't open editor", eee); } ErrorHelper.showErrorDialog( - _("isisfish.error.equation.openeditor"), eee); + t("isisfish.error.equation.openeditor"), eee); } return null; } @@ -353,7 +353,7 @@ if (log.isErrorEnabled()) { log.error("Can't add selectivity", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.addentity", "Selectivity"), eee); } return null; @@ -371,7 +371,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove TargetSpecies", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.removeentity", "Selectivity"), eee); } return null; @@ -398,7 +398,7 @@ if (log.isErrorEnabled()) { log.error("Can't create MetierSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "SeasonInfo"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.input.addentity", "SeasonInfo"), eee); } return null; }*/ @@ -415,7 +415,7 @@ if (log.isErrorEnabled()) { log.error("Can't create MetierSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "SeasonInfo"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.input.removeentity", "SeasonInfo"), eee); } return null; }*/ @@ -448,7 +448,7 @@ if (log.isErrorEnabled()) { log.error("Can't add TargetSpecies", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.addentity", "TargetSpecies"), eee); } return null; @@ -467,7 +467,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove TargetSpecies", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.removeentity", "TargetSpecies"), eee); } return null; @@ -496,7 +496,7 @@ if (log.isErrorEnabled()) { log.error("Can't create EffortDescription", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.addentity", "EffortDescription"), eee); } } @@ -515,7 +515,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove entity: " + effort, eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.removeentity", "EffortDescription"), eee); } return null; @@ -538,7 +538,7 @@ species.update(); pop.update(); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.input.addentity", "Population"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.input.addentity", "Population"), eee); } return pop; } @@ -573,7 +573,7 @@ if (log.isErrorEnabled()) { log.error("Can't create PopulationSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.removeentity", "PopulationSeasonInfo"), eee); } return seasonInfo; @@ -592,7 +592,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove PopulationSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.removeentity", "PopulationSeasonInfo"), eee); } } @@ -634,7 +634,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove MetierSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.addentity", "MetierSeasonInfo"), eee); } } @@ -645,7 +645,7 @@ } try { String val = JOptionPane - .showInputDialog(_("isisfish.message.recruitment.number.month")); + .showInputDialog(t("isisfish.message.recruitment.number.month")); int num = -1; if (val != null && !"".equals(val)) { try { @@ -660,7 +660,7 @@ if (num > 0) { List<String> sem = new ArrayList<String>(num); for (int i = 0; i < num; i++) { - sem.add(_("isisfish.common.month", i)); + sem.add(t("isisfish.common.month", i)); } MatrixND newMat = MatrixFactory.getInstance().create( new List[] { sem }); @@ -676,7 +676,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove RecruitmentDistribution", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.removeentity", "RecruitmentDistribution"), eee); } return null; @@ -698,7 +698,7 @@ if (log.isErrorEnabled()) { log.error("Can't add migration", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.addentity", "Migration"), eee); } return null; @@ -718,7 +718,7 @@ if (log.isErrorEnabled()) { log.error("Can't add emigration", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.addentity", "Emigration"), eee); } return null; @@ -738,7 +738,7 @@ if (log.isErrorEnabled()) { log.error("Can't add immigration", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + ErrorHelper.showErrorDialog(t("isisfish.error.input.addentity", "Immigration"), eee); } return null; @@ -802,7 +802,7 @@ if (log.isErrorEnabled()) { log.error("Can't copy map file for : " + inputMap, eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.region.addmap"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.region.addmap"), eee); } } @@ -850,7 +850,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove map", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.region.removemap"), + ErrorHelper.showErrorDialog(t("isisfish.error.region.removemap"), eee); } } @@ -876,7 +876,7 @@ try { TopiaContext isisContext = fisheryRegion.getTopiaContext(); - // frame.setInfoText(_("isisfish.message.checking.cell")); + // frame.setInfoText(t("isisfish.message.checking.cell")); int latNumber = (int) Math .round((fisheryRegion.getMaxLatitude() - fisheryRegion .getMinLatitude()) @@ -943,9 +943,9 @@ isisContext.commitTransaction(); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("isisfish.error.region.save"), eee); + log.error(t("isisfish.error.region.save"), eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.region.save"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.region.save"), eee); } } @@ -962,9 +962,9 @@ dialog.setVisible(true); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("isisfish.error.region.check"), eee); + log.error(t("isisfish.error.region.check"), eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.region.check"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.region.check"), eee); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,8 +23,8 @@ package fr.ifremer.isisfish.ui.input; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -208,11 +208,11 @@ } // long operation, run status bar - setStatusMessage(inputUI, _("isisfish.message.loading.region", name), true); + setStatusMessage(inputUI, t("isisfish.message.loading.region", name), true); SwingUtilities.invokeLater(new Runnable() { public void run() { loadRegion(inputUI, name); - setStatusMessage(inputUI, _("isisfish.message.load.finished")); + setStatusMessage(inputUI, t("isisfish.message.load.finished")); } }); } @@ -225,10 +225,10 @@ */ public void createNewRegion(InputUI inputUI) { String name = inputUI.getFieldNewRegion().getText(); - setStatusMessage(inputUI, _("isisfish.message.creating.region", name), true); + setStatusMessage(inputUI, t("isisfish.message.creating.region", name), true); if (RegionStorage.getRegionNames().contains(name)) { - JOptionPane.showMessageDialog(inputUI, _("isisfish.error.region.already.exists")); + JOptionPane.showMessageDialog(inputUI, t("isisfish.error.region.already.exists")); } else { try { @@ -240,7 +240,7 @@ refreshRegionList(inputUI, name); } - setStatusMessage(inputUI, _("isisfish.message.creation.finished")); + setStatusMessage(inputUI, t("isisfish.message.creation.finished")); } /** @@ -268,11 +268,11 @@ * @param inputUI inputUI */ public void importRegion(InputUI inputUI) { - setStatusMessage(inputUI, _("isisfish.message.import.zip"), true); + setStatusMessage(inputUI, t("isisfish.message.import.zip"), true); try { File file = FileUtil.getFile(".*.zip$", - _("isisfish.message.import.region.zipped")); + t("isisfish.message.import.region.zipped")); if (file != null) { RegionStorage.importZip(file); @@ -280,10 +280,10 @@ } } catch (Exception eee) { - throw new IsisFishRuntimeException(_("isisfish.error.region.import"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.region.import"), eee); } - setStatusMessage(inputUI, _("isisfish.message.import.finished")); + setStatusMessage(inputUI, t("isisfish.message.import.finished")); } /** @@ -292,24 +292,24 @@ * @param inputUI inputUI */ public void importRegionAndRename(InputUI inputUI) { - setStatusMessage(inputUI, _("isisfish.message.import.zip"), true); + setStatusMessage(inputUI, t("isisfish.message.import.zip"), true); try { File file = FileUtil.getFile(".*.zip$", - _("isisfish.message.import.region.zipped")); + t("isisfish.message.import.region.zipped")); if (file != null) { String newName = JOptionPane - .showInputDialog(_("isisfish.message.name.imported.region")); + .showInputDialog(t("isisfish.message.name.imported.region")); RegionStorage.importAndRenameZip(file, newName); refreshRegionList(inputUI, null); } } catch (Exception eee) { - throw new IsisFishRuntimeException(_("isisfish.error.region.import"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.region.import"), eee); } - setStatusMessage(inputUI, _("isisfish.message.import.finished")); + setStatusMessage(inputUI, t("isisfish.message.import.finished")); } /** @@ -319,20 +319,20 @@ */ public void importV2Region(InputUI inputUI) { - setStatusMessage(inputUI, _("isisfish.message.import.xml.v2.file"), true); + setStatusMessage(inputUI, t("isisfish.message.import.xml.v2.file"), true); try { - File file = FileUtil.getFile(".*.xml$", _("isisfish.message.import.region.xml")); + File file = FileUtil.getFile(".*.xml$", t("isisfish.message.import.region.xml")); if (file != null) { new ImportFromV2(true).importXML(file); refreshRegionList(inputUI, null); } } catch (Exception eee) { - throw new IsisFishRuntimeException(_("isisfish.error.region.import"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.region.import"), eee); } - setStatusMessage(inputUI, _("isisfish.message.import.finished")); + setStatusMessage(inputUI, t("isisfish.message.import.finished")); } /** @@ -343,7 +343,7 @@ */ public void importRegionFromSimulation(InputUI inputUI) { - setStatusMessage(inputUI, _("isisfish.message.import"), true); + setStatusMessage(inputUI, t("isisfish.message.import"), true); // first step select a simulation and new region name try { @@ -358,12 +358,12 @@ // ask new region name String regionName = JOptionPane.showInputDialog( - _("isisfish.message.import.region.name"), "region from " + t("isisfish.message.import.region.name"), "region from " + simulationName); if (StringUtils.isNotBlank(regionName)) { if (RegionStorage.getRegionNames().contains(regionName)) { - JOptionPane.showMessageDialog(inputUI, _("isisfish.error.region.already.exists")); + JOptionPane.showMessageDialog(inputUI, t("isisfish.error.region.already.exists")); } else { SimulationStorage.getSimulation(simulationName).extractRegion(regionName); @@ -372,10 +372,10 @@ } } catch (Exception eee) { - throw new IsisFishRuntimeException(_("isisfish.error.no.select.simulation"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.no.select.simulation"), eee); } - setStatusMessage(inputUI, _("isisfish.message.export.done")); + setStatusMessage(inputUI, t("isisfish.message.export.done")); } /** @@ -388,7 +388,7 @@ public void exportRegion(InputUI inputUI) { try { File file = FileUtil.getFile(".*.zip$", - _("isisfish.message.import.region.zipped")); + t("isisfish.message.import.region.zipped")); if (file != null) { // add .zip extension is not set @@ -399,7 +399,7 @@ int resp = JOptionPane.YES_OPTION; if (file.exists()) { resp = JOptionPane.showConfirmDialog(inputUI, - _("isisfish.message.file.overwrite")); + t("isisfish.message.file.overwrite")); } if (resp == JOptionPane.YES_OPTION) { RegionStorage regionStorage = inputUI.getContextValue(RegionStorage.class); @@ -421,7 +421,7 @@ try { RegionStorage regionStorage = inputUI.getContextValue(RegionStorage.class); int resp = JOptionPane.showConfirmDialog(inputUI, - _("isisfish.message.confirm.remove.region", regionStorage.getName())); + t("isisfish.message.confirm.remove.region", regionStorage.getName())); if (resp == JOptionPane.YES_OPTION) { regionStorage.delete(vcsDelete); refreshRegionList(inputUI, null); @@ -439,7 +439,7 @@ public void copyRegion(InputUI inputUI) { try { String newName = JOptionPane - .showInputDialog(_("isisfish.message.new.region.name")); + .showInputDialog(t("isisfish.message.new.region.name")); if (StringUtils.isNotEmpty(newName)) { RegionStorage regionStorage = inputUI.getContextValue(RegionStorage.class); @@ -462,27 +462,27 @@ public void commitRegionInCVS(InputUI inputUI) { try { RegionStorage regionStorage = inputUI.getContextValue(RegionStorage.class); - setStatusMessage(inputUI, _("isisfish.message.commiting.region", regionStorage.getName()), true); + setStatusMessage(inputUI, t("isisfish.message.commiting.region", regionStorage.getName()), true); String msg = regionStorage.getCommentForNextCommit(); JTextArea text = new JTextArea(msg); int resp = JOptionPane.showOptionDialog(null, - new JScrollPane(text), _("isisfish.commit.message"), + new JScrollPane(text), t("isisfish.commit.message"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, // icon null, null); if (resp == JOptionPane.OK_OPTION) { regionStorage.commit(text.getText()); regionStorage.clearCommentForNextCommit(); - setStatusMessage(inputUI, _("isisfish.message.region.commited")); + setStatusMessage(inputUI, t("isisfish.message.region.commited")); } else { - setStatusMessage(inputUI, _("isisfish.message.commit.region.canceled")); + setStatusMessage(inputUI, t("isisfish.message.commit.region.canceled")); } } catch (VCSException eee) { throw new IsisFishRuntimeException("Can't commit region", eee); } catch (IOException eee) { throw new IsisFishRuntimeException("Can't commit region", eee); } - setStatusMessage(inputUI, _("isisfish.message.export.done")); + setStatusMessage(inputUI, t("isisfish.message.export.done")); } /** @@ -493,8 +493,8 @@ public void exportRegionSensitivityFactors(InputUI inputUI) { try { - File exportFile = FileUtil.getFile(_("isisfish.input.sensitivity.export.title"), - _("isisfish.common.ok"), inputUI, ".*\\.xml", "XML Files"); + File exportFile = FileUtil.getFile(t("isisfish.input.sensitivity.export.title"), + t("isisfish.common.ok"), inputUI, ".*\\.xml", "XML Files"); if (exportFile != null) { // make sur that filename ends with ".xml" @@ -503,14 +503,14 @@ } FisheryRegion fisheryRegion = inputUI.getContextValue(FisheryRegion.class); - setStatusMessage(inputUI, _("isisfish.input.sensitivity.export.running"), true); + setStatusMessage(inputUI, t("isisfish.input.sensitivity.export.running"), true); RegionExplorer explorer = new RegionExplorer(); RegionExport exportXML = new RegionExportFactorXML(exportFile); explorer.explore(fisheryRegion, exportXML); - setStatusMessage(inputUI, _("isisfish.input.sensitivity.export.complete"), true); + setStatusMessage(inputUI, t("isisfish.input.sensitivity.export.complete"), true); } else { - setStatusMessage(inputUI, _("isisfish.input.sensitivity.export.cancel"), true); + setStatusMessage(inputUI, t("isisfish.input.sensitivity.export.cancel"), true); } } catch (TopiaException eee) { throw new IsisFishRuntimeException("Can't export sensitivity factors", eee); @@ -711,7 +711,7 @@ fisheryTreeHelper.insertNode(selectedNode, newNode); if (nodeClass.equals(Species.class)) { FisheryTreeNode newPopNode = new FisheryTreeNode( - Population.class, n_("isisfish.input.tree.populations"), + Population.class, n("isisfish.input.tree.populations"), null, new PopulationsNodeLoador((Species)topiaEntity)); fisheryTreeHelper.insertNode(newNode, newPopNode); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.input; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.awt.Dimension; @@ -118,8 +118,8 @@ if (changed) { // ask user to close edition // still in edit mode, must warn user - response = JOptionPane.showConfirmDialog(null, _("isisfish.message.page.modified"), - _("isisfish.input.menu.commit"), JOptionPane.YES_NO_CANCEL_OPTION, + response = JOptionPane.showConfirmDialog(null, t("isisfish.message.page.modified"), + t("isisfish.input.menu.commit"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.NO_OPTION) { cancel(); @@ -157,20 +157,20 @@ TopiaEntityContextable topiaEntity = inputContentUI.getBean(); List<TopiaEntity> allWillBeRemoved = topiaEntity.getComposite(); if (allWillBeRemoved.size() > 0) { - String label = _("isisfish.message.delete.object", topiaEntity.toString()); + String label = t("isisfish.message.delete.object", topiaEntity.toString()); String text = ""; for (TopiaEntity e : allWillBeRemoved) { text += ClassUtils.getShortClassName(e.getClass()) + " - " + e.toString() + "\n"; } int resp = showTextAreaConfirmationMessage(null, label, text, - _("isisfish.message.delete.entities"), + t("isisfish.message.delete.entities"), JOptionPane.YES_NO_OPTION); doDelete = resp == JOptionPane.YES_OPTION; } else { - String text = _("isisfish.message.confirm.delete.object", topiaEntity.toString()); + String text = t("isisfish.message.confirm.delete.object", topiaEntity.toString()); int resp = JOptionPane.showConfirmDialog(null, text, - _("isisfish.message.delete.entity"), + t("isisfish.message.delete.entity"), JOptionPane.YES_NO_OPTION); doDelete = resp == JOptionPane.YES_OPTION; } @@ -183,9 +183,9 @@ InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); inputUI.getHandler().deleteTreeNode(inputUI, topiaEntity.getTopiaId()); - msg = _("isisfish.message.remove.finished"); + msg = t("isisfish.message.remove.finished"); } else { - msg = _("isisfish.message.remove.canceled"); + msg = t("isisfish.message.remove.canceled"); } } catch (TopiaException eee) { throw new IsisFishRuntimeException("Can't remove entity: " + currentEntities.get(0), eee); @@ -221,9 +221,9 @@ InputUI inputUI = inputContentUI.getContextValue(InputUI.class, JAXXUtil.PARENT); inputUI.getHandler().insertTreeNode(inputUI, type, topiaEntity); - //rootUI.setStatusMessage(_("isisfish.message.creation.finished")); + //rootUI.setStatusMessage(t("isisfish.message.creation.finished")); } catch (Exception eee) { - throw new IsisFishRuntimeException(_("isisfish.error.input.createentity"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.input.createentity"), eee); } } @@ -255,16 +255,16 @@ noModif(); - //rootUI.setStatusMessage(_("isisfish.message.save.finished")); + //rootUI.setStatusMessage(t("isisfish.message.save.finished")); } catch (TopiaException eee) { // EC-20100401 : ajouté pour avoir un context // correct apres un erreur, sinon, on ne peut plus rien faire // rien sauver d'autre... try { topiaContext.rollbackTransaction(); - throw new IsisFishRuntimeException(_("isisfish.error.input.saveentity"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.input.saveentity"), eee); } catch (TopiaException eee2) { - throw new IsisFishRuntimeException(_("isisfish.error.input.saveentity"), eee2); + throw new IsisFishRuntimeException(t("isisfish.error.input.saveentity"), eee2); } } } @@ -305,9 +305,9 @@ InputContentUI inputContentUI2 = inputContentUI; inputContentUI2.setBean(null); inputContentUI2.setBean(topiaEntity); - //rootUI.setStatusMessage(_("isisfish.message.cancel.finished")); + //rootUI.setStatusMessage(t("isisfish.message.cancel.finished")); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.input.cancelentity"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.input.cancelentity"), eee); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.input.check; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.Collection; import java.util.Collections; @@ -95,10 +95,10 @@ static public void check(Object parent, String name, Equation eq, CheckResult result) { if (eq == null) { - result.addError(parent, _("isisfish.error.invalid.nullequation", name)); + result.addError(parent, t("isisfish.error.invalid.nullequation", name)); } else if (0 != EvaluatorHelper.check(eq.getJavaInterface(), eq.getContent(), null)) { - result.addError(eq, _("isisfish.error.invalid.equation")); + result.addError(eq, t("isisfish.error.invalid.equation")); } } @@ -109,47 +109,47 @@ static public void check(PopulationGroup classPop, CheckResult result){ // error if (classPop.getMeanWeight() < 0) { - result.addError(classPop, _("isisfish.error.invalid.mean.weight")); + result.addError(classPop, t("isisfish.error.invalid.mean.weight")); } // warning if (classPop.getMeanWeight() == 0) { - result.addWarning(classPop, _("isisfish.error.not.null.mean.weight")); + result.addWarning(classPop, t("isisfish.error.not.null.mean.weight")); } } static public void check(Gear engin, CheckResult result) { if (StringUtils.isBlank(engin.getName())) { - result.addWarning(engin, _("isisfish.error.empty.name")); + result.addWarning(engin, t("isisfish.error.empty.name")); } if (StringUtils.isBlank(engin.getEffortUnit())) { - result.addWarning(engin, _("isisfish.error.empty.unit")); + result.addWarning(engin, t("isisfish.error.empty.unit")); } Collection<Selectivity> selectivites = engin.getPopulationSelectivity(); if (CollectionUtils.isEmpty(selectivites)) { - result.addWarning(engin, _("isisfish.error.empty.selectivity")); + result.addWarning(engin, t("isisfish.error.empty.selectivity")); } else { for (Selectivity selectivity : selectivites) { check(selectivity, result); } } if (engin.getPossibleValue() == null) { - result.addWarning(engin, _("isisfish.error.invalid.range")); + result.addWarning(engin, t("isisfish.error.invalid.range")); } if (StringUtils.isBlank(engin.getParameterName())) { - result.addInfo(engin, _("isisfish.error.empty.params.name")); + result.addInfo(engin, t("isisfish.error.empty.params.name")); } } static public void check(MetierSeasonInfo infoSaisonMetier, CheckResult result){ if (CollectionUtils.isEmpty(infoSaisonMetier.getZone())) { - result.addWarning(infoSaisonMetier, _("isisfish.error.no.sector")); + result.addWarning(infoSaisonMetier, t("isisfish.error.no.sector")); } Collection<TargetSpecies> especeCaptus = infoSaisonMetier.getSpeciesTargetSpecies(); if (CollectionUtils.isEmpty(especeCaptus)) { - result.addInfo(infoSaisonMetier, _("isisfish.error.empty.species")); + result.addInfo(infoSaisonMetier, t("isisfish.error.empty.species")); } else { for (TargetSpecies i : especeCaptus) { check(i, result); @@ -200,111 +200,111 @@ try { if (isEmptyMatrix(infoSaisonPop, infoSaisonPop.getMigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); + result.addInfo(infoSaisonPop, t("isisfish.error.empty.migration")); } else if(isNullMatrix(infoSaisonPop.getMigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); + result.addInfo(infoSaisonPop, t("isisfish.error.empty.migration")); } else if(isNegativeMatrix(infoSaisonPop.getMigrationMatrix())) { - result.addError(infoSaisonPop, _("isisfish.error.migration.negative")); + result.addError(infoSaisonPop, t("isisfish.error.migration.negative")); } } catch (NullPointerException e) { - result.addError(infoSaisonPop, _("isisfish.error.null.semantics", "MigrationEquation")); + result.addError(infoSaisonPop, t("isisfish.error.null.semantics", "MigrationEquation")); } try { if (isEmptyMatrix(infoSaisonPop, infoSaisonPop.getEmigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.emigration")); + result.addInfo(infoSaisonPop, t("isisfish.error.empty.emigration")); } else if(isNullMatrix(infoSaisonPop.getEmigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.emigration")); + result.addInfo(infoSaisonPop, t("isisfish.error.empty.emigration")); } else if(isNegativeMatrix(infoSaisonPop.getEmigrationMatrix())) { - result.addError(infoSaisonPop, _("isisfish.error.emigration.negative")); + result.addError(infoSaisonPop, t("isisfish.error.emigration.negative")); } } catch (NullPointerException e) { - result.addError(infoSaisonPop, _("isisfish.error.null.semantics", "EmigrationEquation")); + result.addError(infoSaisonPop, t("isisfish.error.null.semantics", "EmigrationEquation")); } try { if (isEmptyMatrix(infoSaisonPop, infoSaisonPop.getImmigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.immigration")); + result.addInfo(infoSaisonPop, t("isisfish.error.empty.immigration")); } else if(isNullMatrix(infoSaisonPop.getImmigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.immigration")); + result.addInfo(infoSaisonPop, t("isisfish.error.empty.immigration")); } else if(isNegativeMatrix(infoSaisonPop.getImmigrationMatrix())) { - result.addError(infoSaisonPop, _("isisfish.error.immigration.negative")); + result.addError(infoSaisonPop, t("isisfish.error.immigration.negative")); } } catch (NullPointerException e) { - result.addError(infoSaisonPop, _("isisfish.error.null.semantics", "ImmigrationEquation")); + result.addError(infoSaisonPop, t("isisfish.error.null.semantics", "ImmigrationEquation")); } } } static public void check(Cell maille, CheckResult result) { if (StringUtils.isBlank(maille.getName())) { - result.addWarning(maille, _("isisfish.error.empty.name")); + result.addWarning(maille, t("isisfish.error.empty.name")); } } static public void check(Species metaPop, CheckResult result){ Collection<Population> pops = metaPop.getPopulation(); if (CollectionUtils.isEmpty(pops)) { - result.addWarning(metaPop, _("isisfish.error.empty.population")); + result.addWarning(metaPop, t("isisfish.error.empty.population")); } else { for (Population pop : pops) { check(pop, result); } } if (StringUtils.isBlank(metaPop.getName())) { - result.addInfo(metaPop, _("isisfish.error.empty.species.name")); + result.addInfo(metaPop, t("isisfish.error.empty.species.name")); } if (StringUtils.isBlank(metaPop.getScientificName())) { - result.addInfo(metaPop, _("isisfish.error.empty.scientific.name")); + result.addInfo(metaPop, t("isisfish.error.empty.scientific.name")); } if (StringUtils.isBlank(metaPop.getCodeRubbin())) { - result.addInfo(metaPop, _("isisfish.error.empty.code.rubbin")); + result.addInfo(metaPop, t("isisfish.error.empty.code.rubbin")); } } static public void check(Metier metier, CheckResult result){ if (StringUtils.isBlank(metier.getName())) { - result.addWarning(metier, _("isisfish.error.empty.name")); + result.addWarning(metier, t("isisfish.error.empty.name")); } List<MetierSeasonInfo> infoSaisons = metier.getMetierSeasonInfo(); if (CollectionUtils.isEmpty(infoSaisons)) { - result.addWarning(metier, _("isisfish.error.empty.season")); + result.addWarning(metier, t("isisfish.error.empty.season")); } else { Set<Month> months = new HashSet<Month>(); for (MetierSeasonInfo info : infoSaisons) { if (!Collections.disjoint(months, info.getMonths())) { - result.addError(info, _("isisfish.error.overlap.season")); + result.addError(info, t("isisfish.error.overlap.season")); } months.addAll(info.getMonths()); check(info, result); } } if (metier.getGear() == null) { - result.addError(metier, _("isisfish.error.undefined.gear")); + result.addError(metier, t("isisfish.error.undefined.gear")); } else { check(metier.getGear(), result); try { if (!metier.getGear().getPossibleValue().contains(metier.getGearParameterValue())) { - result.addWarning(metier, _("isisfish.error.invalid.values.params")); + result.addWarning(metier, t("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")); + result.addWarning(metier, t("isisfish.error.invalid.values.params")); } } } static public void check(Population pop, CheckResult result){ if (StringUtils.isBlank(pop.getName())) { - result.addWarning(pop, _("isisfish.error.empty.name")); + result.addWarning(pop, t("isisfish.error.empty.name")); } if (StringUtils.isBlank(pop.getGeographicId())) { - result.addInfo(pop, _("isisfish.error.empty.id.geographic")); + result.addInfo(pop, t("isisfish.error.empty.id.geographic")); } check(pop, "MaturityOgiveEquation", pop.getMaturityOgiveEquation(), result); check(pop, "ReproductionRateEquation", pop.getReproductionRateEquation(), result); @@ -312,35 +312,35 @@ check(pop, "GrowthReverse", pop.getGrowthReverse(), result); List<PopulationGroup> classes = pop.getPopulationGroup(); if (CollectionUtils.isEmpty(classes)) { - result.addWarning(pop, _("isisfish.error.undefined.classes")); + result.addWarning(pop, t("isisfish.error.undefined.classes")); } else { for (PopulationGroup group : classes) { check(group, result); } } if (pop.getMonthGapBetweenReproRecrutement() < 0) { - result.addWarning(pop, _("isisfish.error.invalid.interval.reproduction.recruitment")); + result.addWarning(pop, t("isisfish.error.invalid.interval.reproduction.recruitment")); } if (isNullMatrix(pop.getMappingZoneReproZoneRecru())) { - result.addWarning(pop, _("isisfish.error.undefined.correspondence.zones.reproduction.recruitment")); + result.addWarning(pop, t("isisfish.error.undefined.correspondence.zones.reproduction.recruitment")); } if (CollectionUtils.isEmpty(pop.getPopulationZone())) { - result.addWarning(pop, _("isisfish.error.undefined.zone.population")); + result.addWarning(pop, t("isisfish.error.undefined.zone.population")); } if (CollectionUtils.isEmpty(pop.getRecruitmentZone())) { - result.addWarning(pop, _("isisfish.error.undefined.zone.recruitment")); + result.addWarning(pop, t("isisfish.error.undefined.zone.recruitment")); } if (CollectionUtils.isEmpty(pop.getReproductionZone())) { - result.addWarning(pop, _("isisfish.error.undefined.zone.reproduction")); + result.addWarning(pop, t("isisfish.error.undefined.zone.reproduction")); } List<PopulationSeasonInfo> infoSaisons = pop.getPopulationSeasonInfo(); if (CollectionUtils.isEmpty(infoSaisons)) { - result.addWarning(pop, _("isisfish.error.empty.season")); + result.addWarning(pop, t("isisfish.error.empty.season")); } else { Set<Month> months = new HashSet<Month>(); for (PopulationSeasonInfo info : infoSaisons) { if (!Collections.disjoint(months, info.getMonths())) { - result.addError(info, _("isisfish.error.overlap.season")); + result.addError(info, t("isisfish.error.overlap.season")); } months.addAll(info.getMonths()); check(info, result); @@ -352,18 +352,18 @@ check(pop, "NaturalDeathRate", pop.getNaturalDeathRate(), result); if (pop.getRecruitmentDistribution() == null || sumMatrix(pop.getRecruitmentDistribution()) != 1) { - result.addWarning(pop, _("isisfish.error.invalid.distribution.recruitment")); + result.addWarning(pop, t("isisfish.error.invalid.distribution.recruitment")); } } static public void check(FisheryRegion region, CheckResult result){ if (StringUtils.isBlank(region.getName())) { - result.addWarning(region, _("isisfish.error.empty.name")); + result.addWarning(region, t("isisfish.error.empty.name")); } List<Zone> secteurs = region.getZone(); if (CollectionUtils.isEmpty(secteurs)) { - result.addWarning(region, _("isisfish.error.undefined.sector")); + result.addWarning(region, t("isisfish.error.undefined.sector")); } else { for(Zone zone : secteurs) { check(zone, result); @@ -371,7 +371,7 @@ } List<Cell> mailles = region.getCell(); if (CollectionUtils.isEmpty(mailles)) { - result.addWarning(region, _("isisfish.error.undefined.mesh")); + result.addWarning(region, t("isisfish.error.undefined.mesh")); } else { for (Cell cell : mailles) { check(cell, result); @@ -379,7 +379,7 @@ } List<Species> metaPops = region.getSpecies(); if (CollectionUtils.isEmpty(metaPops)) { - result.addWarning(region, _("isisfish.error.undefined.meta.population")); + result.addWarning(region, t("isisfish.error.undefined.meta.population")); } else { for (Species species : metaPops) { check(species, result); @@ -387,7 +387,7 @@ } List<Metier> metiers = region.getMetier(); if (CollectionUtils.isEmpty(metiers)) { - result.addWarning(region, _("isisfish.error.undefined.meta.population")); + result.addWarning(region, t("isisfish.error.undefined.meta.population")); } else { for (Metier metier : metiers) { check(metier, result); @@ -395,7 +395,7 @@ } List<Strategy> strategies = region.getStrategy(); if (CollectionUtils.isEmpty(strategies)){ - result.addWarning(region, _("isisfish.error.undefined.stategy")); + result.addWarning(region, t("isisfish.error.undefined.stategy")); } else { for (Strategy strategy : strategies) { check(strategy, result); @@ -405,10 +405,10 @@ static public void check(Zone secteur, CheckResult result){ if (StringUtils.isBlank(secteur.getName())) { - result.addWarning(secteur, _("isisfish.error.empty.name")); + result.addWarning(secteur, t("isisfish.error.empty.name")); } if (CollectionUtils.isEmpty(secteur.getCell())) { - result.addWarning(secteur, _("isisfish.error.undefined.mesh.sector")); + result.addWarning(secteur, t("isisfish.error.undefined.mesh.sector")); } } @@ -419,13 +419,13 @@ static public void check(Strategy strategy, CheckResult result) { if (StringUtils.isBlank(strategy.getName())) { - result.addWarning(strategy, _("isisfish.error.empty.name")); + result.addWarning(strategy, t("isisfish.error.empty.name")); } check(strategy.getSetOfVessels(), result); List<StrategyMonthInfo> smi = strategy.getStrategyMonthInfo(); if (smi == null || smi.size() != 12) { - result.addWarning(strategy, _("isisfish.error.undefined.stategy.months")); + result.addWarning(strategy, t("isisfish.error.undefined.stategy.months")); } else { for (StrategyMonthInfo info : smi) { check(info, result); @@ -437,14 +437,14 @@ static public void check(SetOfVessels sov, CheckResult result){ check(sov.getPort(), result); if (sov.getNumberOfVessels() < 0) { - result.addWarning(sov, _("isisfish.error.invalid.number")); + result.addWarning(sov, t("isisfish.error.invalid.number")); } if (sov.getFixedCosts() < 0) { - result.addWarning(sov, _("isisfish.error.invalid.costs.fix")); + result.addWarning(sov, t("isisfish.error.invalid.costs.fix")); } Collection<EffortDescription> efforts = sov.getPossibleMetiers(); if (CollectionUtils.isEmpty(efforts)) { - result.addWarning(sov, _("isisfish.error.not.possible.metier")); + result.addWarning(sov, t("isisfish.error.not.possible.metier")); } else { for (EffortDescription effort : efforts) { check(effort, result); @@ -467,10 +467,10 @@ } static public void check(Port port, CheckResult result){ if (StringUtils.isBlank(port.getName())) { - result.addWarning(port, _("isisfish.error.empty.name")); + result.addWarning(port, t("isisfish.error.empty.name")); } if (port.getCell() == null) { - result.addWarning(port, _("isisfish.error.undefined.mesh.sector")); + result.addWarning(port, t("isisfish.error.undefined.mesh.sector")); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.input.check; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import javax.swing.JFrame; import javax.swing.WindowConstants; @@ -56,7 +56,7 @@ } public CheckResultFrame() { - super(_("isisfish.message.result.verif.region")); + super(t("isisfish.message.result.verif.region")); model = new CheckResultTableModel(new CheckResult()); JTable table = new JTable(model); model.addMouseListenerToHeaderInTable(table); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.input.model; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.List; @@ -69,8 +69,8 @@ /** Columns names. */ public final static String[] COLUMN_NAMES = { - _("isisfish.common.population"), - _("isisfish.common.equation") + t("isisfish.common.population"), + t("isisfish.common.equation") }; protected List<Selectivity> selectivities; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.input.model; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.List; @@ -71,9 +71,9 @@ /** Columns names. */ public final static String[] COLUMN_NAMES = { - _("isisfish.metierSeasonInfoSpecies.species"), - _("isisfish.metierSeasonInfoSpecies.targetFactor"), - _("isisfish.metierSeasonInfoSpecies.mainSpecies") }; + t("isisfish.metierSeasonInfoSpecies.species"), + t("isisfish.metierSeasonInfoSpecies.targetFactor"), + t("isisfish.metierSeasonInfoSpecies.mainSpecies") }; protected List<TargetSpecies> targetSpeciesList; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -22,7 +22,7 @@ */ package fr.ifremer.isisfish.ui.input.tree; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; import java.util.HashMap; import java.util.Map; @@ -94,52 +94,52 @@ // first level nodes CellsNodeLoador cellsNodeLoador = new CellsNodeLoador(); FisheryTreeNode cellsChild = new FisheryTreeNode(Cell.class, - n_("isisfish.input.tree.cells"), null, cellsNodeLoador); + n("isisfish.input.tree.cells"), null, cellsNodeLoador); loadorCache.put(Cell.class, cellsNodeLoador); ZonesNodeLoador zonesNodeLoador = new ZonesNodeLoador(); FisheryTreeNode zonesChild = new FisheryTreeNode(Zone.class, - n_("isisfish.input.tree.zones"), null, zonesNodeLoador); + n("isisfish.input.tree.zones"), null, zonesNodeLoador); loadorCache.put(Zone.class, zonesNodeLoador); PortsNodeLoador portsNodeLoador = new PortsNodeLoador(); FisheryTreeNode portsChild = new FisheryTreeNode(Port.class, - n_("isisfish.input.tree.ports"), null, portsNodeLoador); + n("isisfish.input.tree.ports"), null, portsNodeLoador); loadorCache.put(Port.class, portsNodeLoador); SpeciesNodeLoador speciesNodeLoador = new SpeciesNodeLoador(); FisheryTreeNode speciesChild = new FisheryTreeNode(Species.class, - n_("isisfish.input.tree.species"), null, speciesNodeLoador); + n("isisfish.input.tree.species"), null, speciesNodeLoador); loadorCache.put(Species.class, speciesNodeLoador); GearsNodeLoador gearsNodeLoador = new GearsNodeLoador(); FisheryTreeNode gearsChild = new FisheryTreeNode(Gear.class, - n_("isisfish.input.tree.gears"), null, gearsNodeLoador); + n("isisfish.input.tree.gears"), null, gearsNodeLoador); loadorCache.put(Gear.class, gearsNodeLoador); MetiersNodeLoador metiersNodeLoador = new MetiersNodeLoador(); FisheryTreeNode metiersChild = new FisheryTreeNode(Metier.class, - n_("isisfish.input.tree.metiers"), null, metiersNodeLoador); + n("isisfish.input.tree.metiers"), null, metiersNodeLoador); loadorCache.put(Metier.class, metiersNodeLoador); TripTypesNodeLoador tripTypesNodeLoador = new TripTypesNodeLoador(); FisheryTreeNode tripTypesChild = new FisheryTreeNode(TripType.class, - n_("isisfish.input.tree.triptypes"), null, tripTypesNodeLoador); + n("isisfish.input.tree.triptypes"), null, tripTypesNodeLoador); loadorCache.put(TripType.class, tripTypesNodeLoador); VesselTypesNodeLoador vesselTypesNodeLoador = new VesselTypesNodeLoador(); FisheryTreeNode vesselTypesChild = new FisheryTreeNode(VesselType.class, - n_("isisfish.input.tree.vesseltypes"), null, vesselTypesNodeLoador); + n("isisfish.input.tree.vesseltypes"), null, vesselTypesNodeLoador); loadorCache.put(VesselType.class, vesselTypesNodeLoador); SetOfVesselsNodeLoador setOfVesselsNodeLoador = new SetOfVesselsNodeLoador(); FisheryTreeNode setOfVesselsChild = new FisheryTreeNode(SetOfVessels.class, - n_("isisfish.input.tree.setofvessels"), null, setOfVesselsNodeLoador); + n("isisfish.input.tree.setofvessels"), null, setOfVesselsNodeLoador); loadorCache.put(SetOfVessels.class, setOfVesselsNodeLoador); StrategiesNodeLoador strategiesNodeLoador = new StrategiesNodeLoador(); FisheryTreeNode strategiesChild = new FisheryTreeNode(Strategy.class, - n_("isisfish.input.tree.strategies"), null, strategiesNodeLoador); + n("isisfish.input.tree.strategies"), null, strategiesNodeLoador); loadorCache.put(Strategy.class, strategiesNodeLoador); root.add(cellsChild); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.input.tree; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; @@ -80,7 +80,7 @@ FisheryTreeNode node = (FisheryTreeNode)value; if (!node.isStaticNode() || node.isStringNode()) { - stringValue = _(node.getId()); + stringValue = t(node.getId()); } else { FisheryRegion fisheryRegion = provider.getFisheryRegion(); TopiaContext topiaContext = ((FisheryRegionImpl)fisheryRegion).getTopiaContext(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -22,7 +22,7 @@ */ package fr.ifremer.isisfish.ui.input.tree.loadors; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; import java.util.List; @@ -66,7 +66,7 @@ // Create clients static nodes FisheryTreeNode speciesPopulationStaticNode = new FisheryTreeNode( - Population.class, n_("isisfish.input.tree.populations"), + Population.class, n("isisfish.input.tree.populations"), null, new PopulationsNodeLoador(species)); speciesNode.add(speciesPopulationStaticNode); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.input.variable; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.CardLayout; import java.util.List; @@ -109,7 +109,7 @@ Variable variable = dao.create( Variable.PROPERTY_ENTITY_ID, view.getBean().getTopiaId(), - Variable.PROPERTY_NAME, _("isisfish.variables.defaultname")); + Variable.PROPERTY_NAME, t("isisfish.variables.defaultname")); TopiaEntityListModel model = (TopiaEntityListModel)view.getVariablesList().getModel(); List<Variable> variables = (List<Variable>)model.getElements(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.models.common; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.List; @@ -65,9 +65,9 @@ /** Columns names. */ public final static String[] COLUMN_NAMES = { - _("isisfish.common.name"), - _("isisfish.common.value"), - _("isisfish.common.ellipsis")}; + t("isisfish.common.name"), + t("isisfish.common.value"), + t("isisfish.common.ellipsis")}; protected Object script; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.models.export; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.HashMap; @@ -90,7 +90,7 @@ c.setToolTipText(export.getDescription()); } catch (Exception e) { - String errorTooltip = TooltipHelper.getErrorTooltip(_("isisfish.error.compile.fileerror", exportName)); + String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", exportName)); c.setToolTipText(errorTooltip); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.models.optimization; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.HashMap; @@ -92,7 +92,7 @@ c.setToolTipText(optim.getDescription()); } catch (Exception e) { - String errorTooltip = TooltipHelper.getErrorTooltip(_("isisfish.error.compile.fileerror", sensitivityName)); + String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", sensitivityName)); c.setToolTipText(errorTooltip); }*/ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.models.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.lang.reflect.Field; @@ -93,7 +93,7 @@ } } } catch (Exception e) { - String errorTooltip = TooltipHelper.getErrorTooltip(_("isisfish.error.compile.fileerror", "ResultName.java")); + String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", "ResultName.java")); c.setToolTipText(errorTooltip); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.models.rule; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.HashMap; @@ -89,7 +89,7 @@ c.setToolTipText(rule.getDescription()); } catch (Exception e) { - String errorTooltip = TooltipHelper.getErrorTooltip(_("isisfish.error.compile.fileerror", ruleName)); + String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", ruleName)); c.setToolTipText(errorTooltip); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.models.sensitivityanalysis; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.HashMap; @@ -91,7 +91,7 @@ c.setToolTipText(plan.getDescription()); } catch (Exception e) { - String errorTooltip = TooltipHelper.getErrorTooltip(_("isisfish.error.compile.fileerror", sensitivityName)); + String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", sensitivityName)); c.setToolTipText(errorTooltip); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.models.sensitivityexport; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.HashMap; @@ -90,7 +90,7 @@ c.setToolTipText(export.getDescription()); } catch (Exception e) { - String errorTooltip = TooltipHelper.getErrorTooltip(_("isisfish.error.compile.fileerror", exportName)); + String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", exportName)); c.setToolTipText(errorTooltip); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.models.simulationplan; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.HashMap; @@ -91,7 +91,7 @@ c.setToolTipText(plan.getDescription()); } catch (Exception e) { - String errorTooltip = TooltipHelper.getErrorTooltip(_("isisfish.error.compile.fileerror", simulationPlanName)); + String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", simulationPlanName)); c.setToolTipText(errorTooltip); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.queue; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -87,7 +87,7 @@ for (SimulationJob jobToStop : jobsToStop) { jobToStop.stop(); if (log.isInfoEnabled()) { - log.info(_("User stop simulation %s", jobToStop.getItem().getControl() + log.info(t("User stop simulation %s", jobToStop.getItem().getControl() .getId())); } } @@ -109,9 +109,9 @@ for (SimulationJob jobToRestart : jobsToRestart) { jobToRestart.restart(); - jobToRestart.getItem().getControl().setText(_("isisfish.simulation.restarting")); + jobToRestart.getItem().getControl().setText(t("isisfish.simulation.restarting")); if (log.isInfoEnabled()) { - log.info(_("User restart simulation %s", jobToRestart.getItem().getControl() + log.info(t("User restart simulation %s", jobToRestart.getItem().getControl() .getId())); } } @@ -129,9 +129,9 @@ SimulationLoggerUtil.showSimulationLogConsole(id); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("Can't open log for %s", id), eee); + log.error(t("Can't open log for %s", id), eee); } - ErrorHelper.showErrorDialog(_("Can't open log for %s", id), eee); + ErrorHelper.showErrorDialog(t("Can't open log for %s", id), eee); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; @@ -63,7 +63,7 @@ //mapRendererUI.getInformationDelegator().setMap(getIsisMapBean()); //mapRendererUI.getInformationDelegator().setShowLights(false); - //mapRendererUI.getInformationDelegator().setLabel(_("isisfish.simpleResult.more.information")); + //mapRendererUI.getInformationDelegator().setLabel(t("isisfish.simpleResult.more.information")); // set fishery region mapRendererUI.getIsisMapBean().setFisheryRegion(fisheryRegion); @@ -100,7 +100,7 @@ */ @Override public String getName() { - return _("isisfish.result.map"); + return t("isisfish.result.map"); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,8 +23,8 @@ package fr.ifremer.isisfish.ui.result; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import java.awt.Component; import java.util.Iterator; @@ -53,9 +53,9 @@ */ public class MatrixSummaryRenderer implements MatrixRenderer { - protected static final String ABONDANCE_STRING = n_("matrixAbundance"); - protected static final String CAPTUREPARMETIER_STRING = _("matrixCatchPerStrategyMetPerZoneMet"); - protected static final String REJETPARMETIER_STRING = _("matrixDiscardsPerStrMetPerZonePop"); + protected static final String ABONDANCE_STRING = n("matrixAbundance"); + protected static final String CAPTUREPARMETIER_STRING = t("matrixCatchPerStrategyMetPerZoneMet"); + protected static final String REJETPARMETIER_STRING = t("matrixDiscardsPerStrMetPerZonePop"); protected SimulationStorage simulationStorage; @@ -92,13 +92,13 @@ mat1 = mat1.sumOverDim(0); mat1 = mat1.sumOverDim(1); mat1 = mat1.reduce(); - resume.append(_("isisfish.result.begin.simulation")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); + resume.append(t("isisfish.result.begin.simulation")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); mat1 = resultStorage.getMatrix(resultStorage.getLastStep(), name, topiaContext); mat1 = mat1.sumOverDim(0); mat1 = mat1.sumOverDim(1); mat1 = mat1.reduce(); - resume.append(_("isisfish.result.end.simulation")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); + resume.append(t("isisfish.result.end.simulation")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); } /* un peu long @@ -110,7 +110,7 @@ mat1 = mat1.sumOverDim(3); mat1 = mat1.reduce(); - resume.append(_("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); + resume.append(t("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); } else if (!name.startsWith(CAPTUREPARMETIER_STRING)){ MatrixND mat1 = resultStorage.getMatrix(name, topiaContext); @@ -119,10 +119,10 @@ mat1 = mat1.sumOverDim(2); mat1 = mat1.reduce(); - resume.append(_("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); + resume.append(t("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); }*/ } catch (Exception eee) { - resume.append(_("isisfish.error.no.matrix", name)); + resume.append(t("isisfish.error.no.matrix", name)); } } @@ -148,6 +148,6 @@ */ @Override public String getName() { - return _("isisfish.result.summary"); + return t("isisfish.result.summary"); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -180,7 +180,7 @@ try { // init menu for (String exportName : ExportStorage.getExportNames()) { - JMenuItem item = new JMenuItem(_(exportName)); + JMenuItem item = new JMenuItem(t(exportName)); item.addActionListener(new ExportActionListener(simulation, exportName)); resultSimulationFrame.getExportMenu().add(item); } @@ -240,7 +240,7 @@ public void actionPerformed(ActionEvent e) { try { - File file = FileUtil.getFile(".+\\.csv", _("isisfish.result.export.file")); + File file = FileUtil.getFile(".+\\.csv", t("isisfish.result.export.file")); // add csv extension if not set if (!file.getName().endsWith(".csv")) { file = new File(file.getAbsolutePath() + ".csv"); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.List; @@ -67,7 +67,7 @@ if (dim == 0 && sumStep == 12) { // si c une somme pour les annees, on change l'intitule - matrix.setDimensionName(0, _("isisfish.common.year")); + matrix.setDimensionName(0, t("isisfish.common.year")); } // #1905 : modifie les semantiques de type Date pour que lorsque Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.List; @@ -61,7 +61,7 @@ int semCount = matrix.getSemantic(0).size(); List<String> newSems = new ArrayList<String>(semCount); for (int i = 0; i < semCount ; i++) { - newSems.add(_("isisfish.result.matrix.sumbyyearlabel", i)); + newSems.add(t("isisfish.result.matrix.sumbyyearlabel", i)); } matrix.setSemantic(0, newSems); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.script; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.List; @@ -48,8 +48,8 @@ private static final long serialVersionUID = 6327223042377741126L; /** Column names. */ - public final static String[] COLUMN_NAMES = { _("isisfish.common.ellipsis"), - _("isisfish.common.module"), _("isisfish.common.file") }; + public final static String[] COLUMN_NAMES = { t("isisfish.common.ellipsis"), + t("isisfish.common.module"), t("isisfish.common.file") }; /** All files displayed in table. */ protected List<String> availableFiles; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.script; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.awt.Component; @@ -229,15 +229,15 @@ if (scriptType.equals(ScriptMapping.Formule)) { List<String> values = FormuleStorage.getCategories(); equationModelType = (String) JOptionPane.showInputDialog(scriptUI, - _("isisfish.message.new.formule.category"), - _("isisfish.message.new.formule.title"), + t("isisfish.message.new.formule.category"), + t("isisfish.message.new.formule.title"), JOptionPane.PLAIN_MESSAGE, null, values.toArray(), values.get(0)); equationModelTypePath = equationModelType + File.separator; } // if user has not choose "cancel" if (equationModelType != null) { - String fileName = JOptionPane.showInputDialog(_("isisfish.message.new.filename")); + String fileName = JOptionPane.showInputDialog(t("isisfish.message.new.filename")); // user cancel if (!StringUtils.isEmpty(fileName)) { File scriptFile = newScript(equationModelTypePath + fileName, scriptType); @@ -280,18 +280,18 @@ if (pos != -1) { if (scriptType != ScriptMapping.Formule) { // interdit pour le moment ? - String message = _("isisfish.error.invalid.file.name", + String message = t("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + returnError(t("isisfish.error.script.create", fileName, e.getMessage()), e); return null; } // il y a un sous type à traiter if (pos == fileName.length() - 1) { - String message = _("isisfish.error.invalid.file.name", + String message = t("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + returnError(t("isisfish.error.script.create", fileName, e.getMessage()), e); return null; } realFilename = fileName @@ -302,9 +302,9 @@ category = ""; } if (!realFilename.matches("[A-Z0-9_][a-zA-Z0-9_]*")) { - String message = _("isisfish.error.invalid.file.name", fileName); + String message = t("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + returnError(t("isisfish.error.script.create", fileName, e.getMessage()), e); return null; } //TODO do test on category @@ -350,9 +350,9 @@ if (script.exists()) { // Message d'erreur si le fichier existe en local. - String message = _("isisfish.error.file.already.exists", fileName); + String message = t("isisfish.error.file.already.exists", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e + returnError(t("isisfish.error.script.create", fileName, e .getMessage()), e); } @@ -388,7 +388,7 @@ codeStorage = script; scriptFile = script.getFile(); } catch (Exception eee) { - returnError(_("isisfish.error.script.create", fileName, eee + returnError(t("isisfish.error.script.create", fileName, eee .getMessage()), eee); } @@ -522,9 +522,9 @@ log.fatal("ScriptType unknown: " + file.getName()); } - //frame.setInfoText(_("isisfish.message.load.finished")); + //frame.setInfoText(t("isisfish.message.load.finished")); } catch (Exception eee) { - returnError(_("isisfish.error.script.load", file.getAbsolutePath(), + returnError(t("isisfish.error.script.load", file.getAbsolutePath(), eee.getMessage()), eee); } finally { @@ -559,10 +559,10 @@ ScriptTreeModel model = scriptUI.getScriptTreeModel(); model.fileModified(codeStorage.getFile()); } catch (Exception eee) { - returnError(_("isisfish.error.script.save", codeStorage.getFile(), + returnError(t("isisfish.error.script.save", codeStorage.getFile(), eee.getMessage()), eee); } - setStatusMessage(_("isisfish.message.save.finished")); + setStatusMessage(t("isisfish.message.save.finished")); } /** @@ -578,13 +578,13 @@ // save script before commit saveScript(); - String msg = JOptionPane.showInputDialog(_("isisfish.message.script.commit", codeStorage.getName())); + String msg = JOptionPane.showInputDialog(t("isisfish.message.script.commit", codeStorage.getName())); if (msg == null) { - setStatusMessage(_("isisfish.message.commit.cancelled")); + setStatusMessage(t("isisfish.message.commit.cancelled")); } else { codeStorage.commit(msg); codeStorage.reload(); - setStatusMessage(_("isisfish.message.commit.finished")); + setStatusMessage(t("isisfish.message.commit.finished")); } } catch (Exception ex) { if (log.isErrorEnabled()) { @@ -754,16 +754,16 @@ if (check) { scriptUI.getActionLogArea().setText( - _("isisfish.script.compilation.ok", result.toString())); + t("isisfish.script.compilation.ok", result.toString())); scriptUI.getActionLogArea().setBackground(COLOR_SUCCESS); } else { scriptUI.getActionLogArea().setText( - _("isisfish.script.compilation.failed", result + t("isisfish.script.compilation.failed", result .toString())); scriptUI.getActionLogArea().setBackground(COLOR_FAILURE); } - setStatusMessage(_("isisfish.message.check.finished")); + setStatusMessage(t("isisfish.message.check.finished")); return check; } @@ -772,7 +772,7 @@ */ public void checkAllScripts() { - setStatusMessage(_("isisfish.message.check.inprogress"), true); + setStatusMessage(t("isisfish.message.check.inprogress"), true); boolean allSuccess = true; @@ -786,7 +786,7 @@ // le fichier java ne sont pas compilable sans la formule associée List<File> javaFiles = FileUtil.find(scriptMapping.getModule(), ".+\\.java$", false); for (File javaFile : javaFiles) { - scriptUI.getActionLogArea().append(_("isisfish.script.compilingfile", javaFile)); + scriptUI.getActionLogArea().append(t("isisfish.script.compilingfile", javaFile)); StringWriter result = new StringWriter(); PrintWriter out = new PrintWriter(result); @@ -794,10 +794,10 @@ out.flush(); if (compileResult == 0) { - scriptUI.getActionLogArea().append(_("isisfish.common.ok") + "\n"); + scriptUI.getActionLogArea().append(t("isisfish.common.ok") + "\n"); } else { - scriptUI.getActionLogArea().append(_("isisfish.common.error") + ":\n"); + scriptUI.getActionLogArea().append(t("isisfish.common.error") + ":\n"); scriptUI.getActionLogArea().append(result.toString() + "\n"); scriptUI.getActionLogArea().setBackground(COLOR_FAILURE); allSuccess = false; @@ -813,7 +813,7 @@ scriptUI.getActionLogArea().setBackground(COLOR_SUCCESS); } - setStatusMessage(_("isisfish.message.check.finished")); + setStatusMessage(t("isisfish.message.check.finished")); } /** @@ -856,7 +856,7 @@ ex.printStackTrace(out); scriptUI.getActionLogArea().setText(result.toString()); } - setStatusMessage(_("isisfish.message.evaluation.finished")); + setStatusMessage(t("isisfish.message.evaluation.finished")); } /** @@ -872,10 +872,10 @@ try { // ask user form a .zip file File file = FileUtil.getFile(".*.zip$", - _("isisfish.message.import.scripts.zipped")); + t("isisfish.message.import.scripts.zipped")); if (file != null) { - //frame.setInfoText(_("isisfish.message.import.scripts.file", file)); + //frame.setInfoText(t("isisfish.message.import.scripts.file", file)); // get two list of relative path (one for new files, // one for exisiting files) @@ -914,12 +914,12 @@ dialog.pack(); SwingUtil.center(dialog); dialog.setVisible(true); - setStatusMessage(_("isisfish.message.import.scripts.file.done", file)); + setStatusMessage(t("isisfish.message.import.scripts.file.done", file)); } else { - setStatusMessage(_("isisfish.message.import.scripts.file.cancelled")); + setStatusMessage(t("isisfish.message.import.scripts.file.cancelled")); } } catch (Exception eee) { - returnError(_("isisfish.error.script.import", eee.getMessage()), + returnError(t("isisfish.error.script.import", eee.getMessage()), eee); } } @@ -1069,7 +1069,7 @@ } String name = codeStorage.getName(); - int resp = JOptionPane.showConfirmDialog(scriptUI, _("isisfish.message.confirm.remove.script", name), + int resp = JOptionPane.showConfirmDialog(scriptUI, t("isisfish.message.confirm.remove.script", name), null, JOptionPane.YES_NO_OPTION); if (resp == JOptionPane.YES_OPTION) { // stay in UI even if deleted @@ -1086,17 +1086,17 @@ //TODO again the file in panel but not in tree panel ? codeStorage.delete(deleteRemote); if (codeStorage.getFile().exists()) { - ErrorHelper.showErrorDialog(_("isisfish.error.script.delete", codeStorage + ErrorHelper.showErrorDialog(t("isisfish.error.script.delete", codeStorage .getFile())); } } catch (Exception eee) { - returnError(_("isisfish.error.script.delete", + returnError(t("isisfish.error.script.delete", codeStorage == null ? null : codeStorage.getFile(), eee .getMessage()), eee); } - setStatusMessage(_("isisfish.message.delete.finished")); + setStatusMessage(t("isisfish.message.delete.finished")); } else { - setStatusMessage(_("isisfish.message.delete.canceled")); + setStatusMessage(t("isisfish.message.delete.canceled")); } } @@ -1121,7 +1121,7 @@ if (log.isErrorEnabled()) { log.error("Can't get diff", e); } - ErrorHelper.showErrorDialog(_("isisfish.vcs.vcssvn.diff.error"), e); + ErrorHelper.showErrorDialog(t("isisfish.vcs.vcssvn.diff.error"), e); } } @@ -1244,7 +1244,7 @@ * Generate javadoc and display output in UI. */ public void generateScriptJavadoc() { - setStatusMessage(_("isisfish.script.menu.javadocgenerating", + setStatusMessage(t("isisfish.script.menu.javadocgenerating", IsisFish.config.getJavadocDirectory()), true); SwingUtilities.invokeLater(new Runnable() { @@ -1259,18 +1259,18 @@ if (ok == 0) { scriptUI.getActionLogArea().setText( - _("isisfish.script.javadoc.ok", output.toString())); + t("isisfish.script.javadoc.ok", output.toString())); // vert leger scriptUI.getActionLogArea().setBackground(COLOR_SUCCESS); } else { scriptUI.getActionLogArea().setText( - _("isisfish.script.compilation.failed", output + t("isisfish.script.compilation.failed", output .toString())); // rouge leger scriptUI.getActionLogArea().setBackground(COLOR_FAILURE); } - setStatusMessage(_("isisfish.script.menu.javadocgenerated", + setStatusMessage(t("isisfish.script.menu.javadocgenerated", IsisFish.config.getJavadocDirectory())); } }); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.script.action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import javax.swing.AbstractAction; import javax.swing.JDialog; @@ -74,7 +74,7 @@ JFileChooser chooser = new JFileChooser(dir); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int ret = chooser.showDialog(dialog, - _("isisfish.message.choose.archive")); + t("isisfish.message.choose.archive")); if (ret == JFileChooser.APPROVE_OPTION) { File newFile = chooser.getSelectedFile(); String path; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.script.action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.event.ActionEvent; import java.io.File; @@ -100,7 +100,7 @@ if (dst.exists()) { int resp = JOptionPane.showConfirmDialog(dialog, - _("isisfish.message.file.already.exists", dst)); + t("isisfish.message.file.already.exists", dst)); if (resp == JOptionPane.CANCEL_OPTION) { dialog.dispose(); @@ -113,7 +113,7 @@ } } else if (!dst.getParentFile().exists()) { int resp = JOptionPane.showConfirmDialog(dialog, - _("isisfish.message.directory.not.exists", dst)); + t("isisfish.message.directory.not.exists", dst)); if (resp == JOptionPane.CANCEL_OPTION) { dialog.dispose(); return false; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.script.model; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.awt.Component; @@ -77,11 +77,11 @@ JLabel c = (JLabel)super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); if (value == IsisFish.vcs) { - c.setText(_("isisfish.ui.script.officialvcs")); + c.setText(t("isisfish.ui.script.officialvcs")); c.setIcon(VCS_ICON); c.setFont(c.getFont().deriveFont(Font.BOLD)); } else if (value == IsisFish.communityVcs) { - c.setText(_("isisfish.ui.script.communityvcs")); + c.setText(t("isisfish.ui.script.communityvcs")); c.setIcon(VCS_ICON); c.setFont(c.getFont().deriveFont(Font.BOLD)); } else if (value instanceof File) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.sensitivity; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -182,8 +182,8 @@ * @param continuous continuous */ public void addNewFactorGroup(SensitivityTabUI sensitivityTabUI, boolean continuous) { - String factorName = JOptionPane.showInputDialog(sensitivityTabUI, _("isisfish.sensitivity.newfactorname"), - _("isisfish.sensitivity.title"), JOptionPane.QUESTION_MESSAGE); + String factorName = JOptionPane.showInputDialog(sensitivityTabUI, t("isisfish.sensitivity.newfactorname"), + t("isisfish.sensitivity.title"), JOptionPane.QUESTION_MESSAGE); if (StringUtils.isNotBlank(factorName)) { FactorGroup rootFactorGroup = sensitivityTabUI.getSimulAction().getFactorGroup(); @@ -222,8 +222,8 @@ } sensitivityTabUI.setFactorModel(); } catch (IllegalArgumentException ex) { - JOptionPane.showMessageDialog(sensitivityTabUI, _("isisfish.sensitivity.moveillegal"), - _("isisfish.sensitivity.title"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(sensitivityTabUI, t("isisfish.sensitivity.moveillegal"), + t("isisfish.sensitivity.title"), JOptionPane.ERROR_MESSAGE); } } @@ -242,7 +242,7 @@ // clic droit if (e.getButton() == MouseEvent.BUTTON3) { JPopupMenu menu = new JPopupMenu(); - JMenuItem menuItemDelete = new JMenuItem(_("isisfish.common.delete")); + JMenuItem menuItemDelete = new JMenuItem(t("isisfish.common.delete")); menuItemDelete.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -368,11 +368,11 @@ * @since 4.1.1.2 */ public void exportFactorsToMexico(SensitivityTabUI view) { - File xmlFile = FileUtil.getFile(_("isisfish.sensitivity.mexico.exporttoxml.title"), - _("isisfish.sensitivity.mexico.exporttoxml.approve"), view, + File xmlFile = FileUtil.getFile(t("isisfish.sensitivity.mexico.exporttoxml.title"), + t("isisfish.sensitivity.mexico.exporttoxml.approve"), view, new String[]{ ".*\\.xml", - _("isisfish.sensitivity.mexico.exporttoxml.filter") + t("isisfish.sensitivity.mexico.exporttoxml.filter") }); if (xmlFile != null) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.sensitivity.model; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.List; @@ -62,8 +62,8 @@ /** Columns names. */ public final static String[] COLUMN_NAMES = { - _("isisfish.sensitivity.factor"), - _("isisfish.sensitivity.increment") }; + t("isisfish.sensitivity.factor"), + t("isisfish.sensitivity.increment") }; protected List<Factor> factors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.sensitivity.model; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.HashMap; @@ -87,7 +87,7 @@ FactorGroup factorGroup = (FactorGroup)value; if (factorGroup == tree.getModel().getRoot()) { // root // non du facteur group principal - text = _("isisfish.sensitivity.factors"); + text = t("isisfish.sensitivity.factors"); } else { if (factorGroup.isDiscrete()) { icon = "d"; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.sensitivity.wizard; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.Component; @@ -214,7 +214,7 @@ } } JScrollPane js = new JScrollPane(c); - String tabName = _("isisfish.sensitivity.discretevaluelabel", i); + String tabName = t("isisfish.sensitivity.discretevaluelabel", i); factorWizardUI.getTabPane().addTab(tabName, js); } } @@ -278,7 +278,7 @@ InputOneEquationUI ui = new InputOneEquationUI(factorWizardUI); ui.setAutoSaveModification(false); ui.setFormuleCategory(equation.getCategory()); - ui.setText(_("isisfish.common.equation")); // can't get real name + ui.setText(t("isisfish.common.equation")); // can't get real name ui.setClazz(value.getClass()); ui.setBeanProperty(property); ui.setBean(entity); // set bean fire content modification event @@ -366,7 +366,7 @@ Equation equation = (Equation)value; EquationContinuousPanelUI ui = new EquationContinuousPanelUI(new JAXXInitialContext().add(new InputAction())); ui.setSelectedEquation(equation); - ui.setText(_("isisfish.common.equation")); // can't get real name + ui.setText(t("isisfish.common.equation")); // can't get real name ui.setFormuleCategory(equation.getCategory()); ui.setClazz(equation.getClass()); ui.setBeanProperty(property); @@ -419,7 +419,7 @@ // add new tabs for (int tab = currentCount ; tab < nbTab ; tab++) { JComponent c = getNewDiscreteComponent(factorWizardUI); - String tabName = _("isisfish.sensitivity.discretevaluelabel", tab); + String tabName = t("isisfish.sensitivity.discretevaluelabel", tab); factorWizardUI.getTabPane().addTab(tabName, c); } @@ -470,7 +470,7 @@ ui.setAutoSaveModification(false); ui.setText(equation.getContent()); ui.setFormuleCategory(equation.getCategory()); - ui.setText(_("isisfish.common.equation")); // can't get real name + ui.setText(t("isisfish.common.equation")); // can't get real name ui.setClazz(value.getClass()); ui.setBeanProperty(property); ui.setBean(entity); @@ -580,7 +580,7 @@ Equation equation = (Equation)value; EquationContinuousPanelUI ui = new EquationContinuousPanelUI(new JAXXInitialContext().add(new InputAction())); ui.setSelectedEquation(equation); - ui.setText(_("isisfish.common.equation")); // can't get real name + ui.setText(t("isisfish.common.equation")); // can't get real name ui.setFormuleCategory(equation.getCategory()); ui.setClazz(equation.getClass()); ui.setBeanProperty(property); @@ -732,8 +732,8 @@ factorValid = continuousPanel.isFactorValid(); } if (!factorValid) { - JOptionPane.showMessageDialog(factorWizardUI, _("isisfish.sensitivity.factor.notvalid"), - _("isisfish.sensitivity.title"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(factorWizardUI, t("isisfish.sensitivity.factor.notvalid"), + t("isisfish.sensitivity.title"), JOptionPane.ERROR_MESSAGE); return; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.simulator; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.CardLayout; @@ -167,7 +167,7 @@ if (log.isErrorEnabled()) { log.error("Can't init SimulationParameter", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.initsimulaction"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.initsimulaction"), eee); } } @@ -193,7 +193,7 @@ if (log.isErrorEnabled()) { log.error("Can't import simulation", e); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.importparameter"), e); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.importparameter"), e); } finally { IOUtils.closeQuietly(fos); } @@ -215,7 +215,7 @@ if (log.isErrorEnabled()) { log.error("Can't save simulation", e); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.savesimulation"), e); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.savesimulation"), e); } finally { IOUtils.closeQuietly(fos); } @@ -241,7 +241,7 @@ if (log.isWarnEnabled()) { log.warn("Can't find result name script", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.getresultname"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.getresultname"), eee); } return result; } @@ -313,7 +313,7 @@ } } } catch (Exception eee) { - throw new IsisFishRuntimeException(_("isisfish.error.simulation.loadoldsimulation"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.simulation.loadoldsimulation"), eee); } } @@ -389,7 +389,7 @@ if (log.isErrorEnabled()) { log.error("Can't get strategies", e); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.liststrategies"), e); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.liststrategies"), e); } return result; } @@ -436,7 +436,7 @@ if (log.isErrorEnabled()) { log.error("Can't get population", e); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listpopulation"), e); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.listpopulation"), e); } return result; } @@ -509,12 +509,12 @@ if (log.isErrorEnabled()) { log.error("Can't get old simulation item", e); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listoldsimulation"), e); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.listoldsimulation"), e); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't get old simulation item", e); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listoldsimulation"), e); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.listoldsimulation"), e); } return null;*/ } @@ -1014,7 +1014,7 @@ if ("".equals(fullSimulationId) || SimulationStorage.localyExists(fullSimulationId) || SimulationService.getService().exists(fullSimulationId)) { - ErrorHelper.showErrorDialog(_("isisfish.simulator.simulaction.badid", + ErrorHelper.showErrorDialog(t("isisfish.simulator.simulaction.badid", fullSimulationId), null); } else { SimulationService.getService().submit(fullSimulationId, param, @@ -1024,7 +1024,7 @@ if (log.isErrorEnabled()) { log.error("Can't start simulation", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.launchsimulation"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.launchsimulation"), eee); } } @@ -1057,7 +1057,7 @@ if ("".equals(fullSimulationId) || SimulationStorage.localyExists(fullSimulationId) || SimulationService.getService().exists(fullSimulationId)) { - ErrorHelper.showErrorDialog(_("isisfish.simulator.simulaction.badid", + ErrorHelper.showErrorDialog(t("isisfish.simulator.simulaction.badid", fullSimulationId), null); } else { DesignPlan designPlan = new DesignPlan(); @@ -1069,7 +1069,7 @@ if (log.isErrorEnabled()) { log.error("Can't start simulation", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.launchsimulation"), eee); + ErrorHelper.showErrorDialog(t("isisfish.error.simulation.launchsimulation"), eee); } } @@ -1205,7 +1205,7 @@ } paramsUI.getPopulationEffectivesTabbedPane().add(matrixPanelComponent, - _("isisfish.params.populationEffectives", selectedPopulation.getName())); + t("isisfish.params.populationEffectives", selectedPopulation.getName())); } layout.show(paramsUI.getPopulationEffectivesPanel(), "specific"); @@ -1237,7 +1237,7 @@ String factorPath = "parameters.rules"; selectedFactor = getFactor(factorPath); if (selectedFactor == null) { - selectedFactor = new Factor(_("isisfish.sensitivity.rulesfactorname")); + selectedFactor = new Factor(t("isisfish.sensitivity.rulesfactorname")); selectedFactor.setPath(factorPath); //selectedFactor.setDomain(new RuleDiscreteDomain()); } @@ -1249,7 +1249,7 @@ String factorPath = "parameters.population." + population.getName() + ".number"; selectedFactor = getFactor(factorPath); if (selectedFactor == null) { - selectedFactor = new Factor(_("isisfish.sensitivity.populationfactorname", population.getName())); + selectedFactor = new Factor(t("isisfish.sensitivity.populationfactorname", population.getName())); selectedFactor.setPath(factorPath); //MatrixND populationEffectives = getSimulationParameter().getNumberOf(population); /*MatrixContinuousDomain factorDomain = new MatrixContinuousDomain(); @@ -1305,7 +1305,7 @@ // init new factor wizard ui FactorWizardUI factorWizardUI = new FactorWizardUI(ruleChooser); - factorWizardUI.getFactorNameField().setText(_("isisfish.sensitivity.ruleparameterfactorname", + factorWizardUI.getFactorNameField().setText(t("isisfish.sensitivity.ruleparameterfactorname", rule.getClass().getSimpleName(), paramName)); factorWizardUI.setFactorPath(factorPath); SensitivityWizardHandler handler = factorWizardUI.getHandler(); @@ -1314,7 +1314,7 @@ factorWizardUI.setLocationRelativeTo(ruleChooser); factorWizardUI.setVisible(true);*/ - Factor factor = new Factor(_("isisfish.sensitivity.ruleparameterfactorname", + Factor factor = new Factor(t("isisfish.sensitivity.ruleparameterfactorname", rule.getClass().getSimpleName(), paramName)); factor.setPath(factorPath); FactorWizardUI factorWizardUI = new FactorWizardUI(ruleChooser); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -29,7 +29,7 @@ import fr.ifremer.isisfish.ui.widget.filter.FilterModel; import fr.ifremer.isisfish.ui.widget.filter.FilterParamModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -97,7 +97,7 @@ return null; } SimulationFilterDialog ui = new SimulationFilterDialog(model, - _("isisfish.filter.select.simulation"), _("isisfish.filter.select")); + t("isisfish.filter.select.simulation"), t("isisfish.filter.select")); log.info("ui used " + ui.getClass()); // obtain exactly one simulation name or null if none taken @@ -149,7 +149,7 @@ // keep old result list List<SimulationProperties> oldResult = new ArrayList<SimulationProperties>(model.getFiltered()); - SimulationFilterDialog ui = new SimulationFilterDialog(model,_("isisfish.filter.simulation"),_("isisfish.filter.apply")); + SimulationFilterDialog ui = new SimulationFilterDialog(model,t("isisfish.filter.simulation"),t("isisfish.filter.apply")); log.info("ui used " + ui.getClass()); // obtain list of filtered simulation names Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.util; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.io.PrintWriter; @@ -68,8 +68,8 @@ public static void showErrorDialog(Component parent, String message, Throwable cause) { JXErrorPane pane = new JXErrorPane(); - ErrorInfo info = new ErrorInfo(_("isisfish.error.errorpane.title"), - _("isisfish.error.errorpane.htmlmessage", message), null, null, + ErrorInfo info = new ErrorInfo(t("isisfish.error.errorpane.title"), + t("isisfish.error.errorpane.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); if (cause != null) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -23,7 +23,7 @@ package fr.ifremer.isisfish.ui.widget; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.Dimension; @@ -201,7 +201,7 @@ private void buildLayout() { dataBox = new JComboBox<T>(); dataBox.addActionListener(new ComboBoxActionListener()); - filterField = new JXTextField(_("isisfish.common.filter")); + filterField = new JXTextField(t("isisfish.common.filter")); // fix size filterField.setPreferredSize(new Dimension(200, 0)); resetButton = new JButton(Resource.getIcon("/icons/cancel.png")); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.util; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.PrintWriter; @@ -102,7 +102,7 @@ ClassLoader cl = IsisFish.config.getScriptClassLoader(); result = cl.loadClass(fqn); } catch (ClassNotFoundException eee) { - log.info(_("isisfish.error.load.class", fqn), eee); + log.info(t("isisfish.error.load.class", fqn), eee); } return result; } @@ -116,7 +116,7 @@ result = clazz.newInstance(); } } catch (Exception eee) { - log.warn(_("isisfish.error.instanciate", fqn), eee); + log.warn(t("isisfish.error.instanciate", fqn), eee); } return result; } @@ -330,7 +330,7 @@ String content = "<p>Equation : " + createHREF(javaInterface.getName(), category) + " - " + name + "</p>"; - content += "<h3>" + _("isisfish.editor.parametersnameandtypes") + " :</h3>"; + content += "<h3>" + t("isisfish.editor.parametersnameandtypes") + " :</h3>"; Method[] methods = javaInterface.getDeclaredMethods(); Method interfaceMethod = methods[0]; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.util; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.IOException; @@ -161,12 +161,12 @@ // fix compilation issue : unmappable characters FileUtils.writeStringToFile(fileSrc, content, "utf-8"); } catch (IOException zzz) { - throw new IsisFishRuntimeException(_("isisfish.error.save.script.compilation", fileSrc), zzz); + throw new IsisFishRuntimeException(t("isisfish.error.save.script.compilation", fileSrc), zzz); } try { FileUtils.writeStringToFile(fileCheckSum, Integer.toString(script.hashCode()), "utf-8"); } catch (IOException zzz) { - throw new IsisFishRuntimeException(_("isisfish.error.save.checkSum.compilation", fileSrc), zzz); + throw new IsisFishRuntimeException(t("isisfish.error.save.checkSum.compilation", fileSrc), zzz); } } @@ -179,10 +179,10 @@ int compileResult = CompileHelper.compile(classpath, Collections.singletonList(fileSrc), fileRootSrc, null); if (compileResult != 0) { - throw new IsisFishRuntimeException(_("isisfish.error.compile.script", compileResult, fileSrc)); + throw new IsisFishRuntimeException(t("isisfish.error.compile.script", compileResult, fileSrc)); } } catch (Exception zzz) { - throw new IsisFishRuntimeException(_("isisfish.error.compile.script", fileSrc), zzz); + throw new IsisFishRuntimeException(t("isisfish.error.compile.script", fileSrc), zzz); } } @@ -191,7 +191,7 @@ ClassLoader cl = IsisFish.config.getScriptClassLoader(); clazz = cl.loadClass(classname); } catch (Exception zzz) { - throw new IsisFishRuntimeException(_("isisfish.error.load.class", classname), zzz); + throw new IsisFishRuntimeException(t("isisfish.error.load.class", classname), zzz); } result = invoke(clazz, interfaceMethod, args); @@ -272,7 +272,7 @@ result = method.invoke(eq, params.toArray()); return result; } catch (Exception eee) { - throw new IsisFishRuntimeException(_("isisfish.error.invoke.method", interfaceMethod, clazz.getName()), eee); + throw new IsisFishRuntimeException(t("isisfish.error.invoke.method", interfaceMethod, clazz.getName()), eee); } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.util; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.FileFilter; @@ -217,7 +217,7 @@ "com.sun.tools.doclets.standard.Standard", args.toArray(new String[0])); toolsJarLoader.close(); } catch (Exception ex) { - out.println(_("This function is only available with JDK (not JRE)")); + out.println(t("This function is only available with JDK (not JRE)")); ex.printStackTrace(out); result = -1; } finally { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.util.ssh; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.HashMap; @@ -119,7 +119,7 @@ if (kpair.isEncrypted()) { boolean isValid = false; - String message = _("isisfish.ssh.askpassphrase.message", + String message = t("isisfish.ssh.askpassphrase.message", privatekeyFile); do { passphrase = askPassphrase(privatekeyFile, message); @@ -128,7 +128,7 @@ isValid = true; passphraseForKeys.put(privatekeyFile, passphrase); } else { - message = _("isisfish.ssh.askpassphrase.wrongpassphrase", + message = t("isisfish.ssh.askpassphrase.wrongpassphrase", privatekeyFile); } } while (!isValid); @@ -158,7 +158,7 @@ Object[] objs = { labelField, passwordField }; int option = JOptionPane.showConfirmDialog(null, objs, - _("isisfish.ssh.askpassphrase.title"), + t("isisfish.ssh.askpassphrase.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (option == JOptionPane.CANCEL_OPTION) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.IsisConfig; import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.Properties; import org.apache.commons.beanutils.ConstructorUtils; @@ -130,7 +130,7 @@ new Object[]{dataDir, protocol, host, path, sshKeyFile, login, password}); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("isisfish.vcs.factory.cantinstanciate", classname), eee); + log.error(t("isisfish.vcs.factory.cantinstanciate", classname), eee); } result = new VCSNone(dataDir, protocol, host, path, sshKeyFile, login, password); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2014-03-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2014-03-25 22:04:05 UTC (rev 3910) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.vcs; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.ByteArrayOutputStream; import java.io.File; @@ -228,12 +228,12 @@ connectionState = ConnectionState.ON_LINE; if (log.isInfoEnabled()) { - log.info(_("isisfish.vcs.vcssvn.isconnected.switchto", + log.info(t("isisfish.vcs.vcssvn.isconnected.switchto", getRemoteRepository())); } } catch (SVNException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.vcs.vcssvn.isconnected.switchoff", + log.warn(t("isisfish.vcs.vcssvn.isconnected.switchoff", getRemoteRepository()), eee); } connectionState = ConnectionState.OFF_LINE; @@ -283,7 +283,7 @@ || !url.getHost().equals(newUrl.getHost())) { if (fireAction(VCSActionEvent.SWITCH_PROTOCOL)) { if (log.isInfoEnabled()) { - log.info(_("isisfish.vcs.vcssvn.checkProtocol.relocate", + log.info(t("isisfish.vcs.vcssvn.checkProtocol.relocate", localRoot, url, newUrl)); } @@ -296,7 +296,7 @@ } } catch (SVNException e) { throw new VCSException( - _("isisfish.vcs.vcssvn.checkProtocol.error"), e); + t("isisfish.vcs.vcssvn.checkProtocol.error"), e); } } @@ -404,7 +404,7 @@ try { wcClient.doCleanup(localFile); } catch (SVNException e) { - throw new VCSException(_("isisfish.vcs.vcssvn.cleanup.error"), e); + throw new VCSException(t("isisfish.vcs.vcssvn.cleanup.error"), e); } } @@ -418,7 +418,7 @@ // if can't commit if (!isWriteable()) { throw new VCSException( - _("isisfish.vcs.vcssvn.commit.errorreadonly")); + t("isisfish.vcs.vcssvn.commit.errorreadonly")); } // list to array @@ -459,14 +459,14 @@ SVNDepth.INFINITY); // depth if (log.isInfoEnabled()) { - log.info(_("isisfish.vcs.vcssvn.global.torevision", commitInfo + log.info(t("isisfish.vcs.vcssvn.global.torevision", commitInfo .getNewRevision())); } // commitInfo.getNewRevision() == -1 if file with no modification // is commited } catch (SVNException e) { - throw new VCSException(_("isisfish.vcs.vcssvn.commit.error"), e); + throw new VCSException(t("isisfish.vcs.vcssvn.commit.error"), e); } } @@ -478,7 +478,7 @@ @Override public void add(List<File> files, String msg) throws VCSException { if (!isWriteable()) { - throw new VCSException(_("isisfish.vcs.vcssvn.add.errorreadonly")); + throw new VCSException(t("isisfish.vcs.vcssvn.add.errorreadonly")); } try { if (fireAction(VCSActionEvent.ADD, files.toArray(new File[files @@ -502,7 +502,7 @@ commitWithoutCheck(files, msg); } } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.add.error"), eee); + throw new VCSException(t("isisfish.vcs.vcssvn.add.error"), eee); } } @@ -534,19 +534,19 @@ true); // boolean allowUnversionedObstructions if (log.isInfoEnabled()) { - log.info(_("isisfish.vcs.vcssvn.global.torevision", + log.info(t("isisfish.vcs.vcssvn.global.torevision", newRevision)); } } } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.checkout.error"), eee); + throw new VCSException(t("isisfish.vcs.vcssvn.checkout.error"), eee); } } public void delete(List<File> files, String msg) throws VCSException { if (!isWriteable()) { throw new VCSException( - _("isisfish.vcs.vcssvn.delete.errorreadonly")); + t("isisfish.vcs.vcssvn.delete.errorreadonly")); } try { if (fireAction(VCSActionEvent.DELETE, files.toArray(new File[files @@ -560,7 +560,7 @@ commitWithoutCheck(files, msg); } } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.delete.error"), eee); + throw new VCSException(t("isisfish.vcs.vcssvn.delete.error"), eee); } } @@ -651,7 +651,7 @@ return result; } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.localstatus.error"), + throw new VCSException(t("isisfish.vcs.vcssvn.localstatus.error"), eee); } } @@ -716,7 +716,7 @@ return result; } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.remotestatus.error"), + throw new VCSException(t("isisfish.vcs.vcssvn.remotestatus.error"), eee); } } @@ -785,7 +785,7 @@ handler); // ISVNLogEntryHandler handler } catch (SVNException e) { - throw new VCSException(_("Can't get changlog"), e); + throw new VCSException(t("Can't get changlog"), e); } return changLog; @@ -821,9 +821,9 @@ byte1.close(); } catch (SVNException e) { - throw new VCSException(_("isisfish.vcs.vcssvn.diff.error"), e); + throw new VCSException(t("isisfish.vcs.vcssvn.diff.error"), e); } catch (IOException e) { - throw new VCSException(_("isisfish.vcs.vcssvn.diff.error"), e); + throw new VCSException(t("isisfish.vcs.vcssvn.diff.error"), e); } return diff; @@ -867,7 +867,7 @@ SVNDirEntry.DIRENT_ALL, // int entryFields, handler); } catch (SVNException e) { - throw new VCSException(_("isisfish.vcs.vcssvn.list.error"), e); + throw new VCSException(t("isisfish.vcs.vcssvn.list.error"), e); } return files; @@ -891,7 +891,7 @@ // log if (log.isDebugEnabled()) { - log.debug(_("isisfish.vcs.vcssvn.global.filestatus", + log.debug(t("isisfish.vcs.vcssvn.global.filestatus", status.getFile().getAbsolutePath(), status .getRemoteNodeStatus().toString())); } @@ -901,7 +901,7 @@ // log if (log.isDebugEnabled()) { - log.debug(_("isisfish.vcs.vcssvn.global.foundUpdatedFile", + log.debug(t("isisfish.vcs.vcssvn.global.foundUpdatedFile", status.getFile().getAbsolutePath())); } result.add(status.getFile()); @@ -923,7 +923,7 @@ return result; } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.getupdate.error"), + throw new VCSException(t("isisfish.vcs.vcssvn.getupdate.error"), eee); } } @@ -971,7 +971,7 @@ SVNStatusType remoteStatus = status.getRemoteNodeStatus(); if (log.isDebugEnabled()) { - log.debug(_("isisfish.vcs.vcssvn.global.filelocalandremotestatus", + log.debug(t("isisfish.vcs.vcssvn.global.filelocalandremotestatus", localFile.getAbsolutePath(), localStatus, remoteStatus)); } @@ -990,7 +990,7 @@ // if exception, file doesn't exists on server // result is still 'false' if (log.isDebugEnabled()) { - log.debug(_("isisfish.vcs.vcssvn.isonremote.error", localFile + log.debug(t("isisfish.vcs.vcssvn.isonremote.error", localFile .getAbsolutePath()), e); } } @@ -1029,7 +1029,7 @@ } } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.isuptodate.error"), + throw new VCSException(t("isisfish.vcs.vcssvn.isuptodate.error"), eee); } @@ -1050,7 +1050,7 @@ } if (!accept(localFile)) { throw new VCSException( - _("isisfish.vcs.vcssvn.update.notinlocal")); + t("isisfish.vcs.vcssvn.update.notinlocal")); } if (fireAction(VCSActionEvent.UPDATE, localFile)) { // si le repertoire pere, n'est pas encore dans le repo local @@ -1068,7 +1068,7 @@ false); // boolean depthIsSticky if (log.isInfoEnabled()) { - log.info(_("isisfish.vcs.vcssvn.global.torevision", + log.info(t("isisfish.vcs.vcssvn.global.torevision", newRevision)); } @@ -1088,7 +1088,7 @@ } } catch (SVNException e) { - throw new VCSException(_("isisfish.vcs.vcssvn.update.error"), e); + throw new VCSException(t("isisfish.vcs.vcssvn.update.error"), e); } return result; } @@ -1136,7 +1136,7 @@ // est leve, et donc result reste a faux result = info != null; } catch (SVNException eee) { - log.debug(_("isisfish.vcs.vcssvn.istag.notexist", version)); + log.debug(t("isisfish.vcs.vcssvn.istag.notexist", version)); } } return result; @@ -1162,7 +1162,7 @@ } return result; } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.gettag.error"), eee); + throw new VCSException(t("isisfish.vcs.vcssvn.gettag.error"), eee); } } @@ -1193,7 +1193,7 @@ newUrl = newUrl.appendPath(tag, true); if (log.isInfoEnabled()) { - log.info(_("isisfish.vcs.vcssvn.settag.switchfromto", + log.info(t("isisfish.vcs.vcssvn.settag.switchfromto", currentTag, tag)); } @@ -1212,7 +1212,7 @@ // with org.tmatesoft.svn.core.SVNException: svn: Unable to lock 'xxx' if (log.isInfoEnabled()) { - log.info(_("isisfish.vcs.vcssvn.global.torevision", + log.info(t("isisfish.vcs.vcssvn.global.torevision", newRevision)); } @@ -1235,7 +1235,7 @@ } } catch (SVNException eee) { - throw new VCSException(_("isisfish.vcs.vcssvn.setTag.error"), eee); + throw new VCSException(t("isisfish.vcs.vcssvn.setTag.error"), eee); } return filesInConflict; 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-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-03-25 22:04:05 UTC (rev 3910) @@ -85,6 +85,7 @@ dgamma= dgeom= dhyper= +directory\ %s\ must\ be\ a\ directory= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. isisfish.about.abouthtmltext=<html><b>ISIS-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2013.<br /><br /><a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a><br /><br />Please, report any bug you can found.<html> @@ -367,6 +368,7 @@ isisfish.error.rename.region=Can't rename region to %1$s isisfish.error.save.checkSum.compilation=Can't save checkSum to compilation\: %1$s isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s +isisfish.error.save.simulation.parameters= isisfish.error.script.create=isisfish.error.script.create isisfish.error.script.delete=Can't delete file %1$s for reason %2$s isisfish.error.script.import=Can't import file for reason %1$s 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-25 21:46:51 UTC (rev 3909) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-03-25 22:04:05 UTC (rev 3910) @@ -85,6 +85,7 @@ dgamma= dgeom= dhyper= +directory\ %s\ must\ be\ a\ directory= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. isisfish.about.abouthtmltext=<html><b>ISIS-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2013.<br /><br /><a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a><br /><br />Merci de rapporter les bugs.<html> @@ -367,6 +368,7 @@ isisfish.error.rename.region=Can't rename region to %1$s isisfish.error.save.checkSum.compilation=Can't save checkSum to compilation\: %1$s isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s +isisfish.error.save.simulation.parameters= isisfish.error.script.create=isisfish.error.script.create isisfish.error.script.delete=N'a pas pu supprimer le fichier %1$s pour la raison suivante %2$s isisfish.error.script.import=N'a pas pu importer pour la raison suivante %1$s

1 0

25 Mar '14

Author: echatellier Date: 2014-03-25 22:46:51 +0100 (Tue, 25 Mar 2014) New Revision: 3909 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3909 Log: Fix javadoc Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -104,10 +104,12 @@ /** * La version du logiciel constitue de l.d.a.r - * <li>l: le numero de version du logiciel - * <li>d: le numero de version du schema de la base de donnees - * <li>a: le numero de version de l'api des scripts - * <li>r: le numero de version de de l'interface graphique ou autre modif mineur + * <ul> + * <li>l: le numero de version du logiciel</li> + * <li>d: le numero de version du schema de la base de donnees</li> + * <li>a: le numero de version de l'api des scripts</li> + * <li>r: le numero de version de de l'interface graphique ou autre modif mineur</li> + * </ul> * <p> * lors de l'increment de l, d, a et r sont remis a 0 * lors de l'increment de d, a et r sont remis a 0 Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -94,7 +94,7 @@ * * Created: 1 aout 2005 18:37:25 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN <poussin(a)codelutin.com> * @author chemit * @version $Revision$ * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -46,7 +46,7 @@ * * Created: 18 août 2005 15:07:36 CEST * - * @author Grégoire DESSARD <dessard(a)codelutin.com> + * @author Grégoire DESSARD <dessard(a)codelutin.com> * @version $Revision$ * * Last update: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -133,7 +133,7 @@ * {@link fr.ifremer.isisfish.IsisConfig#getJavadocDirectory()} * * @param force force javadoc build even if destination file is never - * @param out output print stream. if <tt>null</tt standart output will be used + * @param out output print stream. if <tt>null</tt> standart output will be used * @return 0 si la generation a reussi, une autre valeur sinon */ public int doJavadoc(boolean force, PrintWriter out) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -55,7 +55,7 @@ * * Created: 17 août 2005 03:44:57 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN <poussin(a)codelutin.com> * * @version $Revision$ * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -69,7 +69,7 @@ * * Created: 29 sept. 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -85,7 +85,7 @@ * * Created: 31 aout 2012 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin : poussin(a)codelutin.com * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -65,7 +65,7 @@ * * Created: 29 sept. 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin : poussin(a)codelutin.com * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -46,12 +46,12 @@ * Il se trouve dans le package portant le nom de la region de cette maniere * plusieurs region peuvent avoir des regles avec le meme nom mais pas le * meme code. - * <p/> + * <p> * Gere les fichiers VCS de type {@link Rule} (package rules) * * Created: 17 août 2005 11:11:51 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN <poussin(a)codelutin.com> * * @version $Revision$ * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -40,7 +40,7 @@ * * Created: 18 août 2005 15:07:36 CEST * - * @author Grégoire DESSARD <dessard(a)codelutin.com> + * @author Grégoire DESSARD <dessard(a)codelutin.com> * @version $Revision$ * * Last update: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -42,12 +42,12 @@ /** * Cette class permet de stocker les fichiers de calculateur de sensibilité. - * <p/> + * <p> * Gere les fichiers VCS de type {@link SensitivityAnalysis} (package sensitivityanalysis). * * Created: 17 août 2005 11:11:51 CEST * - * @author chatellier <chatellier(a)codelutin.com> + * @author chatellier <chatellier(a)codelutin.com> * @version $Revision$ * Last update: $Date$ by : $Author$ */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -42,7 +42,7 @@ * * Created: 18 août 2005 15:07:36 CEST * - * @author chatellier eric <chatellier(a)codelutin.com> + * @author chatellier eric <chatellier(a)codelutin.com> * @version $Revision$ * * Last update: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -44,12 +44,12 @@ /** * Class permettant de representer un plan de simulation. * Un plan de simulation est un fichier Java que l'on compile si besoin. - * <p/> + * <p> * Gere les fichiers VCS de type {@link SimulationPlan} (package simulationplans) * * Created: 17 août 2005 11:11:51 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN : poussin(a)codelutin.com * * @version $Revision$ * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -63,7 +63,7 @@ * * Created: 17 août 2005 03:48:50 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN : poussin(a)codelutin.com * @version $Revision$ * * Last update: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -41,7 +41,7 @@ * * Created: 18 août 2005 15:07:36 CEST * - * @author Grégoire DESSARD <dessard(a)codelutin.com> + * @author Grégoire DESSARD <dessard(a)codelutin.com> * @version $Revision$ * * Last update: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -31,9 +31,11 @@ * Listener for change made on storage. * * Such as : + * <ul> * <li>region added</li> * <li>script removed</li> * <li>plan renamed</li> + * </ul> * * @author chatellier * @version $Revision: 1.0 $ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -670,7 +670,7 @@ /** * Convertie une matrice N 2D en une matrice N 1D strucutre pour les calculer. * - * N2D[classes, zones] --> N1D[classe1(zone1, zone2, ...), classe2(zone1, zone2, ...)] + * N2D[classes, zones] --> N1D[classe1(zone1, zone2, ...), classe2(zone1, zone2, ...)] * * @see #split2D(MatrixND) */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -26,8 +26,8 @@ package fr.ifremer.isisfish.logging; /** - * abstraction of a log level - * <p/> + * abstraction of a log level. + * * a LogLevel is defined by 3 properties : * <ul> * <li> his name (given by {@link #name()}) </li> @@ -36,10 +36,10 @@ * <li> his mask value (given by {@link #mask()}) </li> * </ul> * The mask value is introduced to make possible some performant search. - * <p/> - * Using the <b>"<code>1 << ordinal()</code>"</b> idiom is the easiest manner to manage + * + * Using the <b>"<code>1 << ordinal()</code>"</b> idiom is the easiest manner to manage * operations of set of LogLevels. - * <p/> + * <p> * To obtain a LogLevel from his severity, use {@link #getLogLevel(int)} * * @author chemit Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -35,17 +35,17 @@ * To make performant filtering operations on a lots of LogRecord, * we use as representation for set of LogLevel an integer * as the sum of the {@link LogLevel#mask()} values. - * <p/> + * * The <code>0</code> value correspond to all levels and is a violating the rule * (but how to make a search with no level ?) - * <p/> + * * to test if a set of LogLevel contains a given LogLevel use * {@link #contains(int, int)} - * <p/> + * * to add a level in a set of LogLevel use {@link #addToSet(int, int)} - * <p/> + * * to remove a level in a set of LogLevel use {@link #removeFromSet(int, int)} - * <p/> + * * to obtain all levels contained in a set of LogLevel use * {@link #getLogLevels(int)} * @@ -80,7 +80,7 @@ /** * Compute the sum of levels toInit() value for * all given levels (given with their ordinal value). - * <p/> + * <p> * This value will be used for a performant filter process. * * @param firstOrdinal the first level of levels to use Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -51,15 +51,15 @@ * * Usefull class for dealing with hot configuration of log4J. this is temporary * we must find a way to abstract this layer. - * <p/> + * * the class offers three public static methods : - * <p/> + * * {@link #addSimulationAppender(String, String, String, String, String, String)} * to add a logger for a given simulation in a given thread, with simulLogLevel, * scriptLogLvel and libLogLevel given. - * <p/> + * * {@code #removeAppender(String, String)} to remove a appender of a simulation - * <p/> + * * {@link #showSimulationLogConsole(String)} to display the log console of * a simulation, given his name. * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -179,8 +179,8 @@ protected boolean disableScroll = true; /** - * the console listen the change on the model - * <p/> + * the console listen the change on the model. + * * TODO Deal with ui data update : use a Timer (or a Worker) * * @param e change event Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -61,7 +61,7 @@ /** * This class is responsible of provinding LogRecord, it deals with LogReecord * stored in a file with a serializedForm for performance issue. - * <p/> + * * <b>Use one LogConsoleHandler for one log file</b> * * @author chemit Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -34,7 +34,7 @@ /** * This class is the model used in LogConsole. - * <p/> + * * The model deals with ChangeEvent to notify ui, model has changed. * * @author chemit Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -71,7 +71,6 @@ * * @author chemit */ - public class LogMail extends LogMailUI { /** serialVersionUID */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -37,7 +37,7 @@ /** * A simple implementation of {@link OffsetReader} using a file for * dealing with offsets. - * <p/> + * * The offset of lines are pre-computed in a file {@link #offsetFile}, generated * by {@link #createOffsets(LineReader)}. or * {@link #createOffsets(LineReader , LineReader)}. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -35,10 +35,10 @@ /** * A lineReader reads lines from a file using a {@link java.io.RandomAccessFile}. - * <p/> - * To perfrom efficient io operations, we use a {@link OffsetReader} to obtain + * + * To perform efficient io operations, we use a {@link OffsetReader} to obtain * the offset of the first char of a line. - * <p/> + * * You can create a new LineReader from a previous one, the matchings lines of * the new LineReader will all match the parent one (subset LineReader). * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -34,9 +34,8 @@ /** * This class is a Offset Reader using a memory cache. - * <p/> + * * All offsets are saved in memory. - * <p/> * * @author chemit */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -227,13 +227,11 @@ * listener is interested in. * Layers interested in receiving events should register for * receiving events in "select" mode. - * <code> * <pre> * return new String[1] { * SelectMouseMode.modeID * }; * </pre> - * <code> * @see NavMouseMode#modeID * @see SelectMouseMode#modeID * @see NullMouseMode#modeID Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -68,7 +68,7 @@ * * Created: 16 mai 2005 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -298,11 +298,10 @@ * The source MouseEvents will only get sent to the MapMouseListener if the * mode is set to one that the listener is interested in. Layers interested * in receiving events should register for receiving events in "select" - * mode. <code> + * mode. * <pre> * return new String[1] { SelectMouseMode.modeID }; * </pre> - * <code> * @see SelectMouseMode#modeID */ public String[] getMouseModeServiceList() { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -180,23 +180,23 @@ * * Format is : * <pre> - * <mx name="une matrice"> - * <dimension name="classe" size="2"> - * <label>jeune</label> - * <label>vieux</label> - * </dimension> - * <dimension name="x" size="3"> - * <label>0</label> - * <label>1</label> - * <label>2</label> - * </dimension> - * <d>2.0</d> - * <d>3.1415</d> - * <d>2.0</d> - * <d>3.1415</d> - * <d>2.0</d> - * <d>3.1415</d> - * </mx> + * <mx name="une matrice"> + * <dimension name="classe" size="2"> + * <label>jeune</label> + * <label>vieux</label> + * </dimension> + * <dimension name="x" size="3"> + * <label>0</label> + * <label>1</label> + * <label>2</label> + * </dimension> + * <d>2.0</d> + * <d>3.1415</d> + * <d>2.0</d> + * <d>3.1415</d> + * <d>2.0</d> + * <d>3.1415</d> + * </mx> * </pre> * * @param matrix matrix @@ -265,23 +265,23 @@ * * Format is : * <pre> - * <mx name="une matrice"> - * <dimension name="classe" size="2"> - * <label>jeune</label> - * <label>vieux</label> - * </dimension> - * <dimension name="x" size="3"> - * <label>0</label> - * <label>1</label> - * <label>2</label> - * </dimension> - * <d>2.0</d> - * <d>3.1415</d> - * <d>2.0</d> - * <d>3.1415</d> - * <d>2.0</d> - * <d>3.1415</d> - * </mx> + * <mx name="une matrice"> + * <dimension name="classe" size="2"> + * <label>jeune</label> + * <label>vieux</label> + * </dimension> + * <dimension name="x" size="3"> + * <label>0</label> + * <label>1</label> + * <label>2</label> + * </dimension> + * <d>2.0</d> + * <d>3.1415</d> + * <d>2.0</d> + * <d>3.1415</d> + * <d>2.0</d> + * <d>3.1415</d> + * </mx> * </pre> * * @param mxElement dom element @@ -386,16 +386,16 @@ * * Format is : * <pre> - * <rules> - * <rule name="RuleName1"> - * <param key="rule.0.parameter.param1">param1</param> - * <param key="rule.0.parameter.pop">topiaId1</param> - * </rule> - * <rule name="RuleName2"> - * <param key="rule.0.parameter.param1">param2</param> - * <param key="rule.0.parameter.pop">topiaId2</param> - * </rule> - * </rules> + * <rules> + * <rule name="RuleName1"> + * <param key="rule.0.parameter.param1">param1</param> + * <param key="rule.0.parameter.pop">topiaId1</param> + * </rule> + * <rule name="RuleName2"> + * <param key="rule.0.parameter.param1">param2</param> + * <param key="rule.0.parameter.pop">topiaId2</param> + * </rule> + * </rules> * </pre> * * @param rules rules list @@ -429,16 +429,16 @@ * * Format is : * <pre> - * <rules> - * <rule name="RuleName1"> - * <param key="rule.0.parameter.param1">param1</param> - * <param key="rule.0.parameter.pop">topiaId1</param> - * </rule> - * <rule name="RuleName2"> - * <param key="rule.0.parameter.param1">param2</param> - * <param key="rule.0.parameter.pop">topiaId2</param> - * </rule> - * </rules> + * <rules> + * <rule name="RuleName1"> + * <param key="rule.0.parameter.param1">param1</param> + * <param key="rule.0.parameter.pop">topiaId1</param> + * </rule> + * <rule name="RuleName2"> + * <param key="rule.0.parameter.param1">param2</param> + * <param key="rule.0.parameter.pop">topiaId2</param> + * </rule> + * </rules> * </pre> * * @param rulesElement rules dom element @@ -484,7 +484,7 @@ * <li>Species:Nephrops</li> * <li>Population:Anchois</li> * <li>TimeStep:21</li> - * <li>... + * <li>...</li> * </ul> * * @param content content to parse Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -37,12 +37,14 @@ * ait, doivent etre des attributs public commencant par param. * * <p> Les types acceptable pour un parametre sont: - * <li> un nombre (int, long, float, double, ...) - * <li> un boolean - * <li> une chaine String - * <li> un objet Date ({@link fr.ifremer.isisfish.types.TimeStep}) - * <li> un objet Month ({@link fr.ifremer.isisfish.types.Month}) - * <li> Le type d'une entité (@see fr.ifremer.isisfish.entities) + * <ul> + * <li> un nombre (int, long, float, double, ...)</li> + * <li> un boolean</li> + * <li> une chaine String</li> + * <li> un objet Date ({@link fr.ifremer.isisfish.types.TimeStep})</li> + * <li> un objet Month ({@link fr.ifremer.isisfish.types.Month})</li> + * <li> Le type d'une entité (@see fr.ifremer.isisfish.entities)</li> + * </ul> * * <p> Pour supporter d'autre type il faut créer des converters commons-beanutils * //{@link fr.ifremer.isisfish.rule.RuleHelper#getRuleAsProperties(int, org.nuiton.topia.TopiaContext, Rule)} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -179,7 +179,7 @@ // ////////////////////////////////////////////////////////////////////////// - /** key <Metier, Month, Month> value: <Licence> */ + /** key <Metier, Month, Month> value: <Licence> */ protected MultiKeyMap list = new MultiKeyMap(); class Licence { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -41,7 +41,7 @@ * * @param context optimisation context * @param exports exports - * @param observation observation + * @param observations observations * @return double value */ double eval(OptimizationContext context, List<MatrixND> exports, List<MatrixND> observations); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -70,9 +70,9 @@ protected List<Population> pops = null; /** current number of fish by Pop */ protected Map<Population, MatrixND> Ns = new HashMap<Population, MatrixND>(); - /** reproduction key: <date, pop> value:<MatrixND> */ + /** reproduction key: <date, pop> value:<MatrixND> */ protected Map<Population, Map<TimeStep, MatrixND>> reproductions = new HashMap<Population, Map<TimeStep, MatrixND>>(); - /** discard key: <date, pop> value:<MatrixND> */ + /** discard key: <date, pop> value:<MatrixND> */ protected Map<Population, Map<TimeStep, MatrixND>> discards = new HashMap<Population, Map<TimeStep, MatrixND>>(); /** catch per population, only last catch is remaining */ protected Map<Population, MatrixND> catchs = new HashMap<Population, MatrixND>(); @@ -222,7 +222,7 @@ /** * * TODO les reproductions qui sont trop veille pour encore servir - * doivent être supprimées. c-a-d date < currentDate - etalement - gap between repro recru + * doivent être supprimées. c-a-d date < currentDate - etalement - gap between repro recru * Une autre facon de faire est de supprimer les repro == 0 car normalement * toute la repro doit etre utilisé au bout d'un certain temps * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -46,11 +46,13 @@ /** * Keep all information on one simulation. * - * <li> Launch parameter - * <li> Database (TopiaContext) - * <li> SimulationControl - * <li> Effective by pop (N) - * <li> Result + * <ul> + * <li> Launch parameter</li> + * <li> Database (TopiaContext)</li> + * <li> SimulationControl</li> + * <li> Effective by pop (N)</li> + * <li> Result</li> + * </ul> * * Created: 3 juil. 2006 17:05:27 * @@ -86,7 +88,7 @@ /** TopiaContext must be used to save result */ protected TopiaContext dbResult = null; - /** CacheAspect des variables d'entités. Topia id > map of attributes. */ + /** CacheAspect des variables d'entités. Topia id > map of attributes. */ protected Map<TopiaEntity, SimulationVariable> variablesCache = new HashMap<TopiaEntity, SimulationVariable>(); /** Context value used in equation. */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -41,7 +41,7 @@ * * Created: Fri Oct 6 2000 * - * @author POUSSIN Benjamin <poussin(a)codelutin.com> + * @author POUSSIN Benjamin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -30,7 +30,7 @@ * * Created: Wed Aug 14 2002 * - * @author <poussin(a)codelutin.com> + * @author <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -40,7 +40,7 @@ /** * This enum represents all properties on which we can perform search. - * <p/> + * * Each constant is also used as acceptor for the property it represents (using {@link FilterAcceptor#accept(Object, Object)} * and permit to access SimulationProperties values with methods * {@link #getValue(SimulationProperties)} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -42,14 +42,14 @@ /** * This class contains all usefull informations about a simulation. - * <p/> + * * This is used for filter or search a simulation. - * <p/> + * <p> * This is a mix of SimulationParameter and SimulationInformation. - * <p/> - * The class is only a properties container, no method to acces a data directly + * <p> + * The class is only a properties container, no method to access a data directly * (except to obtain name of underlying simulation). - * <p/> + * <p> * For this purpose use {@link SimulationMeta#getValue(SimulationProperties)} * and {@link SimulationMeta#getDateValue(SimulationProperties)} */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -43,29 +43,29 @@ /** - * <!ELEMENT outData (m,d,i,s)*> - * <!ELEMENT m (dim+, (d|i|s)+)> - * <!ELEMENT dim (label)+)> - * <!ELEMENT d (#PCDATA)> - * <!ELEMENT i (#PCDATA)> - * <!ELEMENT s (#PCDATA)> + * <!ELEMENT outData (m,d,i,s)*> + * <!ELEMENT m (dim+, (d|i|s)+)> + * <!ELEMENT dim (label)+)> + * <!ELEMENT d (#PCDATA)> + * <!ELEMENT i (#PCDATA)> + * <!ELEMENT s (#PCDATA)> * - * <!ATTLIST m + * <!ATTLIST m * name CDATA #REQUIRED - * step CDATA #IMPLIED> + * step CDATA #IMPLIED> * - * <!ATTLIST dim + * <!ATTLIST dim * name CDATA #REQUIRED - * size CDATA #REQUIRED> + * size CDATA #REQUIRED> * - * <!ATTLIST d - * step CDATA #IMPLIED> + * <!ATTLIST d + * step CDATA #IMPLIED> * - * <!ATTLIST i - * step CDATA #IMPLIED> + * <!ATTLIST i + * step CDATA #IMPLIED> * - * <!ATTLIST s - * step CDATA #IMPLIED> + * <!ATTLIST s + * step CDATA #IMPLIED> * * @author poussin */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -56,7 +56,7 @@ /** Managed entity id. */ protected TopiaEntity topiaEntity; - /** Variable name > variable entity. */ + /** Variable name > variable entity. */ protected Map<String, Variable> variablesCache = new HashMap<String, Variable>(); public SimulationVariable(SimulationContext simulationContext, TopiaEntity topiaEntity) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -30,7 +30,7 @@ * * Created: Fri Sep 6 2002 * - * @author <poussin(a)codelutin.com> + * @author Benjamin Poussin : poussin(a)codelutin.com * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -75,22 +75,22 @@ * * Caparmor file layout ($i = plan/as increment) : * <ul> - * <li>$ISIS-TMP/simulation-$id-preparation.zip - * <li>$ISIS-TMP/simulation-$id-prescript.bsh - * <li>$ISIS-TMP/simulation-$id-script.seq - * <li>$ISIS-TMP/simulation-$id-result.zip - * <li>$ISIS-TMP/simulation-$id-result.zip.md5 - * <li>$ISIS-TMP/simulation-$id-output.txt - * <li>$ISIS-TMP/simulation-$id-pbs.id + * <li>$ISIS-TMP/simulation-$id-preparation.zip</li> + * <li>$ISIS-TMP/simulation-$id-prescript.bsh</li> + * <li>$ISIS-TMP/simulation-$id-script.seq</li> + * <li>$ISIS-TMP/simulation-$id-result.zip</li> + * <li>$ISIS-TMP/simulation-$id-result.zip.md5</li> + * <li>$ISIS-TMP/simulation-$id-output.txt</li> + * <li>$ISIS-TMP/simulation-$id-pbs.id</li> * </ul> * All $ISIS-TMP/simulation-$id-* files are deteled after result download. * * Special case : * <ul> * <li>standalone zip : $ISIS-TMP/simulation-$shortid-result.zip - * (uploaded at first simulation) + * (uploaded at first simulation)</li> * <li>standalone simulations : $ISIS-TMP/simulation-$shortid-script.seq - * (uploaded at last simulation) + * (uploaded at last simulation)</li> * </ul> * where {@code $shortid} is id of parent job (without increment), they are not * deleted after result download. @@ -254,16 +254,16 @@ * * Dans le cas de ssh: * <ul> - * <li>upload la simulation - * <li>construit le script pour qsub - * <li>upload le script qsub - * <li>ajoute le script a qsub - * <ul> + * <li>upload la simulation</li> + * <li>construit le script pour qsub</li> + * <li>upload le script qsub</li> + * <li>ajoute le script a qsub</li> + * </ul> * * Et : * <ul> - * <li>lance le thread de control de la simulation - * <ul> + * <li>lance le thread de control de la simulation</li> + * </ul> */ @Override public void simulate(SimulationService simulationService, @@ -600,7 +600,7 @@ /** * Add ssh key into $HOME/.ssh/authorized_keys file. * - * Just connect and do an "echo xx >> .ssh/authorized_keys" + * Just connect and do an "echo xx >> .ssh/authorized_keys" * * @param session opened session * @param sshKey Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -40,9 +40,11 @@ * executer les jobs soumis dans la queue de {@link SimulationService} * <p> * Les fonctionnalites en plus par rapport a un {@link ThreadPoolExecutor} sont: - * <li> la possibilite de suspendre l'executor puis ensuite de le relancer + * <ul> + * <li> la possibilite de suspendre l'executor puis ensuite de le relancer</li> * <li> l'utilisation de beforeExecute pour fixer le {@link SimulatorLauncher} - * du job + * du job</li> + * </ul> * <p> * Il est aussi possible d'ecoute l'etat de l'attribut pause * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -506,7 +506,7 @@ * * @param job job to check progression * @param launcher SimulatorLauncher that manage simulation - * @return <tt>true</tt> is simulation is finished, <tt>false<tt> otherwise + * @return {@code true} is simulation is finished, {@code false} otherwise */ protected boolean checkProgression(SimulationJob job, SimulatorLauncher launcher) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -1097,12 +1097,14 @@ /** * Prepare les fichiers qui seront utilsé à la simulation: - * <li> scripts - * <li> rules - * <li> exports - * <li> simulators - * <li> export de la database de la region - * <li> simultionplan + * <ul> + * <li> scripts</li> + * <li> rules</li> + * <li> exports</li> + * <li> simulators</li> + * <li> export de la database de la region</li> + * <li> simultionplan</li> + * </ul> * <p> * Le tout est zippé et le zip est retourné, il peut-être directement * importé dans le {@link SimulationStorage} (en le renommant comme Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -54,7 +54,7 @@ * </ul> * * <h2>Architecture global</h2> - * <img src="doc-files/isis-simulation.png" alt="archi"/> + * <img src="doc-files/isis-simulation.png" alt="archi"> * * <h2>Principe general</h2> * <p> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -62,7 +62,7 @@ /** Continuous domain distribution. */ protected Distribution distribution; - /** Distribution params (param name > param value). */ + /** Distribution params (param name > param value). */ protected Map<String, Object> distributionParameters = new HashMap<String, Object>(); /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -56,7 +56,7 @@ * * Created: 23 janv. 2006 * - * @author Arnaud Thimel <thimel(a)codelutin.com> + * @author Arnaud Thimel <thimel(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -40,7 +40,7 @@ * * Created: 19 janv. 2006 * - * @author Arnaud Thimel <thimel(a)codelutin.com> + * @author Arnaud Thimel <thimel(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -40,7 +40,7 @@ * * Created: 19 janv. 2006 * - * @author Arnaud Thimel <thimel(a)codelutin.com> + * @author Arnaud Thimel <thimel(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -40,7 +40,7 @@ * * Created: 19 janv. 2006 * - * @author Arnaud Thimel <thimel(a)codelutin.com> + * @author Arnaud Thimel <thimel(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -40,7 +40,7 @@ * * Created: 19 janv. 2006 * - * @author Arnaud Thimel <thimel(a)codelutin.com> + * @author Arnaud Thimel <thimel(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -56,7 +56,7 @@ /** * Check that all 'input' opened interface has no non-saved modification. * - * @return <tt>true> if interface can be closed + * @return {@code true} if interface can be closed */ public boolean allIsSaved() { boolean canExit = true; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -84,7 +84,7 @@ * * Created: 1 aout 2005 18:37:25 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN <poussin(a)codelutin.com> * @version $Revision: 1312 $ * * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -146,7 +146,7 @@ /** * Delete one entity and commit the change, try to selected intelligently * other node in tree. - * <p/> + * <p> * Refresh all ui component where name match "input<entity type without * package >.*" */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -41,7 +41,7 @@ * * Created: 5 septembre 2005 03:21:41 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN <poussin(a)codelutin.com> * @version $Revision: 202 $ * * Last update: $Date: 2006-06-30 18:39:09 +0200 (ven, 30 jun 2006) $ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -66,7 +66,7 @@ * * Created: 9 janv. 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -38,7 +38,7 @@ * * Created: 9 janv. 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -37,7 +37,7 @@ * * Created: 10 janv. 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -47,7 +47,7 @@ * * Created: 10 janv. 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -35,7 +35,7 @@ * * Created: 10 janv. 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -48,8 +48,10 @@ * Table model for {@link Gear}#{@link Selectivity}. * * Columns : + * <ul> * <li>selectivity population name</li> * <li>selectivity equation</li> + * </ul> * * @author chatellier * @version $Revision$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -49,9 +49,11 @@ * Table model for {@link MetierSeasonInfo}#{@link TargetSpecies}. * * Columns : + * <ul> * <li>target species name</li> * <li>target species equation</li> * <li>target species primaryCatch</li> + * </ul> * * @author chatellier * @version $Revision$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -43,9 +43,11 @@ * Model de la table de definition de parametre d'un script. * * Columns : + * <ul> * <li>Parameter name</li> * <li>Parameter value</li> * <li>Parameter factor (if enabled)</li> + * </ul> * * @author chatellier * @version $Revision$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -40,9 +40,11 @@ * Model de la table de definition des cadinalité de facteurs. * * Columns : + * <ul> * <li>Factor name</li> * <li>Cardinality</li> - * + * </ul> + * * @author chatellier * @version $Revision$ * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -32,7 +32,7 @@ * <ul> * <li>{@link EquationContinuousPanelUI}</li> * <li>{@link ContinuousDistributionPanel}</li> - * <ul> + * </ul> * * @author chatellier * @version $Revision$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -106,7 +106,7 @@ * * Created: 1 aout 2005 18:37:25 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN <poussin(a)codelutin.com> * @version $Revision$ * * Last update: $Date$ @@ -267,7 +267,7 @@ * <li>params</li> * <li>simulation plans</li> * <li>factors list</li> - * <ul> + * </ul> * * Open old simulation: * <ul> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -43,7 +43,7 @@ import java.util.TreeMap; /** - * This class offers methods to select or filter simulation name via an ui + * This class offers methods to select or filter simulation name via an ui. * * @see #selectSimulation(List) * @see #selectSimulation(FilterModel) @@ -55,14 +55,14 @@ static private Log log = LogFactory.getLog(SimulationFilterUtil.class); /** - * Open the filter simulation filter dialog using list of simualtion names - * to create FilterModel, and waits for user to select a simualtion in a non + * Open the filter simulation filter dialog using list of simulation names + * to create FilterModel, and waits for user to select a simulation in a non * empty filter result. - * <p/> + * * If user cancels, it returns <code>null</code> * * @param names the list of simulation names to used - * @return name of the simulation choosed by user or null if it cancel + * @return name of the simulation chosen by user or null if it cancel * operation * @throws java.text.ParseException if problem while init dialogModel * @throws java.io.IOException todo @@ -80,11 +80,11 @@ /** * Open the filter simulation filter dialog using directly a given - * FilterModel, and waits for user to select a simualtion in a non + * FilterModel, and waits for user to select a simulation in a non * empty filter result. * * @param model model to used - * @return name of the simulation choosed by user or null if it cancel + * @return name of the simulation chosen by user or null if it cancel * operation * @throws java.text.ParseException if problem while init dialogModel * @throws java.io.IOException todo @@ -110,7 +110,7 @@ * Open the filter simulation dialog and waits for user to accept a * non empty filter result. * It used a list of simulation names to create FilterModel. - * <p/> + * <p> * If user cancels, it returns an empty list. * * @param names the list of simulation names to used @@ -132,7 +132,7 @@ * Open the filter simulation dialog and waits for user to accept a * non empty filter result. * It used directly the given FilterModel. - * <p/> + * <p> * If user cancels, it returns the previous result list. * * @param model filterModel to use Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -37,7 +37,7 @@ * * Created: Wed Oct 4 2000 * - * @author POUSSIN Benjamin <bpoussin(a)free.fr> Copyright COGITEC + * @author POUSSIN Benjamin <bpoussin(a)free.fr> Copyright COGITEC * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -51,7 +51,7 @@ * * Created: 23 mars 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -34,7 +34,7 @@ /** * This class is an Acceptor factory. - * <p/> + * <p> * For simple {@link Acceptor} we use a cache to use an unique instance. * * @author chemit Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -27,10 +27,9 @@ /** - * this class is a concrete implementation of {@link FilterAcceptor} + * This class is a concrete implementation of {@link FilterAcceptor} * with an internal {@link Acceptor} (delegate Acceptor operations), - * and an internal {@link ValueGetter} (delegate ValueGetter operations) - * <p/> + * and an internal {@link ValueGetter} (delegate ValueGetter operations). * * @author chemit * @see Acceptor Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -27,8 +27,7 @@ /** * Class representing an Acceptor and ValueGetter for object of - * type <code>M</code> and parameter of type <code>T</code> - * <p/> + * type <code>M</code> and parameter of type <code>T</code>. * * @author chemit * @see Acceptor Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -30,22 +30,22 @@ /** * Contrat à respecter pour qu'un dialogue puisse bénéficier du mécanisme de * filtre. - * <p/> * * Cette méthode est invoquée lors d'un appel à {@link #doFilter()} ou * {@link #doCheck()}. - * <p/> + * <p> * La méthode {@link #doReset()} permet de réinitialiser le dialogModel * (et le dialogue) */ public interface FilterDialog<M, R> { /** - * launch filter proccess. - * <p/> + * launch filter process. + * * This operation acts in three step : - * <ul><li>clean model</li> - * <ul><li>push ui values to model </li> + * <ul> + * <li>clean model</li> + * <li>push ui values to model </li> * <li> for all original items and only for detected as usable params * try to accept item</li> * </ul> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -34,7 +34,7 @@ /** * This class represents a generic filter model. - * <p/> + * * It contains all data to be used for filter process. * * @author chemit @@ -52,7 +52,7 @@ /** list of param keys to be used */ protected List<String> paramKeys; - /** map -> paramKey to param models */ + /** map -> paramKey to param models */ protected Map<String, FilterParamModel<M, ?>> paramModels; /** * flag to says inclusive mode (need one param accept) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -33,7 +33,7 @@ /** * Annotation utilisée pour specifier le type des parametres. * - * Pour etre plus explicit que "List" en renseignant "List<Zone>" par exemple. + * Pour etre plus explicit que "List" en renseignant "List<Zone>" par exemple. * * Doit pouvoir être remplacé par l'introspection java sans problème. * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -36,7 +36,7 @@ * * Created: 6 septembre 2005 00:57:33 CEST * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @author Benjamin POUSSIN <poussin(a)codelutin.com> * * @version $Revision$ * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -154,10 +154,12 @@ * @param out l'objet sur lequel on ecrit la sortie (erreur) de la * compilation * @return un nombre different de 0 s'il y a une erreur + * <ul> * <li> -1000 si l'exception vient de la recherche du compilateur par - * introspection - * <li> -10000 si une autre exception - * <li> sinon les valeurs retourné par le compilateur java + * introspection</li> + * <li> -10000 si une autre exception</li> + * <li> sinon les valeurs retourné par le compilateur java</li> + * </ul> */ public static int compile(File rootSrc, File src, File dest, PrintWriter out) { int result = compile(rootSrc, Collections.singletonList(src), dest, out); @@ -174,10 +176,12 @@ * @param out l'objet sur lequel on ecrit la sortie (erreur) de la * compilation * @return un nombre different de 0 s'il y a une erreur + * <ul> * <li> -1000 si l'exception vient de la recherche du compilateur par - * introspection - * <li> -10000 si une autre exception - * <li> sinon les valeurs retourné par le compilateur java + * introspection</li> + * <li> -10000 si une autre exception</li> + * <li> sinon les valeurs retourné par le compilateur java</li> + * </ul> */ public static int compile(File rootSrc, Collection<File> src, File dest, PrintWriter out) { @@ -260,8 +264,8 @@ * * Add : * <ul> - * <li>System.getProperty("java.class.path") - * <li>All first jar dependency (META-INF/MANIFEST.MF) + * <li>System.getProperty("java.class.path")</li> + * <li>All first jar dependency (META-INF/MANIFEST.MF)</li> * </ul> * @param classpath initial classpath * @return classpath as string Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -34,15 +34,15 @@ /** * IsisCacheBackendOnReferenceMap utilise pour mettre les resultats de methode durant la simulation - pour minimiser les appels - - Created: 25 août 06 22:42:47 + * pour minimiser les appels * + * Created: 25 août 06 22:42:47 + * * @author poussin * @version $Revision$ - - Last update: $Date$ - by : $Author$ + * + * Last update: $Date$ + * by : $Author$ */ public class IsisCacheBackendOnReferenceMap implements IsisCacheBackend { @@ -64,7 +64,7 @@ static final private Object NULL = new Object(); /** - * map<TimeStep, Map<Key, Value>> + * map<TimeStep, Map<Key, Value>> * TimeStep peut etre null via l'objet NULL * Key est la cle calcule par computeKey * Value est la valeur du cache @@ -129,7 +129,7 @@ } /** - * remove all values in cache for the specied TimeStep + * remove all values in cache for the specified TimeStep */ @Override public void removeStep(Object o) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -61,7 +61,7 @@ /** * Passphrase associated to key file path. * - * private key file path => passphrase. + * private key file path =< passphrase. * * Ensure that passphrase are valid before add into. */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -133,7 +133,7 @@ } /** - * Track progress every 10% if 100kb < filesize < 1mb. For larger + * Track progress every 10% if 100kb < filesize < 1mb. For larger * files track progress for every percent transmitted. * @param filesize the size of the file been transmitted * @param totalLength the total transmission size Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2014-03-25 17:03:20 UTC (rev 3908) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2014-03-25 21:46:51 UTC (rev 3909) @@ -85,7 +85,7 @@ * * Created: 3 août 2004 * - * @author Benjamin Poussin <poussin(a)codelutin.com> + * @author Benjamin Poussin <poussin(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$

1 0

25 Mar '14

Author: echatellier Date: 2014-03-25 18:03:20 +0100 (Tue, 25 Mar 2014) New Revision: 3908 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3908 Log: Fix some java 8 javadoc errors Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ScriptParameterDialog.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisCache.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -77,28 +77,28 @@ /** * Config step after init. * - * @see org.nuiton.util.ApplicationConfig.Action.Step + * @see org.nuiton.config.ApplicationConfig.Action.Step */ public static final int STEP_AFTER_INIT = 0; /** * Config step after init vcs. * - * @see org.nuiton.util.ApplicationConfig.Action.Step + * @see org.nuiton.config.ApplicationConfig.Action.Step */ public static final int STEP_AFTER_INIT_VCS = 1; /** * Config step after ui. * - * @see org.nuiton.util.ApplicationConfig.Action.Step + * @see org.nuiton.config.ApplicationConfig.Action.Step */ public static final int STEP_AFTER_UI = 2; /** * Config step before exit. * - * @see org.nuiton.util.ApplicationConfig.Action.Step + * @see org.nuiton.config.ApplicationConfig.Action.Step */ public static final int STEP_BEFORE_EXIT = 3; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -96,7 +96,7 @@ /** * Get non empty location. * - * @param location current location (if empty, return {@link Location#All}. + * @param location current location (if empty, return {@link Location#ALL}. */ protected static Location[] nonEmptyLocation(Location... location) { Location[] locs = location; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -74,7 +74,6 @@ * * @param rootSrc sources root directory * @param directory class location directory (rootSrc subdirectory) - * @param storagePath storagePath * @param name class name */ protected JavaSourceStorage(File rootSrc, File directory, String name) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -339,7 +339,7 @@ * If a time already exists for ruleName, add time to previous time. * (usefull because pre/post action are called multiples time) * - * @param keyName (ie {@link #RULE_TIME_INIT}, {@link #RULE_TIME_PRE}, {@link #RULE_TIME_POST}) + * @param keyName (ie {@code #RULE_TIME_INIT}, {@code #RULE_TIME_PRE}, {@code #RULE_TIME_POST}) * @param ruleName rule name * @param time time to add * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -58,7 +58,7 @@ * to add a logger for a given simulation in a given thread, with simulLogLevel, * scriptLogLvel and libLogLevel given. * <p/> - * {@link #removeAppender(String, String)} to remove a appender of a simulation + * {@code #removeAppender(String, String)} to remove a appender of a simulation * <p/> * {@link #showSimulationLogConsole(String)} to display the log console of * a simulation, given his name. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -185,7 +185,7 @@ /** * Get factor name. * - * Dans la majorité des cas, on a un {@link lastReadName} défini. Dans les + * Dans la majorité des cas, on a un {@link #lastReadName} défini. Dans les * autre cas, il faut chercher un meilleur nom. * * @param entity entity to get factor name Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -45,7 +45,7 @@ * <li> Le type d'une entité (@see fr.ifremer.isisfish.entities) * * <p> Pour supporter d'autre type il faut créer des converters commons-beanutils - * //{@link fr.ifremer.isisfish.simulator.SimulationParameter#ruleParametertoProperties(int, Rule)} + * //{@link fr.ifremer.isisfish.rule.RuleHelper#getRuleAsProperties(int, org.nuiton.topia.TopiaContext, Rule)} * * Created: 12 janv. 2006 17:02:43 * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -203,7 +203,7 @@ /** * Retourne la matrice stocke pour un pas de temps - * @param date le pas de temps que l'on souhaite + * @param step le pas de temps que l'on souhaite * @param pop la population pour lequelle on souhaite le resultat * @param name le nom des resultats dont on veut la matrice * @return La matrice demandée ou null si aucune matrice ne correspond a Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -37,8 +37,6 @@ * Compute prescript * * @param context simulation context - * @param db database context - * @return equation result * @throws Exception */ @Args({"context"}) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -1211,7 +1211,7 @@ /** * Get remote directory absolute path. * - * Don't use {@link java.io.File.separator} here, caparmor is always unix. + * Don't use {@link java.io.File#separator} here, caparmor is always unix. * * @return remote temp directory path */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 1999 - 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 @@ -98,7 +98,7 @@ * fr.ifremer.isisfish.simulator.launcher.SimulationExecutor} sont responsable de l'execution des simulations de la * queue. Chaque {@link fr.ifremer.isisfish.simulator.launcher.SimulationExecutor} a un * {@link fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher} qu'il utilise - * si la simulation n'a pas encore de {@link SimulatorLauncher} + * si la simulation n'a pas encore de {@code SimulatorLauncher} * d'assigne. * </p> * <p> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2014-03-25 17:03:20 UTC (rev 3908) @@ -70,7 +70,7 @@ /** * Open user dialog to selected a parameter file. - * Reload it, and call {@link refresh()}. + * Reload it, and call {@link #refresh()}. */ protected void importSimulation() { JFileChooser fc = new JFileChooser(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -572,7 +572,6 @@ * Get ui that can display internalClass. * * @param internalClass internal class to get ui - * @param topiaEntity topia entity to set into ui * @return ui for class * @throws Exception */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboModel.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboModel.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -56,7 +56,7 @@ /** * Constructor with calculator list. * - * @param sensitivityAnalysisNames sensitivity analysis Names + * @param optimizationNames sensitivity analysis Names */ public OptimizationComboModel(List<String> optimizationNames) { setOptimizationNames(optimizationNames); @@ -74,7 +74,7 @@ /** * Set sensitivity analysis names. * - * @param sensitivityAnalysisNames the names to set + * @param optimizationNames the names to set */ public void setOptimizationNames(List<String> optimizationNames) { this.optimizationNames = optimizationNames; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -47,7 +47,7 @@ public class RuleChooserHandler { /** - * Get new instance for selected rules names and add it to {@link rulesList} list. + * Get new instance for selected rules names and add it to {@code rulesList} list. * * @param ruleChooser rule chooser ui */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2014-03-25 17:03:20 UTC (rev 3908) @@ -38,8 +38,6 @@ } /** * push param's ui value to model - * - * @throws Exception */ public synchronized void uiToModel() { extractTextFieldParam(SimulationMeta.simulationName.name()); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -66,7 +66,7 @@ /** * obtain the list of relative path to {@link #root} directory needed - * to be backuped in {@link #backupRoot} directory + * to be backuped in {@code #backupRoot} directory * * @return the list of relative path to files to backup */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ScriptParameterDialog.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ScriptParameterDialog.jaxx 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ScriptParameterDialog.jaxx 2014-03-25 17:03:20 UTC (rev 3908) @@ -39,7 +39,7 @@ * Test if isis configuration allow auto configuration, and display * configuration frame (with only table model). * - * @param parent parent component + * @param context parent component * @param script script to configure * @return configured script, or {@code null} if user cancel configuration */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2014-03-25 17:03:20 UTC (rev 3908) @@ -43,8 +43,6 @@ /** * push param's ui value to model - * - * @throws Exception */ public void uiToModel() { // implements me... Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisCache.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisCache.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisCache.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -76,7 +76,7 @@ /** * Return trace object from context. - * <p> + * * @return trace object from context */ protected Trace getTrace() { @@ -86,11 +86,8 @@ } /** - * Recupere pour un pas de temps donnes une valeur calcule pour une cle - * <p> - * @param step le pas de temps pour lequel on souhaite ajouter (ou - * null) - * @param key la cle de storage + * Recupere pour un pas de temps donnes une valeur calcule pour une cle. + * * @param defaultValue la valeur par defaut a retourner si elle n'est pas en * cache si defaultValue est une JoinPoint alors un * proceed est appele dessus et le resultat de l'appel @@ -169,9 +166,8 @@ /** * On fait l'appel reel dans une autre methode pour pouvoir le savoir dans - * les traces - * <p> - * @param jp + * les traces. + * * @return ? * @throws Throwable */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -40,7 +40,7 @@ /** * Test presence of some setXXX option called only - * in instrospection by {@link ApplicationConfig}. + * in introspection by {@link IsisConfig}. */ @Test public void testSetterExistence() { Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-03-25 16:11:09 UTC (rev 3907) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-03-25 17:03:20 UTC (rev 3908) @@ -240,7 +240,7 @@ } /** - * Test method {@link MexicoHelper#getDesignPlanAsXML(DesignPlan)}. + * Test method {@link MexicoHelper#getDesignPlanAsXML(DesignPlan, String...)}. * * Sans groupe de facteur, tel qu'il était en 3.3.0.0. *

1 0

r3907 - trunk/src/main/java/fr/ifremer/isisfish/util
by bpoussin＠users.forge.codelutin.com 25 Mar '14

25 Mar '14

Author: bpoussin Date: 2014-03-25 17:11:09 +0100 (Tue, 25 Mar 2014) New Revision: 3907 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3907 Log: during simulation don't use hashcode file for java file, use Map in ContextSimulation.getValue Modified: trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-03-25 13:48:04 UTC (rev 3906) +++ trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2014-03-25 16:11:09 UTC (rev 3907) @@ -43,6 +43,9 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.simulator.SimulationContext; +import java.util.HashMap; +import org.apache.commons.lang3.StringUtils; /** @@ -61,8 +64,58 @@ /** Logger for this class. */ private static Log log = LogFactory.getLog(EvaluatorHelper.class); + private static final String HASH_CACHE_KEY = "__hashCache__"; + + protected static String getHashCache(File fileCheckSum) { + String result = ""; + + SimulationContext context = SimulationContext.get(); + if (context == null) { + // on est pas dans une simulation + // on verifie dans le fichier + if (fileCheckSum.exists()) { + try { + result = FileUtils.readFileToString(fileCheckSum); + } catch (IOException eee) { + log.info("Can't read old checkSum: " + fileCheckSum, eee); + } + } + } else { + // on est dans une simulation, on verifie dans le cache de la simulation + String key = "__hashCache__"; + Map<String, String> cache = (Map<String, String>)context.getValue(key); + if (cache != null) { + result = StringUtils.defaultString(cache.get(fileCheckSum.getPath())); + } + } + + return result; + } + + protected static void setHashCache(File fileCheckSum, String hashcode) { + SimulationContext context = SimulationContext.get(); + if (context == null) { + // on est pas dans une simulation + // on ecrit dans le fichier + try { + FileUtils.writeStringToFile(fileCheckSum, hashcode); + } catch (IOException eee) { + log.info("Can't write checkSum: " + fileCheckSum, eee); + } + } else { + // on est dans une simulation, on verifie dans le cache de la simulation + Map<String, String> cache = (Map<String, String>)context.getValue(HASH_CACHE_KEY); + if (cache == null) { + context.setValue(HASH_CACHE_KEY, cache = new HashMap<String, String>()); + } + + cache.put(fileCheckSum.getPath(), hashcode); + } + } + + protected static String normalizeClassName(String name) { - StringBuffer result = new StringBuffer(name); + StringBuffer result = new StringBuffer(name); for (int i=0; i<result.length(); i++) { char c = result.charAt(i); if (!Character.isJavaIdentifierPart(c)) { @@ -143,12 +196,7 @@ // if equation's Java file exists, check the checksum if (fileSrc.exists() && fileCheckSum.exists()) { - String oldCheckSum = ""; - try { - oldCheckSum = FileUtil.readAsString(fileCheckSum); - } catch (IOException eee) { - log.info("Can't read old checkSum: " + fileCheckSum, eee); - } + String oldCheckSum = getHashCache(fileCheckSum); String newCheckSum = Integer.toString(script.hashCode()); checkSumEquals = newCheckSum.equals(oldCheckSum); } @@ -162,14 +210,10 @@ // force writing to UTF-8 // fix compilation issue : unmappable characters FileUtil.writeString(fileSrc, content, "utf-8"); + setHashCache(fileCheckSum, Integer.toString(script.hashCode())); } catch (IOException zzz) { throw new IsisFishRuntimeException(_("isisfish.error.save.script.compilation", fileSrc), zzz); } - try { - FileUtil.writeString(fileCheckSum, Integer.toString(script.hashCode())); - } catch (IOException zzz) { - throw new IsisFishRuntimeException(_("isisfish.error.save.checkSum.compilation", fileSrc), zzz); - } } // if Java file is newer than class file, compile java file

1 0

r3906 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor
by bpoussin＠users.forge.codelutin.com 25 Mar '14

25 Mar '14

Author: bpoussin Date: 2014-03-25 14:48:04 +0100 (Tue, 25 Mar 2014) New Revision: 3906 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3906 Log: fixes bug if value is null Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2014-03-24 13:22:55 UTC (rev 3905) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2014-03-25 13:48:04 UTC (rev 3906) @@ -50,6 +50,7 @@ import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.util.ConverterUtil; +import org.apache.commons.lang3.StringUtils; /** * Un editeur generic de champs qui se base sur le model de données @@ -193,7 +194,7 @@ case File: // break; default: - editor = new JTextField(value.toString()); + editor = new JTextField(String.valueOf(value)); } if (editor != null) { if (JComboBox.class.isInstance(editor)) {

1 0

r3905 - branches/4.0.1
by echatellier＠users.forge.codelutin.com 24 Mar '14

24 Mar '14

Author: echatellier Date: 2014-03-24 14:22:55 +0100 (Mon, 24 Mar 2014) New Revision: 3905 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3905 Log: Fix dependency plugin with snapshot Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-03-21 17:31:25 UTC (rev 3904) +++ branches/4.0.1/pom.xml 2014-03-24 13:22:55 UTC (rev 3905) @@ -642,6 +642,7 @@ <configuration> <silent>true</silent> <outputDirectory>${project.build.directory}/lib</outputDirectory> + <useBaseVersion>false</useBaseVersion> </configuration> <goals> <goal>copy-dependencies</goal>

1 0