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

r1640 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 17:17:20 +0000 (Fri, 28 Nov 2008) New Revision: 1640 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncher.java Log: Throw an exception if simulation can't be launched Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncher.java 2008-11-28 17:10:20 UTC (rev 1639) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncher.java 2008-11-28 17:17:20 UTC (rev 1640) @@ -229,6 +229,7 @@ if(log.isErrorEnabled()) { log.error(_("isisfish.error.simulation.remote.global")); } + throw new SimulationException("isisfish.error.simulation.remote.global", e); }

1 0

r1639 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 17:10:20 +0000 (Fri, 28 Nov 2008) New Revision: 1639 Modified: isis-fish/trunk/src/main/resources/log4j.properties Log: Update log4j.properties Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2008-11-28 17:09:59 UTC (rev 1638) +++ isis-fish/trunk/src/main/resources/log4j.properties 2008-11-28 17:10:20 UTC (rev 1639) @@ -4,11 +4,13 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X + # package level log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.codelutin=INFO +log4j.logger.analyseplans=INFO +log4j.logger.exports=INFO +log4j.logger.formules=INFO +log4j.logger.rules=INFO log4j.logger.scripts=INFO log4j.logger.simulators=INFO -log4j.logger.exports=INFO -log4j.logger.formules=INFO

1 0

r1638 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 17:09:59 +0000 (Fri, 28 Nov 2008) New Revision: 1638 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/versionning/ Log: Remove empty dir

1 0

r1637 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 17:04:51 +0000 (Fri, 28 Nov 2008) New Revision: 1637 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncher.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Add ssh simulation launcher Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2008-11-28 17:04:21 UTC (rev 1636) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2008-11-28 17:04:51 UTC (rev 1637) @@ -21,16 +21,6 @@ import static org.codelutin.i18n.I18n._; -import fr.ifremer.isisfish.actions.ExportAction; -import fr.ifremer.isisfish.actions.OtherAction; -import fr.ifremer.isisfish.actions.ImportAction; -import fr.ifremer.isisfish.actions.SimulationAction; -import fr.ifremer.isisfish.actions.VCSAction; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; -import fr.ifremer.isisfish.simulator.launcher.SimulationService; -import fr.ifremer.isisfish.simulator.launcher.SubProcessSimulationLauncher; -import fr.ifremer.isisfish.vcs.VCS; import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -42,6 +32,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; + import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; @@ -51,6 +42,18 @@ import org.codelutin.util.StringUtil; import org.codelutin.util.VersionNumber; +import fr.ifremer.isisfish.actions.ExportAction; +import fr.ifremer.isisfish.actions.ImportAction; +import fr.ifremer.isisfish.actions.OtherAction; +import fr.ifremer.isisfish.actions.SimulationAction; +import fr.ifremer.isisfish.actions.VCSAction; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; +import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import fr.ifremer.isisfish.simulator.launcher.SshSimulatorLauncher; +import fr.ifremer.isisfish.simulator.launcher.SubProcessSimulationLauncher; +import fr.ifremer.isisfish.vcs.VCS; + /** * * @author poussin @@ -212,7 +215,7 @@ /** * Retourne l'url du serveur de simulation - * @return + * @return simulator server */ public String getSimulatorServer() { String result = getOption(Option.SIMULATOR_SERVER.key); @@ -221,7 +224,7 @@ /** * Retourne le login pour acceder au serveur de simulation - * @return + * @return simulator username */ public String getSimulatorUsername() { String result = getOption(Option.SIMULATOR_USER_NAME.key); @@ -230,7 +233,7 @@ /** * Retourne le mot de passe pour acceder au serveur de simulation - * @return + * @return simulator password */ public String getSimulatorPassword() { String result = getOption(Option.SIMULATOR_PASSWORD.key); @@ -247,6 +250,46 @@ } /** + * Retourne l'url du serveur de simulation accessible via SSH. + * + * @return simulator server + */ + public String getSimulatorSshServer() { + String result = getOption(Option.SIMULATOR_SSH_SERVER.key); + return result; + } + + /** + * Retourne le login pour acceder au serveur de simulation accessible via SSH. + * + * @return simulator username + */ + public String getSimulatorSshUsername() { + String result = getOption(Option.SIMULATOR_SSH_USER_NAME.key); + return result; + } + + /** + * Retourne le mot de passe pour acceder au serveur de simulation accessible via SSH. + * + * @return simulator password + */ + public String getSimulatorSshPassword() { + String result = getOption(Option.SIMULATOR_SSH_PASSWORD.key); + return result; + } + + /** + * Retourne la clé privée pour acceder au serveur de simulation accessible via SSH. + * + * @return simulator password + */ + public String getSimulatorSshPrivateKey() { + String result = getOption(Option.SIMULATOR_SSH_PRIVATEKEY.key); + return result; + } + + /** * Le type de simulation par defaut a utiliser (local, remote, ...) * @return */ @@ -382,7 +425,7 @@ /** * @return le dictionnaire des tags par defaut d'une simulation a partir * de la propriete {@link Option#DEFAULT_TAG_VALUE} - * @see Option#DEFAULT_TAG_VALUE_PROPERTY_KEY + * @see Option#DEFAULT_TAG_VALUE */ public Map<String, String> getDefaultTagValueAsMap() { Map<String, String> result = new HashMap<String, String>(); @@ -570,12 +613,22 @@ SIMULATOR_CLASSFILE("simulator.classfile", _("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".localDefault", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), - SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".localSubDefault", _("isisfish.config.main.localSubSimulator.description"), SubProcessSimulationLauncher.class.getName()), + SIMULATOR_LAUNCHER_SUB(SimulationService.SIMULATION_LAUNCHER + ".subDefault", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), + SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".remoteDefault", _("isisfish.config.main.remoteSimulator.description"), SshSimulatorLauncher.class.getName()), SIMULATOR_SERVER("simulation.server", _("isisfish.config.main.simulationServer.description"), "http://simulateur.ifremer.fr:9090"), /** le login a utiliser pour les launcher distant, le type du launcher est ajouter a la cle (car 1 login par launcher) */ SIMULATOR_USER_NAME("simulator.username", _("isisfish.config.main.login.description"), "anonymous"), SIMULATOR_PASSWORD("simulator.password", _("isisfish.config.main.password.description"), "guest"), + + /** Serveur accessible par ssh : address */ + SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor.ifremer.fr:22"), + /** Serveur accessible par ssh : login */ + SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.login.description"), "isisfish"), + /** Serveur accessible par ssh : password */ + SIMULATOR_SSH_PASSWORD("simulation.ssh.password", _("isisfish.config.main.simulation.ssh.password.description"), ""), + /** Serveur accessible par ssh : cle privee */ + SIMULATOR_SSH_PRIVATEKEY("simulation.ssh.privatekey", _("isisfish.config.main.simulation.ssh.privatekey.description"), getUserHome() + File.separator + ".ssh" + File.separator + "id_rsa"), LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), // REGION_MAP("regionMap", _("isisfish.config.main.regionMap.description"), "maps"), Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncher.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncher.java 2008-11-28 17:04:51 UTC (rev 1637) @@ -0,0 +1,499 @@ +/* *##% + * Copyright (C) 2008 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.simulator.launcher; + +import static org.codelutin.i18n.I18n._; + +import java.awt.Container; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.rmi.RemoteException; + +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPasswordField; +import javax.swing.JTextField; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.ChannelExec; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; +import com.jcraft.jsch.UIKeyboardInteractive; +import com.jcraft.jsch.UserInfo; + +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationControl; +import fr.ifremer.isisfish.simulator.SimulationException; + +/** + * Use a remote simulation server. + * + * Upload zip simulation file on server and launch + * simulation on that file. + * + * Isis-Fish must be installed on remote server. + * + * Scp code using jsch is taken from : + * http://www.jcraft.com/jsch/examples/ScpTo.java + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 18 nov. 2008 $ + * By : $Author: chatellier $ + */ +public class SshSimulatorLauncher implements SimulatorLauncher { + + /** Class logger */ + protected static Log log = LogFactory.getLog(SshSimulatorLauncher.class); + + protected class MyUserInfo implements UserInfo, UIKeyboardInteractive { + + protected String passphrase; + protected JTextField passphraseField = new JPasswordField(20); + protected String passwd; + protected JTextField passwordField = new JPasswordField(20); + + /** + * Constructor. + */ + public MyUserInfo() { + this(null); + } + + /** + * Constructor with password. + * + * @param passwd password + */ + public MyUserInfo(String passwd) { + this.passwd = passwd; + } + + public boolean promptYesNo(String str) { + log.debug("promptYesNo"); + Object[] options = { "yes", "no" }; + int foo = JOptionPane.showOptionDialog(null, str, "Warning", + JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, + null, options, options[0]); + return foo == 0; + } + + public String getPassphrase() { + log.debug("getPassphrase"); + return passphrase; + } + + public boolean promptPassphrase(String message) { + log.debug("promptPassphrase"); + Object[] ob = { passphraseField }; + int result = JOptionPane.showConfirmDialog(null, ob, message, + JOptionPane.OK_CANCEL_OPTION); + boolean bResult = false; + if (result == JOptionPane.OK_OPTION) { + passphrase = passphraseField.getText(); + bResult = true; + } + return bResult; + } + + public String getPassword() { + log.debug("getPassword"); + return passwd; + } + + public boolean promptPassword(String message) { + log.debug("promptPassword"); + Object[] ob = { passwordField }; + int result = JOptionPane.showConfirmDialog(null, ob, message, + JOptionPane.OK_CANCEL_OPTION); + boolean bResult = false; + if (result == JOptionPane.OK_OPTION) { + passwd = passwordField.getText(); + bResult = true; + } + return bResult; + } + + public void showMessage(String message) { + JOptionPane.showMessageDialog(null, message); + } + + public String[] promptKeyboardInteractive(String destination, + String name, String instruction, String[] prompt, boolean[] echo) { + log.debug("promptKeyboardInteractive"); + final GridBagConstraints gbc = new GridBagConstraints(0, 0, 1, 1, 1, 1, + GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0); + Container panel = new JPanel(); + panel.setLayout(new GridBagLayout()); + + gbc.weightx = 1.0; + gbc.gridwidth = GridBagConstraints.REMAINDER; + gbc.gridx = 0; + panel.add(new JLabel(instruction), gbc); + gbc.gridy++; + + gbc.gridwidth = GridBagConstraints.RELATIVE; + + JTextField[] texts = new JTextField[prompt.length]; + for (int i = 0; i < prompt.length; i++) { + gbc.fill = GridBagConstraints.NONE; + gbc.gridx = 0; + gbc.weightx = 1; + panel.add(new JLabel(prompt[i]), gbc); + + gbc.gridx = 1; + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.weighty = 1; + if (echo[i]) { + texts[i] = new JTextField(20); + } else { + texts[i] = new JPasswordField(20); + } + panel.add(texts[i], gbc); + gbc.gridy++; + } + + String[] response = null; + if (JOptionPane.showConfirmDialog(null, panel, destination + ": " + + name, JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) { + response = new String[prompt.length]; + for (int i = 0; i < prompt.length; i++) { + response[i] = texts[i].getText(); + } + } + // else = cancel + return response; + } + + } + + /* + * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#maxSimulationThread() + */ + @Override + public int maxSimulationThread() { + return 1; + } + + /* + * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#simulate(fr.ifremer.isisfish.simulator.launcher.SimulationService, fr.ifremer.isisfish.simulator.SimulationControl, java.io.File) + */ + @Override + public SimulationStorage simulate(SimulationService simulationService, + SimulationControl control, File simulationZip) + throws RemoteException { + + // start ssh session + try { + Session sshSession = openSSHSession(); + + // upload simulation on server + String remotePath = uploadSimulation(sshSession, simulationZip); + + // si l'upload a fonctionné + if(remotePath != null) { + launchSimulation(sshSession, simulationService, control, remotePath); + } + } catch (JSchException e) { + if(log.isErrorEnabled()) { + log.error(_("isisfish.error.simulation.remote.global")); + } + } + + + + return null; + } + + /** + * Connect to remote server throw SSH, and return session. + * + * @return valid opened session + * + * @throws JSchException + */ + protected Session openSSHSession() throws JSchException { + + JSch jsch = new JSch(); + + // add ssh key + File sshKey = new File(IsisFish.config.getSimulatorSshPrivateKey()); + if(sshKey.canRead()) { + jsch.addIdentity(sshKey.getAbsolutePath()); + } + + // extract connection infos + String host = IsisFish.config.getSimulatorSshServer(); + String username = IsisFish.config.getSimulatorSshUsername(); + String password = IsisFish.config.getSimulatorSshPassword(); + int port = 22; // by default, 22 + + if(host.indexOf(':') > 0) { + String sPort = host.substring(host.indexOf(':') + 1); + try { + port = Integer.parseInt(sPort); + } + catch(NumberFormatException e) { + if(log.isWarnEnabled()) { + log.warn(_("isisfish.error.simulation.remote.wrongportvalue", sPort)); + } + } + host = host.substring(0, host.indexOf(':')); + } + + Session session = jsch.getSession(username, host, port); + + // username and password will be given via UserInfo interface. + UserInfo ui = new MyUserInfo(password); + session.setUserInfo(ui); + session.connect(60000); + + return session; + } + + /** + * Close ssh session. + * + * @param session + */ + protected void closeSSHSession(Session session) { + session.disconnect(); + } + + /** + * Upload simulation file to server. + * + * @param session already open valid ssh session + * @param simulationFile simulation file to upload + * + * @return remote file path or <tt>null</tt> if errors + */ + protected String uploadSimulation(Session session, File simulationFile) { + + // return flag + String remotePath = null; + + // file info + String filePath = simulationFile.getAbsolutePath(); + + FileInputStream fis = null; + try { + + // exec 'scp -t rfile' remotely + String command = "scp -p -t " + filePath; + Channel channel = session.openChannel("exec"); + ((ChannelExec) channel).setCommand(command); + + // get I/O streams for remote scp + OutputStream out = channel.getOutputStream(); + InputStream in = channel.getInputStream(); + + channel.connect(); + + // Check input stream validity + if (checkAck(in) == 0) { + + if (log.isDebugEnabled()) { + log.debug("Uploading " + filePath); + } + + // send "C0644 filesize filename", where filename should not include '/' + long filesize = (new File(filePath)).length(); + command = "C0644 " + filesize + " "; + if (filePath.lastIndexOf('/') > 0) { + command += filePath + .substring(filePath.lastIndexOf('/') + 1); + } else { + command += filePath; + } + command += "\n"; + out.write(command.getBytes()); + out.flush(); + + if (checkAck(in) == 0) { + + // send a content of lfile + fis = new FileInputStream(filePath); + byte[] buf = new byte[1024]; + while (true) { + int len = fis.read(buf, 0, buf.length); + if (len <= 0) { + break; + } + out.write(buf, 0, len); //out.flush(); + } + fis.close(); + fis = null; + // send '\0' + buf[0] = 0; + out.write(buf, 0, 1); + out.flush(); + if (checkAck(in) == 0) { + remotePath = filePath; + } + out.close(); + + channel.disconnect(); + } + } + + } catch (JSchException e) { + if (log.isErrorEnabled()) { + log.error(_("isisfish.error.simulation.remote.upload", + filePath)); + } + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error(_("isisfish.error.simulation.remote.upload", + filePath)); + } + } + finally { + try{ + if(fis!=null) { + fis.close(); + } + }catch(IOException e) { + // exception ignoree + } + } + + return remotePath; + } + + /** + * Check input stream validity. + * + * @param in input stream + */ + protected int checkAck(InputStream in) throws IOException { + int b = in.read(); + // b may be 0 for success, + // 1 for error, + // 2 for fatal error, + // -1 + if (b == 0) { + return b; + } + if (b == -1) { + return b; + } + + if (b == 1 || b == 2) { + StringBuffer sb = new StringBuffer(); + int c; + do { + c = in.read(); + sb.append((char) c); + } while (c != '\n'); + if (b == 1) { // error + if(log.isErrorEnabled()) { + log.error(_("isisfish.error.simulation.remote.upload.stream",sb.toString())); + } + } + if (b == 2) { // fatal error + if(log.isFatalEnabled()) { + log.fatal(_("isisfish.error.simulation.remote.upload.stream",sb.toString())); + } + } + } + return b; + } + + /** + * Launch simulation on remote server. + * + * @param session opened ssh session + * @param simulationService + * @param control + * @param remotePath + * @throws JSchException + */ + protected void launchSimulation(Session session, SimulationService simulationService, SimulationControl control, String remotePath) throws JSchException { + + String simulationId = control.getId(); + + // remote launch command + String command = "java -jar isis-fish/isis-fish.jar"; + // no ui + command += " --option launch.ui false"; + // start simulation + command += " --simulateWithSimulation " + simulationId + " \"" + remotePath + "\""; + + if(log.isDebugEnabled()) { + log.debug("Launch : " + command); + } + + Channel channel = session.openChannel("exec"); + ((ChannelExec) channel).setCommand(command); + + channel.setInputStream(null); + + try { + InputStream in = channel.getInputStream(); + + channel.connect(); + + byte[] tmp = new byte[1024]; + while (true) { + while (in.available() > 0) { + int i = in.read(tmp, 0, 1024); + if (i < 0) + break; + if(log.isInfoEnabled()) { + log.info(new String(tmp, 0, i)); + } + } + if (channel.isClosed()) { + if(log.isInfoEnabled()) { + log.info("exit-status: " + channel.getExitStatus()); + } + break; + } + try { + Thread.sleep(1000); + } catch (Exception ee) { + } + } + channel.disconnect(); + } catch (IOException e) { + throw new SimulationException(_("isisfish.error.simulation.remote.launch"), e); + } + } + + @Override + public String toString() { + return _("isisfish.simulator.launcher.remote"); + } +}

1 0

r1636 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 17:04:21 +0000 (Fri, 28 Nov 2008) New Revision: 1636 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx Log: Update i18n translation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2008-11-28 16:58:36 UTC (rev 1635) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2008-11-28 17:04:21 UTC (rev 1636) @@ -368,17 +368,17 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JLabel text='First age = minimal age'/> + <JLabel text='isisfish.wizardGroupCreation.firstAgeHelp'/> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JLabel text='Last age = maximal age'/> + <JLabel text='isisfish.wizardGroupCreation.lastAgeHelp'/> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JLabel text='gap between to group is 1 year.'/> + <JLabel text='isisfish.wizardGroupCreation.gapBetweenGroupsHelp'/> </cell> </row> </Table> @@ -428,7 +428,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JLabel text="A semicolon ';' must separe maximal length of each group"/> + <JLabel text="isisfish.wizardGroupCreation.maxGroupsLengthHelp"/> </cell> </row> </Table> @@ -464,17 +464,17 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JLabel text='First length = minimal length of first group'/> + <JLabel text='isisfish.wizardGroupCreation.firstLengthHelp'/> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JLabel text='number of Group = number of group wanted'/> + <JLabel text='isisfish.wizardGroupCreation.groupNumberHelp'/> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JLabel text='Group width = width of group'/> + <JLabel text='isisfish.wizardGroupCreation.groupWidthHelp'/> </cell> </row> </Table>

1 0

r1635 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 16:58:36 +0000 (Fri, 28 Nov 2008) New Revision: 1635 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java Log: Format and comment code Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java 2008-11-28 16:57:45 UTC (rev 1634) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java 2008-11-28 16:58:36 UTC (rev 1635) @@ -23,15 +23,16 @@ import java.util.AbstractQueue; import java.util.Collection; import java.util.Comparator; +import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.PriorityQueue; +import java.util.Queue; +import java.util.SortedSet; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /////////////////////////////////////////////////////////////////////////// @@ -44,7 +45,7 @@ * because PriorityBlockingQueue use private field for ReentrantLock :( * * @author poussin - * @param E + * @param <E> element in queue */ public class JDKPriorityBlockingQueue<E> extends AbstractQueue<E> implements BlockingQueue<E>, java.io.Serializable {

1 0

r1634 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 16:57:45 +0000 (Fri, 28 Nov 2008) New Revision: 1634 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update and clean i18n properties files Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-28 16:18:07 UTC (rev 1633) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-28 16:57:45 UTC (rev 1634) @@ -1,13 +1,6 @@ -\ maximal\ age= -\ minimal\ age= -\ minimal\ length\ of\ first\ group= -\ number\ of\ group\ wanted= -\ width\ of\ group= -A\ semicolon\ ';'\ must\ separe\ maximal\ length\ of\ each\ group= Add\ to\ %s\ queue= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= -Auto\ Launch= Can''t\ evaluate\ simulation\ prescript= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s Can't\ add\ simulation\:\ = @@ -17,7 +10,6 @@ Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= -Can't\ evaluate\ simulation\ prescript=Can't evaluate simulation prescript Can't\ export\ simulation\ %s= Can't\ get\ address\ on\ serveur\ of\ local\ repository= Can't\ get\ changlog= @@ -33,23 +25,18 @@ Can't\ start\ simulation,\ bad\ id\:\ %s= Can't\ update\ file\ that\ not\ in\ local\ repository= Check\ state\ of\ local\ repository\:\ %s= -Checkout\ pom.xml\ to\ %1$s= Checkout\ pom.xml\ to\ %s= Clear\ done\ jobs= Connection\ to\ serveur\ available,\ switch\ on\ line\:\ %s= Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s= Error\ during\ vcs\ initialisation= -First\ age\ = -First\ length\ = Generate\ next\ simulation= -Group\ width\ = Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= Import\ zipped\ file\ containing\ all\ scripts\ directory\ structure= Indiquez\ vos\ modifications= Info=Info Jobs\ submited\ is\ not\ ItemSimulation\ but\ was\ %s= -Last\ age\ = Last\ entry\ was\ %s\ extract\ name\ %s= Launcher\ %s\ will\ be\ stopped\ because\ there\ are\ too\ many\ error\ (%s)= Local\ repository\ don't\ exist= @@ -60,13 +47,11 @@ Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= Protocol\ to\ access\ repository\ script\ has\ changed.\\n= -Region\ %1$s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ allready\ exist\ in\ repository.\ Cant\ import= Region\ %s\ already\ inited= Rename\ data\ directory\ to\ %s= Show\ help= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= -Stop\ simulation= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= Stop\ the\ process= SubProcess\ start\:\ %s\ %s= @@ -77,7 +62,6 @@ The\ equation\ used\ is\ the\ population's\ growth\ curve,\ it\ needs\ to\ be\ defined\ first.= Use\ branches,\ switch\ not\ needed= User\ stop\ simulation\ %s= -View\ log= You\ don't\ use\ correction\ repository\ script\ for= Your\ database\ repository\:\ %s\\n\ don't\ use\ correct= Your\ repository\ is\ not\ up\ to\ date.\\n= @@ -96,34 +80,27 @@ file\ %s\ is\ not\ on\ server= file\ %s\ status\ is\ (l\:%s/r\:%s)= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -gap\ between\ to\ group\ is\ 1\ year.= -in\ Process= isisfish.about.site=http\://isisfish.labs.libre-entreprise.org - by B.Poussin isisfish.about.text=Isis-Fish Simulator isisfish.about.title=About Isis-Fish... isisfish.advancedParameters.title=advanced Parameters isisfish.advancedParams.freeParameters= isisfish.advancedParams.libLevelLogger=libLevelLogger -isisfish.advancedParams.localSimulation=local Simulation isisfish.advancedParams.scriptLevelLogger=scriptLevelLogger isisfish.advancedParams.simulLevelLogger=simulLevelLogger isisfish.advancedParams.simulationCache=cache simulation isisfish.advancedParams.simulationStatistique=static simulation isisfish.advancedParams.simulatorUse=simulator to Use -isisfish.advancedParams.subProcessSimulation= isisfish.cell.comments=comments isisfish.cell.land=land isisfish.cell.latitude=latitude isisfish.cell.longitude=longitude isisfish.cell.name=name -isisfish.cell.title=title isisfish.change.equation=Can't change equation isisfish.common.add=add isisfish.common.add.short=add short -isisfish.common.addQueue=addQueue isisfish.common.alert=alert isisfish.common.apply=apply -isisfish.common.blabla=blabla isisfish.common.blank= isisfish.common.cancel=cancel isisfish.common.check=check @@ -134,7 +111,6 @@ isisfish.common.emigration=emigration isisfish.common.empty=vide isisfish.common.error=error -isisfish.common.file=File isisfish.common.finish=finish isisfish.common.gear=gear isisfish.common.immigration=immigration @@ -144,7 +120,6 @@ isisfish.common.new=new isisfish.common.newMatrix=new Matrix isisfish.common.next=next -isisfish.common.no=No isisfish.common.ok=ok isisfish.common.openEditor=openEditor isisfish.common.populationGroup=populationGroup @@ -171,32 +146,8 @@ isisfish.common.warn=warn isisfish.common.year=annee isisfish.common.zone=zone -isisfish.config.h2.description= -isisfish.config.h2.h2BytecodeProvider.description= -isisfish.config.h2.h2CurrentSessionContextClass.description= -isisfish.config.h2.h2Dialect.description= -isisfish.config.h2.h2Driver.description= -isisfish.config.h2.h2MemBytecodeProvider.description= -isisfish.config.h2.h2MemDialect.description= -isisfish.config.h2.h2MemDriver.description= -isisfish.config.h2.h2MemPass.description= -isisfish.config.h2.h2MemType.description= -isisfish.config.h2.h2MemURL.description= -isisfish.config.h2.h2MemUser.description= -isisfish.config.h2.h2Pass.description= -isisfish.config.h2.h2Type.description= -isisfish.config.h2.h2URL.description= -isisfish.config.h2.h2User.description= -isisfish.config.h2.migrationApplicationVersion.description= -isisfish.config.h2.migrationCallBackhandlers.description= -isisfish.config.h2.migrationModelNames.description= -isisfish.config.h2.migrationPreviousMappingDirectory.description= -isisfish.config.h2.migrationTopiaService.description= -isisfish.config.h2.storageData.description= -isisfish.config.h2.updateschemaDatabase.description= isisfish.config.main.compileDirectory.description= isisfish.config.main.configFileName.description= -isisfish.config.main.dataBackupFilename.description= isisfish.config.main.defaultBackupDirectory.description= isisfish.config.main.defaultExportDirectory.description= isisfish.config.main.defaultExportNames.description= @@ -204,31 +155,28 @@ isisfish.config.main.defaultResultNames.description= isisfish.config.main.defaultSimulator.description= isisfish.config.main.defaultTagValue.description= -isisfish.config.main.description= isisfish.config.main.encoding.description=encoding used on system isisfish.config.main.javadocURL.description= isisfish.config.main.launchUI.description= isisfish.config.main.localSimulator.description= -isisfish.config.main.localSubSimulator.description= isisfish.config.main.locale.description=user locale isisfish.config.main.login.description= isisfish.config.main.password.description= isisfish.config.main.projectName.description=name of project isisfish.config.main.regionMap.description= +isisfish.config.main.remoteSimulator.description= isisfish.config.main.resultExport.description= -isisfish.config.main.simulationInformationFilename.description= -isisfish.config.main.simulationParametersFilename.description= -isisfish.config.main.simulationReportMail.description= -isisfish.config.main.simulationResultXmlFilename.description= +isisfish.config.main.simulation.ssh.login.description= +isisfish.config.main.simulation.ssh.password.description= +isisfish.config.main.simulation.ssh.privatekey.description= +isisfish.config.main.simulation.ssh.server.description= isisfish.config.main.simulationServer.description= isisfish.config.main.simulationShowOnlyError.description= isisfish.config.main.simulationShowOnlyQueue.description= isisfish.config.main.smtpServer.description= +isisfish.config.main.subSimulator.description= isisfish.config.main.userMail.description= isisfish.config.main.userName.description= -isisfish.config.main.version.description= -isisfish.config.vcs.databaseVersion.description= -isisfish.config.vcs.description= isisfish.config.vcs.hostName.description= isisfish.config.vcs.keyFile.description= isisfish.config.vcs.localDatabasePath.description= @@ -265,26 +213,20 @@ isisfish.equation.editor.title=Equation Editor isisfish.error.acceptable.population=New value isn't acceptable value for this population isisfish.error.add.card=Error while adding of result to the map. -isisfish.error.add.file=Can't add file %1$s isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation isisfish.error.add.result.data=Error while adding result ot data. isisfish.error.add.result.graph=Error while adding result to graph isisfish.error.add.tray=Can't add system tray icon isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation -isisfish.error.check.region=Can't check region -isisfish.error.checkout.module=Can't checkout module %1$s -isisfish.error.commit.files=Can't commit files %1$s isisfish.error.compile.script=Can't compile script\: %1$s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class -isisfish.error.connect.server=Can't connect to server isisfish.error.conversion.data=Erreur lors de la conversion du fichier de donn\u00E9es isisfish.error.create.equation=Can't create equation isisfish.error.delete.database=Can't delete database isisfish.error.delete.file=could not delete file %1$s isisfish.error.delete.vcs.files=Can't delete vcs files isisfish.error.during.simulation=Error during simulation -isisfish.error.during.simulation.information.file=Could not save Error during simulation of %1$s in his information file isisfish.error.emigration.negative=emigration negative isisfish.error.empty.code.rubbin=rubbin's code is empty isisfish.error.empty.emigration=emigration empty @@ -304,28 +246,19 @@ isisfish.error.emty.migration=Migration empty isisfish.error.equation.retun.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s -isisfish.error.evaluate.plan.script=Can't evaluate plan script -isisfish.error.evaluate.preplan.script=Can't evaluate preplan script isisfish.error.evalute.plan.script=Can't evaluate plan script -isisfish.error.export.scripts.force=The export file %1$s already exists, you MUST use option [force] pour force overwrite. isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion -isisfish.error.get.information.file=Can't get information on file {0] -isisfish.error.get.status.files=Can't get status files\: %1$s isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative isisfish.error.import.convertible=Erreur lors de l'import, la version du fichier que vous souhaitez importer n'est pas transformable en une version importable. isisfish.error.import.file=Can't import file %1$s isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus r\u00E9cente que la version souhait\u00E9e. -isisfish.error.import.scripts.force=Some files already exist, you MUST use option [force] pour force overwrite. isisfish.error.init.map=Can't init map. isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s isisfish.error.instanciate=Can't instanciate %1$s isisfish.error.instanciate.export=Can't instanciate export %1$s isisfish.error.integer.positif=Your input must be a positif integer (>1) -isisfish.error.invalid.category.name=The category's name %1$s is not valid. -isisfish.error.invalid.configuration=Configuration is not full, could not launch IsisFish, try again ? -isisfish.error.invalid.configuration.title=Error while loading IsisFish isisfish.error.invalid.costs.fix=les co\u00FBts fixes sont invalides isisfish.error.invalid.distribution.recruitment=distribution de recrutement invalide isisfish.error.invalid.equation=Equation invalid @@ -336,12 +269,8 @@ isisfish.error.invalid.natural.death=natural mortality on classes naissantes invalide isisfish.error.invalid.number=the number is invalid isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable -isisfish.error.invalid.simulation.id=Invalid simulation id %1$s, availables \: %2$s -isisfish.error.invalid.simulation.index=Invalid simulation index %1$s -isisfish.error.invalid.simulation.index.availables=Invalid simulation index %1$s, availables \: %2$s isisfish.error.invalid.values.params=Parametre controlable hors valeurs possibles isisfish.error.invalidate.natural.death=natural mortality invalid -isisfish.error.invalide.simulation.index=Invalide simulation index isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s @@ -359,19 +288,15 @@ isisfish.error.no.select.simulation=could not select simulation isisfish.error.no.selected.simulation=No Simulation selected isisfish.error.no.target.species=no target species in %1$s for %2$s -isisfish.error.not.connected=Error \: not connected -isisfish.error.not.find.status=could not find status for file %1$s for reason %2$s isisfish.error.not.found.class=this class does not isisfish.error.not.found.code=could not found codeclass for %1$s isisfish.error.not.found.description=could not found description for %1$s isisfish.error.not.found.field=could not found field %1$s doc for %1$s isisfish.error.not.found.field.class=could not found field %1$s for class %2$s -isisfish.error.not.found.species.population.container=Can't find species (%1$s) for Population container isisfish.error.not.null.class.grown=classe mature vaut nul isisfish.error.not.null.mean.weight=poids moyen nul isisfish.error.not.null.natiral.death=natural mortality null isisfish.error.not.possible.metier=Pas de m\u00E9tier possible -isisfish.error.not.species.node.population.container=Population container not in Species node isisfish.error.not.support.class=this class does not support isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.obtain.analyseplan=Can't obtain description of AnalysePlan @@ -380,7 +305,6 @@ isisfish.error.obtain.doc.rule=Can't obtain description for a Rule class isisfish.error.obtain.field=Can't obtain field @Doc for Rule %1$s isisfish.error.obtain.field.analyseplan=Can't obtain field @Doc for AnalysePlan %1$s -isisfish.error.obtain.information.file=could not obtain information file for simulation %1$s isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison isisfish.error.parse.date=Can't parse date %1$s @@ -393,37 +317,31 @@ isisfish.error.region.already.exists=This region already exists isisfish.error.region.name.empty=Region name is empty isisfish.error.remove.directory=Can't remove directory %1$s -isisfish.error.remove.file=Can't remove file %1$s 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.region=Can't save region isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s -isisfish.error.script.check=Can't check file %1$s for reason %2$s -isisfish.error.script.commit=Can't commit file %1$s for reason %2$s 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.diff=Can't diff file %1$s for reason %2$s -isisfish.error.script.evaluate=Can't evaluate file %1$s for reason %2$s -isisfish.error.script.export=Can't export for reason %1$s isisfish.error.script.import=Can't import file for reason %1$s isisfish.error.script.load=Can't load file %1$s for reason %2$s isisfish.error.script.save=Can't save file %1$s for reason %2$s -isisfish.error.script.update=Can't update file %1$s for reason %2$s isisfish.error.simulation.log.openAppender=could not open appender of simulation %1$s for reason %2$s +isisfish.error.simulation.remote.global=Can't launch a simulation on remote server +isisfish.error.simulation.remote.launch=An error occurs when launching remote simulation +isisfish.error.simulation.remote.upload=Can't upload simulation %s on %s@%s +isisfish.error.simulation.remote.upload.stream=Stream error detected \: %s +isisfish.error.simulation.remote.wrongportvalue=Connection port value is incorrect \: %s isisfish.error.simulation.resultXml.close=Can't close simulation result XML for reason %1$s isisfish.error.simulation.resultXml.open=Can't open simulation result XML for reason %1$s isisfish.error.simulation.resultXml.write=Can't write simulation result XML for reason %1$s isisfish.error.source.parameter=Can't get parameter from source -isisfish.error.start=Can't start -isisfish.error.status.files=Can't get status files\: %1$s isisfish.error.strategy.order=Strategy %1$s don't have 12 StrategyMonthInfo but %2$s. Recreate them -isisfish.error.text=The follow error occur during action -isisfish.error.title=Error isisfish.error.undefined.classes=No classes defined isisfish.error.undefined.correspondence.zones.reproduction.recruitment=pas de correspondance entre les zones de reproduction et les zones de recrutement isisfish.error.undefined.gear=The engin is not defined -isisfish.error.undefined.mesh=No maille definied +isisfish.error.undefined.mesh=No mesh defined isisfish.error.undefined.mesh.sector=No maille defined in sector isisfish.error.undefined.meta.population=No population defined isisfish.error.undefined.natural.death=No natural mortality on classes naissantes @@ -434,22 +352,15 @@ isisfish.error.undefined.zone.recruitment=No recrutment's zone defined isisfish.error.undefined.zone.reproduction=No reprodution's zone defined isisfish.error.unsupported.equation.langage=unsupported langage '%1$s' for equation\: %2$s -isisfish.error.update.file=Can't update file '%1$s' -isisfish.error.update.repository=Can't update local repository -isisfish.error.vcs.connect=could not connect to vcs server, check the configuration... or contact us for help -isisfish.error.vcs.no.anonymous.connection= -isisfish.error.vcs.no.ssh.connection=could not connect with ssh configuration user %1$s, private key %2$s -isisfish.error.vcs.pre.migrate=While migration, could not backup your old database %1$s for reason %2$s, a new database will be created at location %3$s. isisfish.error.wait.simThread=Can't wait SimThread -isisfish.error.while.simulation=error while simulation %1$s isisfish.error.write.simulation=Can't write information %1$s isisfish.exit.text=Something has change, please enter a comment isisfish.exit.title=Exit isisfish.export.directory=Export directory isisfish.export.title=Results export -isisfish.filter=isisfish.filter -isisfish.filter.apply=filter.apply -isisfish.filter.cancel=filter.cancel +isisfish.filter=Filter +isisfish.filter.apply=Apply filter +isisfish.filter.cancel=Cancel isisfish.filter.log.levelDebug=Debug isisfish.filter.log.levelError=Error isisfish.filter.log.levelFatal=Fatal @@ -462,10 +373,10 @@ isisfish.filter.log.tooltip.levelInfo=Info isisfish.filter.log.tooltip.levelTrace=Trace isisfish.filter.log.tooltip.levelWarn=Warn -isisfish.filter.log.tooltip.message=filter.log.tooltip.message -isisfish.filter.reset=filter.reset -isisfish.filter.result=filter.result -isisfish.filter.result2= +isisfish.filter.log.tooltip.message=Enter a term to search and press Enter +isisfish.filter.reset=Reset +isisfish.filter.result=Results +isisfish.filter.result.found=Results (%d/%d) isisfish.filter.select=filter.select isisfish.filter.select.simulation=select.simulation isisfish.filter.simulation=filter.simulation @@ -495,7 +406,7 @@ isisfish.filter.simulation.useOptimization=filter.simulation.useOptimization isisfish.filter.simulation.usePreScript=filter.simulation.usePreScript isisfish.filter.simulation.useStatistic=filter.simulation.useStatistic -isisfish.fisheryRegion.addMap=AddMap +isisfish.fisheryRegion.addMap=Add map isisfish.fisheryRegion.area=Fishery area boundaries isisfish.fisheryRegion.comments=Comments isisfish.fisheryRegion.delMap=Delete map @@ -508,13 +419,12 @@ isisfish.fisheryRegion.name=Region name isisfish.fisheryRegion.ofCells=of cells (option) isisfish.fisheryRegion.selectFile=Select a file -isisfish.fisheryRegion.spatial=Spatial Resolution -isisfish.fisheryRegion.title=inputFisheryRegion +isisfish.fisheryRegion.spatial=Spatial resolution isisfish.gear.comments=Comments isisfish.gear.effortUnit=Effort Unit isisfish.gear.name=Name isisfish.gear.rangeValues=Range of values -isisfish.gear.standardisationFactor=Standardisation Factor +isisfish.gear.standardisationFactor=Standardisation factor isisfish.gear.technicalParameter=Technical parameter isisfish.gear.title=Gear isisfish.graphBean.graph.render=Choose a graph render @@ -551,15 +461,11 @@ isisfish.input.continueStrategies=Continue to Strategies isisfish.input.continueTripTypes=Continue to TripTypes isisfish.input.continueVesselTypes=Continue to VesselTypes -isisfish.input.continueZones=Continue to Zones -isisfish.input.menu.about=About +isisfish.input.continueZones=Continue to zones isisfish.input.menu.addRegion=Add region -isisfish.input.menu.close=Close isisfish.input.menu.commit=Commit change isisfish.input.menu.copyRegion=Copy Region isisfish.input.menu.exportRegion=Export Region -isisfish.input.menu.file=File -isisfish.input.menu.help=Help isisfish.input.menu.importRegion=Import Region isisfish.input.menu.importRegionSimulation=Import Region from simulation isisfish.input.menu.importRegionV2=Import Region from v2 @@ -569,29 +475,18 @@ isisfish.input.menu.server=Server isisfish.input.newRegion=New region isisfish.input.selectNodeTree=Select node in tree -isisfish.input.title=Fishery Input +isisfish.input.title=Fishery input isisfish.launch.anonymous=read only isisfish.launch.debugMode=debug mode isisfish.launch.email=email -isisfish.launch.find.public.key=Public ssh key (*.pub) associated with the required private key -isisfish.launch.first=First launch type vcs %1$s - version %2$s isisfish.launch.firstname=firstname -isisfish.launch.howto.save.key=Howto register your public ssh key in labs isisfish.launch.init.done=init done in %1$s. isisfish.launch.lasstname=lasstname -isisfish.launch.save.key=Goto to labs for register your ssh public key isisfish.launch.server.authenticationMethod=server access isisfish.launch.server.login=server login -isisfish.launch.server.ssh.confirm.change.method=Changing authentication method requires a migration at next launch, confirm this action. -isisfish.launch.server.ssh.confirm.overwrite.key=Ssh key %1$s already exists, confirm to overwrite. isisfish.launch.server.ssh.confirm.passphrase=confirm passphrase isisfish.launch.server.ssh.key.change=Change your ssh key -isisfish.launch.server.ssh.key.clipboard=Your public key was copied in clipboard isisfish.launch.server.ssh.key.generate=Generate ssh key -isisfish.launch.server.ssh.key.generate.error=An error occurs while generating ssh key %1$s (%2$s) -isisfish.launch.server.ssh.key.generate.succes=The ssh key %1$s was generated with success. Do you want to register it to labs ? -isisfish.launch.server.ssh.key.no.key=No ssh key found or your have not selected ssh authentication method, really wants to go to labs ? -isisfish.launch.server.ssh.key.register=Register your public ssh key in labs. isisfish.launch.server.ssh.no.passphrase=no passphrase isisfish.launch.server.ssh.passphrase=passphrase isisfish.launch.server.ssh.privateKeyFile=private ssh key @@ -617,19 +512,12 @@ isisfish.log.tooltip.mailTo=Enter destination adress isisfish.log.tooltip.sendAll=Send the complete simulation archive, or just the log file isisfish.log.tooltip.sendMail=Click here to send the email with files -isisfish.message.add.cvs=Add from %1$s files %2$s. isisfish.message.add.objets.simulation=Add new objets simulation -isisfish.message.add.queue=%1$s added to queue simulation -isisfish.message.add.queue.remote=%1$s added to remote queue simulation isisfish.message.backup.database.finished=backup database finished isisfish.message.backup.database.progress=backup database in progress isisfish.message.cancel.finished=Cancel finished isisfish.message.check.finished=check finished -isisfish.message.check.region=Check region ... -isisfish.message.checking.cell=Checking cell isisfish.message.choose.archive=choose archive file or directory -isisfish.message.comment.region.modification=Enter comment about your region modification -isisfish.message.commit=Commit the change isisfish.message.commit.cancelled=commit cancelled isisfish.message.commit.finished=commit finished isisfish.message.commit.region.canceled=Commit region canceled @@ -640,7 +528,6 @@ isisfish.message.confirm.remove.script=Do you want to remove script ? '%1$s' isisfish.message.copy.finished=Copy finished isisfish.message.copy.region=Copy region to %1$s -isisfish.message.copy.revision=Working copy initialize fine... Revision \: [ %1$s - %2$s ] isisfish.message.create.region.canceled=Create region canceled isisfish.message.creating.region=Creating region %1$s isisfish.message.creation.done=creation done %1$s @@ -651,25 +538,16 @@ isisfish.message.delete.finished=delete finished isisfish.message.delete.object=To delete object %1$s, all next object will be deleted\\n\\n isisfish.message.diff.finished=file in state %1$s -isisfish.message.directory.not.exists=Parent directory of file %1$s does not exists, Do you want to create it ? isisfish.message.evaluation.finished=evaluation finished -isisfish.message.export.cancelled=export cancelled isisfish.message.export.done=export done -isisfish.message.export.path.tozip=toZip %1$s -isisfish.message.export.result=zip %1$s file(s) in %2$s (size %3$s) -isisfish.message.export.scripts.file=Export scripts to file %1$s isisfish.message.export.zip=Export to zip file %1$s -isisfish.message.file.already.exists=File %1$s already exists, Do you want to overwrite it ? isisfish.message.file.overwrite=File exists, do you want overwrite it ? isisfish.message.import=Import %1$s isisfish.message.import.finished=Import finished isisfish.message.import.region.name=Enter name for imported region isisfish.message.import.region.xml=XMLed Region isisfish.message.import.region.zipped=Zipped Region -isisfish.message.import.scripts.file=Import scripts from file %1$s isisfish.message.import.scripts.file.cancelled=Import scripts cancelled -isisfish.message.import.scripts.file.done=Import scripts done -isisfish.message.import.scripts.zipped=Zipped Scripts isisfish.message.import.xml.v2.file\ =Import xml v2 file isisfish.message.import.zip=Import zip file isisfish.message.load.finished=load finished @@ -690,21 +568,15 @@ isisfish.message.region.remove.canceled=Region remove canceled isisfish.message.region.removed=Region removed isisfish.message.remove.canceled=Remove canceled -isisfish.message.remove.files=Remove files %1$s. isisfish.message.remove.finished=Remove finished -isisfish.message.remove.unnecessary.cells=Remove unnecessary cells isisfish.message.removing.region=Removing region %1$s ... isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion isisfish.message.save.finished=save finished isisfish.message.saveModel.finished=Save model finished -isisfish.message.search.data=Search data ... isisfish.message.setting.cache.aspects=Setting Cache aspects isisfish.message.setting.trace.aspects=Setting Trace aspects isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution -isisfish.message.spacialized.visualisation=Spacialized visualisation -isisfish.message.stop.with.error=stop with error %1$s -isisfish.message.synchronize.done=synchronize done. isisfish.message.tray.disabled=SystemTray disabled isisfish.message.update.finished=update finished isisfish.metier.comments=Comments @@ -723,9 +595,6 @@ isisfish.metierSeasonInfoZone.season=Season isisfish.metierSeasonInfoZone.selectSeason=Select a season isisfish.metierSeasonInfoZone.title=Seasons / Zones -isisfish.migration.cvs.description=Migrate from CVS to SVN [v %1$s] -isisfish.migration.svn.protocol.description=Migrate from SVN [v %1$s - %2$s] to SVN [v %3$s - %4$s] -isisfish.migration.svn.version.description=Migrate from SVN [v %1$s - %2$s] to SVN [v %3$s - %4$s] isisfish.monitor.title=Application Monitor isisfish.month.april=april isisfish.month.august=august @@ -740,27 +609,6 @@ isisfish.month.october=october isisfish.month.september=september isisfish.notitle=\ -isisfish.option.description.addScript= -isisfish.option.description.changeConfig= -isisfish.option.description.changeFileConfig= -isisfish.option.description.createSshKey= -isisfish.option.description.editConfig= -isisfish.option.description.exportData= -isisfish.option.description.exportScript= -isisfish.option.description.help= -isisfish.option.description.helpConfig= -isisfish.option.description.import= -isisfish.option.description.importAndRenameRegion= -isisfish.option.description.list= -isisfish.option.description.mavenFile= -isisfish.option.description.resetConfig= -isisfish.option.description.showConfig= -isisfish.option.description.simulate= -isisfish.option.description.sshKeyFile= -isisfish.option.description.ui= -isisfish.option.description.update= -isisfish.option.description.vcsAddRemove= -isisfish.option.description.vcsUpdateCommitState= isisfish.params.changeLogLev=Change from level '%1$s' to level '%2$s' isisfish.params.clearFilter=Clear filter isisfish.params.description=Description @@ -829,15 +677,11 @@ isisfish.populationMigration.useEquation=Use equation isisfish.populationMigrationEmigration.coefficient=Coefficient isisfish.populationMigrationEmigration.departureZone=Departure Zone -isisfish.populationMigrationEmigration.title=inputPopulationMigrationEmigration -isisfish.populationMigrationEquation.title=inputPopulationMigrationEquation isisfish.populationMigrationImmigration.arrivalZone=Arrival Zone isisfish.populationMigrationImmigration.coefficient=Coefficient -isisfish.populationMigrationImmigration.title=inputPopulationMigrationImmigration isisfish.populationMigrationMigration.arrivalZone=Arrival Zone isisfish.populationMigrationMigration.coefficient=Coefficient isisfish.populationMigrationMigration.departureZone=Departure Zone -isisfish.populationMigrationMigration.title=inputPopulationMigrationMigration isisfish.populationRecruitment.comments=Comments isisfish.populationRecruitment.recruitmentDistribution=Recruitment Distribution isisfish.populationRecruitment.reproductionEquation=ReproductionEquation @@ -851,15 +695,10 @@ isisfish.populationSeasonInfo.migration=Migration isisfish.populationSeasonInfo.months=Months isisfish.populationSeasonInfo.toString=%1$s season %2$s-%3$s -isisfish.populationSeasons.Reproduction=Reproduction isisfish.populationSeasons.changeGroup=Change of group isisfish.populationSeasons.comments=Comments -isisfish.populationSeasons.computeCoefficient=Compute Coefficient isisfish.populationSeasons.distributionSpawning=Distribution of spawning -isisfish.populationSeasons.noSpacialized=No spacialized isisfish.populationSeasons.selectSeason=Select a season -isisfish.populationSeasons.showSpacialized=Show spacialized -isisfish.populationSeasons.spacialized=Spacialized isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Match between spawning and recruitment areas isisfish.populationZones.selectPopulationAreas=Select the population areas @@ -869,15 +708,10 @@ isisfish.port.cell=Port cell isisfish.port.comments=Comments isisfish.port.name=Name -isisfish.port.title=inputPort isisfish.preScript.backParameter=Back to parameter tab isisfish.preScript.title=Pre simulation script -isisfish.preScripts.title= -isisfish.queue.cancelled=cancelled isisfish.queue.id=id isisfish.queue.launcher=Simulation launcher -isisfish.queue.local=Local -isisfish.queue.name=Queue isisfish.queue.plan=Plan isisfish.queue.progression=Progression isisfish.queue.showLog=Show simulation log @@ -955,9 +789,7 @@ isisfish.script.import.labelOverwrite=labelOverwrite isisfish.script.import.ok=ok isisfish.script.import.tooltip.checkAll= -isisfish.script.menu.about=About isisfish.script.menu.checkSyntax=CheckSyntax -isisfish.script.menu.close=Close isisfish.script.menu.code=Code isisfish.script.menu.commit=Commit script to server isisfish.script.menu.copy=Copy @@ -989,13 +821,11 @@ isisfish.script.save=Save isisfish.script.title=Script Editor isisfish.script.txtExport=txtExport -isisfish.script.update=Update isisfish.season.toString=season %1$s-%2$s isisfish.selectivity.equation=Equation isisfish.selectivity.selectPopulation=Select a population isisfish.selectivity.title=Selectivity isisfish.sens.backParameter=Back to parameter tab -isisfish.sens.planParameters=Plan's parameters isisfish.sens.title=Sensibility analysis isisfish.sensWizardPanels.add=Add isisfish.sensWizardPanels.clear=Clear @@ -1007,7 +837,6 @@ isisfish.sensWizardPanels.remove=Remove isisfish.sensWizardPanels.scripts=Scripts List isisfish.sensWizardPanels.selectType=Select the type to add -isisfish.sensWizardPanels.title=wizpnl isisfish.sensWizardPanels.type=Type isisfish.sensWizardPanels.up=Up isisfish.sensWizardPanels.validate=Validate @@ -1028,14 +857,10 @@ isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12 isisfish.simulation.log.console.title=Log console for simulation '%1$s' isisfish.simulation.log.showConsole=display log console for simulation %1$s -isisfish.simulation.menu.about=About -isisfish.simulation.menu.close=Close -isisfish.simulation.menu.file=File -isisfish.simulation.menu.help=Help isisfish.simulation.name=Simulation name -isisfish.simulation.title=Simulation Launcher -isisfish.simulationQueue.title=Simulation Queue +isisfish.simulation.title=Simulation launcher isisfish.simulator.launcher.inprocess=in current process +isisfish.simulator.launcher.remote=on remote server isisfish.simulator.launcher.subprocess=in subprocess isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=age @@ -1046,7 +871,6 @@ isisfish.species.rubbinCode=Rubbin code isisfish.species.scientificName=Scientific name isisfish.species.structured=structured -isisfish.species.title=inputSpecies isisfish.strategy.comments=Comments isisfish.strategy.inactivity= isisfish.strategy.inactivityEquationUsed= @@ -1067,16 +891,12 @@ isisfish.tripType.duration=Duration isisfish.tripType.minTime=Minimum time between trips isisfish.tripType.name=Name -isisfish.tripType.title=inputTripType isisfish.vcs.ask.passphrase=Enter your pass phrase (if your private key have one). isisfish.vcs.ask.passphrase.title=Ask your pass phrase isisfish.vcs.commit=vcs.commit isisfish.vcs.commit.cancel=vcs.commit.cancel isisfish.vcs.commit.label=vcs.commit.label isisfish.vcs.commit.ok=vcs.commit.ok -isisfish.vcs.config.title=Vcs configuration Modifier -isisfish.vcs.configuration.title=VCS server configuration -isisfish.vcs.migrate.end=Migration done in %1$ss.<br/>New database in is located at [%2$s] isisfish.vcs.update=vcs.update isisfish.vcs.update.cancel=cancel isisfish.vcs.update.checkAll=checkAll @@ -1112,7 +932,6 @@ isisfish.vesselType.miniCrew=Minimum crew size isisfish.vesselType.name=Name isisfish.vesselType.speed=Speed -isisfish.vesselType.title=inputVesselType isisfish.welcome.menu.about=About isisfish.welcome.menu.close=Close isisfish.welcome.menu.configuration=Configuration @@ -1132,11 +951,18 @@ isisfish.wizardGroupCreation.allValues=Input all the values isisfish.wizardGroupCreation.computedGrowthCurve=Computed by a growth curve isisfish.wizardGroupCreation.firstAge=First age +isisfish.wizardGroupCreation.firstAgeHelp=First age \= minimal age isisfish.wizardGroupCreation.firstGroup=First group isisfish.wizardGroupCreation.firstLength=First length +isisfish.wizardGroupCreation.firstLengthHelp=First length \= minimal length of first group +isisfish.wizardGroupCreation.gapBetweenGroupsHelp=gap between to group is 1 year. +isisfish.wizardGroupCreation.groupNumberHelp=number of Group \= number of group wanted isisfish.wizardGroupCreation.groupWidth=Group width +isisfish.wizardGroupCreation.groupWidthHelp=Group width \= width of group isisfish.wizardGroupCreation.lastAge=Last age +isisfish.wizardGroupCreation.lastAgeHelp=Last age \= maximal age isisfish.wizardGroupCreation.maxGroupsLength=Maximal groups length +isisfish.wizardGroupCreation.maxGroupsLengthHelp=A semicolon ';' must separe maximal length of each group isisfish.wizardGroupCreation.numberGroup=Number of group isisfish.wizardGroupCreation.numberGroups=Number of groups isisfish.wizardGroupCreation.populationCharacteristics=Input the population characteristics @@ -1146,48 +972,11 @@ isisfish.zone.cells=Zone cells isisfish.zone.comments=Comments isisfish.zone.name=Name -isisfish.zone.title=inputZone -lutinutil.common.action=Action -lutinutil.common.file=File -lutinutil.common.logDiff=show diff -lutinutil.common.module=Module -lutinutil.common.rev=Revision -lutinutil.common.select=Select -lutinutil.error.checkout.dir=Can't checkout dir %1$s -lutinutil.error.fieldmodel.already.registred=FieldAccess [%1$s] is already registred -lutinutil.error.fieldmodel.not.registred=could not found a matching entry in cache for [%1$s] -lutinutil.error.fieldmodel.unmatchin.options=you can not defined a such model with no the same number of optionClass and optionNames -lutinutil.error.init.config=config is not init, you should invoke on the config validate(true) method to validate it and finish his init %1$s -lutinutil.error.init.no.config=should invoke %1$s\#init(VCSType,Properties) before required instance. -lutinutil.vcs.action.add=add -lutinutil.vcs.action.changeLog=changeLog -lutinutil.vcs.action.checkout=checkout -lutinutil.vcs.action.commit=commit -lutinutil.vcs.action.delete=delete -lutinutil.vcs.action.diff=diff -lutinutil.vcs.action.overwriteAndUpdate=overwriteAndUpdate -lutinutil.vcs.action.revert=revert -lutinutil.vcs.action.update=update -lutinutil.vcs.state.missing=missing -lutinutil.vcs.state.modified=modified -lutinutil.vcs.state.outofdate=outofdate -lutinutil.vcs.state.outofdateAndModified=outofdateAndModified -lutinutil.vcs.state.unknown=unknown -lutinutil.vcs.state.unversionned=unversionned -lutinutil.vcs.state.unversionnedOrMissing=unversionnedOrMissing -lutinutil.vcs.state.uptodate=uptodate -msg= -no\ properties\ found\ or\ unsafe\ properties\ found\ %1$s=no properties found or unsafe properties found %1$s not\ started= -number\ of\ Group\ = region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= repository\ host\ change\ from\ %s\ to\ %s= repository\ protocol\ change\ from\ %s\ to\ %s= repository\ user\ change\ from\ %s\ to\ %s= simulate\ %s\ with\ file\ %s= status\ for\ %s\ is\ %s= -strategyMonthInfo.getNumberOfTrips().toString()= -the\ property\ %1$s\ is\ mandatory\ but\ missed.=the property %1$s is mandatory but missed. to\ revision\ %d= -to\ use\ ssh\ authentication\ mode,\ you\ must\ have\ a\ username.\ %1$s.=to use ssh authentication mode, you must have a username. %1$s. -to\ use\ ssh\ authentication\ mode,\ you\ must\ have\ an\ existing\ private\ key\ %1$s\ \:\ %2$s.=to use ssh authentication mode, you must have an existing private key %1$s \: %2$s. Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-28 16:18:07 UTC (rev 1633) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-28 16:57:45 UTC (rev 1634) @@ -1,13 +1,6 @@ -\ maximal\ age= -\ minimal\ age= -\ minimal\ length\ of\ first\ group= -\ number\ of\ group\ wanted= -\ width\ of\ group= -A\ semicolon\ ';'\ must\ separe\ maximal\ length\ of\ each\ group= Add\ to\ %s\ queue= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= -Auto\ Launch= Can''t\ evaluate\ simulation\ prescript= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s Can't\ add\ simulation\:\ = @@ -17,7 +10,6 @@ Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= -Can't\ evaluate\ simulation\ prescript=Can't evaluate simulation prescript Can't\ export\ simulation\ %s= Can't\ get\ address\ on\ serveur\ of\ local\ repository= Can't\ get\ changlog=Impossible d'obtenir de changelog @@ -33,23 +25,18 @@ Can't\ start\ simulation,\ bad\ id\:\ %s= Can't\ update\ file\ that\ not\ in\ local\ repository=Impossible de mettre \u00E0 jour un fichier hors du d\u00E9p\u00F4t Check\ state\ of\ local\ repository\:\ %s= -Checkout\ pom.xml\ to\ %1$s= Checkout\ pom.xml\ to\ %s= Clear\ done\ jobs= Connection\ to\ serveur\ available,\ switch\ on\ line\:\ %s= Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s= Error\ during\ vcs\ initialisation= -First\ age\ = -First\ length\ = Generate\ next\ simulation= -Group\ width\ = Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= Import\ zipped\ file\ containing\ all\ scripts\ directory\ structure= Indiquez\ vos\ modifications= Info=Info Jobs\ submited\ is\ not\ ItemSimulation\ but\ was\ %s= -Last\ age\ = Last\ entry\ was\ %s\ extract\ name\ %s= Launcher\ %s\ will\ be\ stopped\ because\ there\ are\ too\ many\ error\ (%s)= Local\ repository\ don't\ exist= @@ -60,13 +47,11 @@ Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= Protocol\ to\ access\ repository\ script\ has\ changed.\\n= -Region\ %1$s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ allready\ exist\ in\ repository.\ Cant\ import= Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e Rename\ data\ directory\ to\ %s= Show\ help= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= -Stop\ simulation= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= Stop\ the\ process= SubProcess\ start\:\ %s\ %s= @@ -77,7 +62,6 @@ The\ equation\ used\ is\ the\ population's\ growth\ curve,\ it\ needs\ to\ be\ defined\ first.= Use\ branches,\ switch\ not\ needed= User\ stop\ simulation\ %s= -View\ log= You\ don't\ use\ correction\ repository\ script\ for= Your\ database\ repository\:\ %s\\n\ don't\ use\ correct= Your\ repository\ is\ not\ up\ to\ date.\\n= @@ -96,34 +80,27 @@ file\ %s\ is\ not\ on\ server=Le fichier %s n'est pas pr\u00E9sent sur le serveur file\ %s\ status\ is\ (l\:%s/r\:%s)=Le fichier %s a pour statut (l\:%s/d\:%s) filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -gap\ between\ to\ group\ is\ 1\ year.= -in\ Process= isisfish.about.site=http\://isisfish.labs.libre-entreprise.org - par B.Poussin isisfish.about.text=Simulateur Isis-Fish isisfish.about.title=A propos de Isis-Fish... isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s isisfish.advancedParams.freeParameters=Param\u00E8tres libres isisfish.advancedParams.libLevelLogger=Niveau de tracage des librairies -isisfish.advancedParams.localSimulation=Simulation locale isisfish.advancedParams.scriptLevelLogger=Niveau de tracage des scripts isisfish.advancedParams.simulLevelLogger=Niveau de tracage du simulateur isisfish.advancedParams.simulationCache=Simulation cache isisfish.advancedParams.simulationStatistique=Simulation statistique isisfish.advancedParams.simulatorUse=Simulateur \u00E0 utiliser -isisfish.advancedParams.subProcessSimulation= isisfish.cell.comments=Commentaires isisfish.cell.land=Land isisfish.cell.latitude=Latitude isisfish.cell.longitude=Longitude isisfish.cell.name=Nom -isisfish.cell.title=Saisie des mailles isisfish.change.equation=Ne peut pas changer l'\u00E9quation isisfish.common.add=Ajouter isisfish.common.add.short=isisfish.common.add.short -isisfish.common.addQueue=Ajouter \u00E0 la queue des simulations isisfish.common.alert=alerte isisfish.common.apply=Appliquer -isisfish.common.blabla=blabla isisfish.common.blank= isisfish.common.cancel=Annuler isisfish.common.check=V\u00E9rifier @@ -134,7 +111,6 @@ isisfish.common.emigration=\u00E9migration isisfish.common.empty=vide isisfish.common.error=Erreur -isisfish.common.file=Fichier isisfish.common.finish=Terminer isisfish.common.gear=Engin isisfish.common.immigration=immigration @@ -144,7 +120,6 @@ isisfish.common.new=Nouveau isisfish.common.newMatrix=Nouvelle matrice isisfish.common.next=Suivant -isisfish.common.no=No isisfish.common.ok=Ok isisfish.common.openEditor=Ouvrir l'\u00E9diteur isisfish.common.populationGroup=Groupe de population @@ -171,32 +146,8 @@ isisfish.common.warn=Warn isisfish.common.year=ann\u00E9e isisfish.common.zone=Zone -isisfish.config.h2.description=La configuration h2 utilis\u00E9e -isisfish.config.h2.h2BytecodeProvider.description=TODO -isisfish.config.h2.h2CurrentSessionContextClass.description=TODO -isisfish.config.h2.h2Dialect.description=TODO -isisfish.config.h2.h2Driver.description=TODO -isisfish.config.h2.h2MemBytecodeProvider.description=TODO -isisfish.config.h2.h2MemDialect.description=TODO -isisfish.config.h2.h2MemDriver.description=TODO -isisfish.config.h2.h2MemPass.description=TODO -isisfish.config.h2.h2MemType.description=TODO -isisfish.config.h2.h2MemURL.description=TODO -isisfish.config.h2.h2MemUser.description=TODO -isisfish.config.h2.h2Pass.description=TODO -isisfish.config.h2.h2Type.description=TODO -isisfish.config.h2.h2URL.description=TODO -isisfish.config.h2.h2User.description=TODO -isisfish.config.h2.migrationApplicationVersion.description=TODO -isisfish.config.h2.migrationCallBackhandlers.description=TODO -isisfish.config.h2.migrationModelNames.description=TODO -isisfish.config.h2.migrationPreviousMappingDirectory.description=TODO -isisfish.config.h2.migrationTopiaService.description=TODO -isisfish.config.h2.storageData.description=le nom du r\u00E9pertoire o\u00F9 stocker les donn\u00E9es d'un data storage (r\u00E9gion, simulation) -isisfish.config.h2.updateschemaDatabase.description=flag pour indiquer s'il faut ou non updater le sch\u00E9ma de la base isisfish.config.main.compileDirectory.description=le r\u00E9pertoire o\u00F9 sont compil\u00E9s les scripts isisfish.config.main.configFileName.description=le fichier de configuration \u00E0 utiliser -isisfish.config.main.dataBackupFilename.description=le nom du fichier contenant la d\u00E9finition d'un data storage (r\u00E9gion, simulation) isisfish.config.main.defaultBackupDirectory.description=le r\u00E9pertoire o\u00F9 stocker les backups des donn\u00E9es isisfish.config.main.defaultExportDirectory.description=le r\u00E9pertoire o\u00F9 exporter les r\u00E9sultats des simulations isisfish.config.main.defaultExportNames.description=les noms des exports \u00E0 effectuer apr\u00E8s une simulation @@ -204,31 +155,28 @@ isisfish.config.main.defaultResultNames.description=les noms des r\u00E9sultats \u00E0 traiter apr\u00E8s une simulation isisfish.config.main.defaultSimulator.description=le nom du simulateur par d\u00E9faut \u00E0 utiliser lors d'une simulation isisfish.config.main.defaultTagValue.description=TODO -isisfish.config.main.description=La configuration principale d'IsisFish isisfish.config.main.encoding.description=l'encoding du syst\u00E8me isisfish.config.main.javadocURL.description=l'url de la javadoc des scripts isisfish.config.main.launchUI.description= isisfish.config.main.localSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement -isisfish.config.main.localSubSimulator.description= isisfish.config.main.locale.description=la locale utilisateur isisfish.config.main.login.description=le login pour se connecter au serveur de simulations distant isisfish.config.main.password.description=le mot de passe pour se connecter au serveur de simulations distant isisfish.config.main.projectName.description=le nom du projet isisfish.config.main.regionMap.description=le nom du r\u00E9pertoire contenant les maps d'une r\u00E9gion +isisfish.config.main.remoteSimulator.description=lance les simulations sur un serveur distant isisfish.config.main.resultExport.description=TODO -isisfish.config.main.simulationInformationFilename.description=le nom du fichier d'informations d'une simulation -isisfish.config.main.simulationParametersFilename.description=le nom du fichier de param\u00E9trage d'une simulation -isisfish.config.main.simulationReportMail.description=Le courriel \u00E0 utiliser pour envoyer les rapports de simulation -isisfish.config.main.simulationResultXmlFilename.description=le nom du fichier d'export des r\u00E9sultats d'une simulation au format xml +isisfish.config.main.simulation.ssh.login.description= +isisfish.config.main.simulation.ssh.password.description= +isisfish.config.main.simulation.ssh.privatekey.description= +isisfish.config.main.simulation.ssh.server.description= isisfish.config.main.simulationServer.description=l'url du serveur de simulations distant isisfish.config.main.simulationShowOnlyError.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles avec erreur isisfish.config.main.simulationShowOnlyQueue.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles effectu\u00E9es localement isisfish.config.main.smtpServer.description=le nom du serveur smpt \u00E0 utiliser pour envoyer les courriels +isisfish.config.main.subSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement dans un sous process isisfish.config.main.userMail.description=le courriel de l'utilisateur isisfish.config.main.userName.description=le nom - pr\u00E9nom de l'utilisateur -isisfish.config.main.version.description=la version d'IsisFish -isisfish.config.vcs.databaseVersion.description=la version de des donn\u00E9es \u00E0 utiliser -isisfish.config.vcs.description=La configuration vcs d'IsisFish isisfish.config.vcs.hostName.description=le nom du serveur vcs \u00E0 utiliser isisfish.config.vcs.keyFile.description=le chemin complet du fichier de clef priv\u00E9e ssh2 \u00E0 utiliser lors d'une connexion s\u00E9curis\u00E9e isisfish.config.vcs.localDatabasePath.description= @@ -265,26 +213,20 @@ isisfish.equation.editor.title=Editeur d'\u00E9quation isisfish.error.acceptable.population=New value isn't acceptable value for this population isisfish.error.add.card=Erreur lors de l'ajout du r\u00E9sultat \u00E0 la carte. -isisfish.error.add.file=Can't add file %1$s isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation isisfish.error.add.result.data=Erreur lors de l'ajout du r\u00E9sultat au data. isisfish.error.add.result.graph=Erreur lors de l'ajout du r\u00E9sultat au graph. isisfish.error.add.tray=Impossible d'ajouter une icone de notification isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation -isisfish.error.check.region=Can't check region -isisfish.error.checkout.module=Can't checkout module %1$s -isisfish.error.commit.files=Can't commit files %1$s isisfish.error.compile.script=Can't compile script\: %1$s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class -isisfish.error.connect.server=Can't connect to server isisfish.error.conversion.data=Erreur lors de la conversion du fichier de donn\u00E9es isisfish.error.create.equation=Can't create equation isisfish.error.delete.database=Can't delete database isisfish.error.delete.file=could not delete file %1$s isisfish.error.delete.vcs.files=Can't delete vcs files isisfish.error.during.simulation=Error during simulation -isisfish.error.during.simulation.information.file=Could not save Error during simulation of %1$s in his information file isisfish.error.emigration.negative=emigration negative isisfish.error.empty.code.rubbin=le code rubbin est vide isisfish.error.empty.emigration=emigration vide @@ -304,28 +246,19 @@ isisfish.error.emty.migration=Migration vide isisfish.error.equation.retun.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s -isisfish.error.evaluate.plan.script=Can't evaluate plan script -isisfish.error.evaluate.preplan.script=Can't evaluate preplan script isisfish.error.evalute.plan.script=Can't evaluate plan script -isisfish.error.export.scripts.force=Le fichier d'export %1$s existe d\u00E9j\u00E9, vous devez utiliser l'option [force] pour forcer l'\u00E9crasement. isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion -isisfish.error.get.information.file=Can't get information on file {0] -isisfish.error.get.status.files=Can't get status files\: %1$s isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative isisfish.error.import.convertible=Erreur lors de l'import, la version du fichier que vous souhaitez importer n'est pas transformable en une version importable. isisfish.error.import.file=Can't import file %1$s isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus r\u00E9cente que la version souhait\u00E9e. -isisfish.error.import.scripts.force=Certains fichiers existent, vous devez utiliser l'option [force] pour forcer l'\u00E9crasement. isisfish.error.init.map=Can't init map. isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s isisfish.error.instanciate=Can't instanciate %1$s isisfish.error.instanciate.export=Can't instanciate export %1$s isisfish.error.integer.positif=Your input must be a positif integer (>1) -isisfish.error.invalid.category.name=Le nom de la cat\u00E9gorie %1$s n'est pas valide. -isisfish.error.invalid.configuration=la configuration n'est pas valide, modifier la configuration ? -isisfish.error.invalid.configuration.title=Erreur de chargement de la configuration isisfish.error.invalid.costs.fix=les co\u00FBts fixes sont invalides isisfish.error.invalid.distribution.recruitment=distribution de recrutement invalide isisfish.error.invalid.equation=Equation invalide @@ -336,12 +269,8 @@ isisfish.error.invalid.natural.death=mortalit\u00E9 naturelle sur les classes naissantes invalide isisfish.error.invalid.number=le nombre est invalide isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable -isisfish.error.invalid.simulation.id=Invalid simulation id %1$s, availables \: %2$s -isisfish.error.invalid.simulation.index=Invalid simulation index %1$s -isisfish.error.invalid.simulation.index.availables=Invalid simulation index %1$s, availables \: %2$s isisfish.error.invalid.values.params=Param\u00E8tre controlable hors valeurs possibles isisfish.error.invalidate.natural.death=mortalite naturelle invalide -isisfish.error.invalide.simulation.index=Invalide simulation index isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s @@ -359,19 +288,15 @@ isisfish.error.no.select.simulation=could not select simulation isisfish.error.no.selected.simulation=No Simulation selected isisfish.error.no.target.species=no target species in %1$s for %2$s -isisfish.error.not.connected=Erreur \u00E0 la connexion... -isisfish.error.not.find.status=n'a pas pu trouver le status du fichier %1$s pour la raison suivante \: %2$s isisfish.error.not.found.class=this class does not isisfish.error.not.found.code=could not found codeclass for %1$s isisfish.error.not.found.description=could not found description for %1$s isisfish.error.not.found.field=could not found field %1$s doc for %1$s isisfish.error.not.found.field.class=could not found field %1$s for class %2$s -isisfish.error.not.found.species.population.container=Can't find species (%1$s) for Population container isisfish.error.not.null.class.grown=classe mature vaut nul isisfish.error.not.null.mean.weight=poids moyen nul isisfish.error.not.null.natiral.death=mortalite naturelle nulle isisfish.error.not.possible.metier=Pas de m\u00E9tier possible -isisfish.error.not.species.node.population.container=Population container not in Species node isisfish.error.not.support.class=this class does not support isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.obtain.analyseplan=Can't obtain description of AnalysePlan @@ -380,7 +305,6 @@ isisfish.error.obtain.doc.rule=Can't obtain description for a Rule class isisfish.error.obtain.field=Can't obtain field @Doc for Rule %1$s isisfish.error.obtain.field.analyseplan=Can't obtain field @Doc for AnalysePlan %1$s -isisfish.error.obtain.information.file=could not obtain information file for simulation %1$s isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison isisfish.error.parse.date=Can't parse date %1$s @@ -393,33 +317,27 @@ isisfish.error.region.already.exists=Cette r\u00E9gion existe d\u00E9j\u00E0 isisfish.error.region.name.empty=Le nom de la R\u00E9gion est vide isisfish.error.remove.directory=Can't remove directory %1$s -isisfish.error.remove.file=Can't remove file %1$s 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.region=Can't save region isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s -isisfish.error.script.check=N'a pas pu compiler le fichier %1$s pour la raison suivante %2$s -isisfish.error.script.commit=N'a pas pu commiter le fichier %1$s pour la raison suivante %2$s 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.diff=N'a pas pu calculer le diff du fichier %1$s pour la raison suivante %2$s -isisfish.error.script.evaluate=N'a pas pu \u00E9valuer le fichier %1$s pour la raison suivante %2$s -isisfish.error.script.export=N'a pas pu exporter pour la raison suivante %1$s isisfish.error.script.import=N'a pas pu importer pour la raison suivante %1$s isisfish.error.script.load=N'a pas pu charger le fichier %1$s pour la raison suivante %2$s isisfish.error.script.save=N'a pas pu sauver le fichier %1$s pour la raison suivante %2$s -isisfish.error.script.update=N'a pas pu mettre \u00E0 jour le fichier %1$s pour la raison suivante %2$s isisfish.error.simulation.log.openAppender=n'a pas pu ouvrir l'appender de la simulation %1$s pour la raison %2$s +isisfish.error.simulation.remote.global=Impossible de lancer une simulation sur serveur distant +isisfish.error.simulation.remote.launch=Une erreur est survenue lors du lancement de la simulation +isisfish.error.simulation.remote.upload=Impossible d'envoyer la simulation %s sur %s@%s +isisfish.error.simulation.remote.upload.stream=Une erreur de flux a \u00E9t\u00E9 d\u00E9tect\u00E9e \: %s +isisfish.error.simulation.remote.wrongportvalue=Le port de connexion a une valeur incorrecte \: %s isisfish.error.simulation.resultXml.close=Can't close simulation result XML for reason %1$s isisfish.error.simulation.resultXml.open=Can't open simulation result XML for reason %1$s isisfish.error.simulation.resultXml.write=Can't write simulation result XML for reason %1$s isisfish.error.source.parameter=Can't get parameter from source -isisfish.error.start=Can't start -isisfish.error.status.files=Can't get status files\: %1$s isisfish.error.strategy.order=Strategy %1$s don't have 12 StrategyMonthInfo but %2$s. Recreate them -isisfish.error.text=The follow error occur during action -isisfish.error.title=Erreur isisfish.error.undefined.classes=pas de classes d\u00E9finies isisfish.error.undefined.correspondence.zones.reproduction.recruitment=pas de correspondance entre les zones de reproduction et les zones de recrutement isisfish.error.undefined.gear=l'engin n'est pas d\u00E9fini @@ -434,20 +352,13 @@ isisfish.error.undefined.zone.recruitment=il n'y a pas de zone de recrutement de d\u00E9finit isisfish.error.undefined.zone.reproduction=il n'y a pas de zone de reproduction de d\u00E9finit isisfish.error.unsupported.equation.langage=unsupported langage '%1$s' for equation\: %2$s -isisfish.error.update.file=Can't update file '%1$s' -isisfish.error.update.repository=Can't update local repository -isisfish.error.vcs.connect=Probl\u00E8me de connexion au serveur vcs, v\u00E9rifier votre configuration, ou contactez-nous si le probl\u00E8me persiste. -isisfish.error.vcs.no.anonymous.connection= -isisfish.error.vcs.no.ssh.connection=ne pas pu se connecter en utilisant la configuration ssh login %1$s, clef priv\u00E9e %2$s -isisfish.error.vcs.pre.migrate=pendant la migration, la sauvegarde de votre base %1$s n'a pas pu \u00EAtre effectu\u00E9e pour la raison suivante %2$s, une nouvelle base est cr\u00E9e ici %3$s. isisfish.error.wait.simThread=Can't wait SimThread -isisfish.error.while.simulation=error while simulation %1$s isisfish.error.write.simulation=Can't write information %1$s isisfish.exit.text=Quelque chose a chang\u00E9, merci de saisir un commentaire isisfish.exit.title=Exit isisfish.export.directory=Dossier d'export isisfish.export.title=Export des r\u00E9sultats -isisfish.filter=Filter +isisfish.filter=Filtrer isisfish.filter.apply=Appliquer le filtre isisfish.filter.cancel=Annuler isisfish.filter.log.levelDebug=debug @@ -465,11 +376,11 @@ isisfish.filter.log.tooltip.message=Entrer un terme \u00E0 rechercher et appuyer sur Entr\u00E9e isisfish.filter.reset=R\u00E9initialiser isisfish.filter.result=R\u00E9sultats -isisfish.filter.result2= +isisfish.filter.result.found=R\u00E9sultats (%d/%d) isisfish.filter.select=S\u00E9lectionner isisfish.filter.select.simulation=S\u00E9lectionner une simulation -isisfish.filter.simulation=Filter les simulations -isisfish.filter.simulation.analysePlanNumber=num\u00E9ro d"analyse +isisfish.filter.simulation=Filtrer les simulations +isisfish.filter.simulation.analysePlanNumber=num\u00E9ro d'analyse isisfish.filter.simulation.description=description isisfish.filter.simulation.local=locale isisfish.filter.simulation.numberOfYear=nombre d'ann\u00E9e(s) @@ -509,7 +420,6 @@ isisfish.fisheryRegion.ofCells=de mailles (option) isisfish.fisheryRegion.selectFile=S\u00E9lectionnez un fichier isisfish.fisheryRegion.spatial=R\u00E9solution spatiale -isisfish.fisheryRegion.title=Saisie des r\u00E9gions isisfish.gear.comments=Commentaires isisfish.gear.effortUnit=Unit\u00E9 d'effort isisfish.gear.name=Nom @@ -552,14 +462,10 @@ isisfish.input.continueTripTypes=Continuer vers les types de trajets isisfish.input.continueVesselTypes=Continuer vers les types de navires isisfish.input.continueZones=Continuer vers les zones -isisfish.input.menu.about=A propos isisfish.input.menu.addRegion=Ajouter une r\u00E9gion -isisfish.input.menu.close=Fermer isisfish.input.menu.commit=Sauvegarder les changements isisfish.input.menu.copyRegion=Copier r\u00E9gion isisfish.input.menu.exportRegion=Exporter la r\u00E9gion -isisfish.input.menu.file=Fichier -isisfish.input.menu.help=Aide isisfish.input.menu.importRegion=Importer une r\u00E9gion isisfish.input.menu.importRegionSimulation=Importer la r\u00E9gion d'une simulation isisfish.input.menu.importRegionV2=Importer une r\u00E9gion de la v2 d'IsisFish @@ -573,25 +479,14 @@ isisfish.launch.anonymous=lecture seule isisfish.launch.debugMode=debug mode isisfish.launch.email=courriel -isisfish.launch.find.public.key=Clef publique ssh (*.pub) associ\u00E9e \u00E0 la clef priv\u00E9e -isisfish.launch.first=Premier d\u00E9marrage type vcs %1$s - version %2$s isisfish.launch.firstname=nom -isisfish.launch.howto.save.key=Comment enregister sa clef publique ssh aupr\u00E8s du labs isisfish.launch.init.done=init done in %1$s. isisfish.launch.lasstname=pr\u00E9nom -isisfish.launch.save.key=Acc\u00E9der au labs pour enregister votre clef publique ssh isisfish.launch.server.authenticationMethod=droit d'acc\u00E8s au serveur isisfish.launch.server.login=nom utilisateur -isisfish.launch.server.ssh.confirm.change.method=Changer la m\u00E9thode d'authentification requi\u00E8re une migration de votre base au prochaine red\u00E9marrage, Confirmer cette action. -isisfish.launch.server.ssh.confirm.overwrite.key=Le clef %1$s existe d\u00E9j\u00E0, confirmer pour l'\u00E9craser. isisfish.launch.server.ssh.confirm.passphrase=confirmer la passphrase isisfish.launch.server.ssh.key.change=Changer la clef ssh -isisfish.launch.server.ssh.key.clipboard=Votre clef publique a \u00E9t\u00E9 copi\u00E9e dans le presse papier isisfish.launch.server.ssh.key.generate=G\u00E9n\u00E9rer la clef ssh -isisfish.launch.server.ssh.key.generate.error=La clef %1$s n'a pas \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9e. -isisfish.launch.server.ssh.key.generate.succes=Votre clef ssh %1$s a \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9e,il faut d\u00E9sormais l'enregistrer aupr\u00E8s du serveur lab. -isisfish.launch.server.ssh.key.no.key=Pas de clef ssh connu ou vous n'avez pas s\u00E9lectionn\u00E9 le mode SSH, voulez-vous quand meme continuer ? -isisfish.launch.server.ssh.key.register=Enregister votre clef publique ssh sur le serveur du labs isisfish.launch.server.ssh.no.passphrase=pas de passphrase isisfish.launch.server.ssh.passphrase=passphrase isisfish.launch.server.ssh.privateKeyFile=clef priv\u00E9e ssh @@ -617,19 +512,12 @@ isisfish.log.tooltip.mailTo=Entrer l'adresse du destinataire du courriel isisfish.log.tooltip.sendAll=Envoyer toute la simulation, ou uniquement le fichier de log isisfish.log.tooltip.sendMail=Cliquer pour envoyer le courriel contentant les fichiers -isisfish.message.add.cvs=Ajouter depuis %1$s fichiers %2$s. isisfish.message.add.objets.simulation=Add new objets simulation -isisfish.message.add.queue=%1$s ajout\u00E9e \u00E0 la queue de simulations -isisfish.message.add.queue.remote=%1$s ajout\u00E9 \u00E0 la queue de simulations distantes isisfish.message.backup.database.finished=backup database finished isisfish.message.backup.database.progress=backup database in progress isisfish.message.cancel.finished=Cancel finished isisfish.message.check.finished=v\u00E9rification termin\u00E9e -isisfish.message.check.region=Check region ... -isisfish.message.checking.cell=Checking cell isisfish.message.choose.archive=choose archive file or directory -isisfish.message.comment.region.modification=Entrer un commentaire sur la modification de la r\u00E9gion -isisfish.message.commit=Commiter les modifications isisfish.message.commit.cancelled=commit annul\u00E9 isisfish.message.commit.finished=commit termin\u00E9 isisfish.message.commit.region.canceled=Commit de la r\u00E9gion annul\u00E9 @@ -640,7 +528,6 @@ isisfish.message.confirm.remove.script=Voulez-vous vraiment supprimer le script ? '%1$s' isisfish.message.copy.finished=Copie termin\u00E9e isisfish.message.copy.region=Copier la r\u00E9gion vers %1$s -isisfish.message.copy.revision=Working copy initialize fine... Revision \: [ %1$s - %2$s ] isisfish.message.create.region.canceled=Creation de r\u00E9gion annul\u00E9e isisfish.message.creating.region=En train de cr\u00E9er la r\u00E9gion %1$s isisfish.message.creation.done=cr\u00E9ation termin\u00E9e %1$s @@ -651,25 +538,16 @@ isisfish.message.delete.finished=Suppression termin\u00E9e isisfish.message.delete.object=Pour supprimer l'objet %1$s, tous les objets suivant seront aussi supprim\u00E9s \\n\\n isisfish.message.diff.finished=fichier dans l'\u00E9tat %1$s -isisfish.message.directory.not.exists=Le r\u00E9pertoire parent de %1$s n'existe pas, Voulez-vous le cr\u00E9er ? isisfish.message.evaluation.finished=\u00E9valuation termin\u00E9e -isisfish.message.export.cancelled=Export annul\u00E9 isisfish.message.export.done=Export termin\u00E9 -isisfish.message.export.path.tozip=toZip %1$s -isisfish.message.export.result=zip %1$s fichier(s) dans l'archive %2$s (taille %3$s) -isisfish.message.export.scripts.file=Export vers le fichier %1$s isisfish.message.export.zip=Exporter dans le fichier zip %1$s -isisfish.message.file.already.exists=Le fichier existe %1$s d\u00E9j\u00E0, Voulez-vous l'\u00E9craser ? isisfish.message.file.overwrite=Le fichier existe, Voulez-vous l'\u00E9craser ? isisfish.message.import=Importer %1$s isisfish.message.import.finished=Import termin\u00E9 isisfish.message.import.region.name=Entre le nom de la r\u00E9egion \u00E0 importer isisfish.message.import.region.xml=Region XML (Isis-Fish V2.x) isisfish.message.import.region.zipped=Zipped Region -isisfish.message.import.scripts.file=Importation depuis le fichier %1$s isisfish.message.import.scripts.file.cancelled=Importation des scripts annul\u00E9 -isisfish.message.import.scripts.file.done=Importation des scripts termin\u00E9 -isisfish.message.import.scripts.zipped=Zipped Scripts isisfish.message.import.xml.v2.file\ =Import xml v2 file isisfish.message.import.zip=Import zip file isisfish.message.load.finished=Chargement termin\u00E9 @@ -690,21 +568,15 @@ isisfish.message.region.remove.canceled=Suppression de r\u00E9gion annul\u00E9 isisfish.message.region.removed=R\u00E9gion supprim\u00E9e isisfish.message.remove.canceled=Suppression annul\u00E9e -isisfish.message.remove.files=Suppresion des fichiers %1$s. isisfish.message.remove.finished=Suppresison termin\u00E9 -isisfish.message.remove.unnecessary.cells=Suppression de cellules no necessaires isisfish.message.removing.region=Suppression de lar\u00E9gion %1$s ... isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion isisfish.message.save.finished=sauvegarde termin\u00E9e isisfish.message.saveModel.finished=Sauvegarde du mod\u00E8le termin\u00E9e -isisfish.message.search.data=Recherche des donn\u00E9es ... isisfish.message.setting.cache.aspects=Mise en place des aspects Cache isisfish.message.setting.trace.aspects=Mise en place des aspects Trace isisfish.message.simulation.ended=Simulation termin\u00E9e isisfish.message.simulation.execution=Simulation execution -isisfish.message.spacialized.visualisation=Spacialized visualisation -isisfish.message.stop.with.error=stop with error %1$s -isisfish.message.synchronize.done=synchronize termin\u00E9e. isisfish.message.tray.disabled=Icone de notification d\u00E9sactiv\u00E9e isisfish.message.update.finished=update finished isisfish.metier.comments=Commentaires @@ -723,9 +595,6 @@ isisfish.metierSeasonInfoZone.season=Saison isisfish.metierSeasonInfoZone.selectSeason=S\u00E9lectionnez une saison isisfish.metierSeasonInfoZone.title=Seasons / Zones -isisfish.migration.cvs.description=Migrate de CVS vers SVN [v %1$s] -isisfish.migration.svn.protocol.description=Migration de SVN [v %1$s - %2$s] vers SVN [v %3$s - %4$s] -isisfish.migration.svn.version.description=Migration de SVN [v %1$s - %2$s] vers SVN [v %3$s - %4$s] isisfish.monitor.title=Application Monitor isisfish.month.april=avril isisfish.month.august=ao\u00FBt @@ -740,27 +609,6 @@ isisfish.month.october=octobre isisfish.month.september=september isisfish.notitle=\ -isisfish.option.description.addScript=ajoute un script d'un certain type (analyseplans|exports|formules\=type|rules|scripts|simulators) \u00E0 partir d'un fichier existant (file) (pour les formules il faut pr\u00E9ciser son type) -isisfish.option.description.changeConfig=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration [vcs] par la valeur **value**. -isisfish.option.description.changeFileConfig=le fichier de configuration utilis\u00E9 -isisfish.option.description.createSshKey=create key pair for vcs ssh access using vcs.ssh.keyFileproperty or the given (privateKeyFile), with a (force) argument to overwrite -isisfish.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration (main ou vcs) -isisfish.option.description.exportData=export dans un nouveau fichier **fileZip** une region, ou une simulation en stipulant son nom, utilisez **force** pour \u00E9craser une archive existante. -isisfish.option.description.exportScript=export dans un nouveau fichier (fileZip) des scripts d'un certain type **analyseplan|export|formule|rule|script|simulator** (pour les formules il faut fournir un **type**) avec possibilit\u00E9 d'effectuer un filtre **filter**, utilisez **force** pour \u00E9craser une archive existante. -isisfish.option.description.help=Show this help -isisfish.option.description.helpConfig=Show this help -isisfish.option.description.import=importe un fichier existant (fileZip) pr\u00E9c\u00E9demmentexport\u00E9 d'Isis (region, simulation ou script) -isisfish.option.description.importAndRenameRegion=import region from (regionFile) zip v3 file format and rename it (name) -isisfish.option.description.list=affiche la liste d'un certain type d'objects Isis (analyseplans|exports|formules|regions|rules|scripts|simulations|simulators)avec possibilit\u00E9 d'appliquer un filtre (filter) -isisfish.option.description.mavenFile=Checkout maven file from server (pom.xml) -isisfish.option.description.resetConfig=R\u00E9initialisation de la configuration. -isisfish.option.description.showConfig=Voir les d\u00E9tails d'une configuration -isisfish.option.description.simulate=lance une simulation \u00E0 partir de son nom (simulation-id) et en sp\u00E9cifiant le fichier de param\u00E8tres de simulation existant (file) -isisfish.option.description.sshKeyFile=change private ssh key file path in vcs configuration (vcs.ssh.keyFile) -isisfish.option.description.ui=launch or not user interface (value) -isisfish.option.description.update=update or not the local repository (value) -isisfish.option.description.vcsAddRemove=ajoute ou supprime du r\u00E9pository local un ensemble de fichiers existants (file) -isisfish.option.description.vcsUpdateCommitState=effectue une op\u00E9ration de communication avec le serveur distant (update|commit|state) avec possibilit\u00E9 de sp\u00E9cifier les fichiers cibles existants (file) isisfish.params.changeLogLev=Passe du niveau '%1$s' au niveau '%2$s' isisfish.params.clearFilter=Reset filtre isisfish.params.description=Description @@ -829,15 +677,11 @@ isisfish.populationMigration.useEquation=Utiliser l'\u00E9quation isisfish.populationMigrationEmigration.coefficient=Coefficient isisfish.populationMigrationEmigration.departureZone=Zone de d\u00E9part -isisfish.populationMigrationEmigration.title=Emigration -isisfish.populationMigrationEquation.title=Saisie des \u00E9quations de migration isisfish.populationMigrationImmigration.arrivalZone=Zone d'arriv\u00E9e isisfish.populationMigrationImmigration.coefficient=Coefficient -isisfish.populationMigrationImmigration.title=Immigration isisfish.populationMigrationMigration.arrivalZone=Zone d'arriv\u00E9e isisfish.populationMigrationMigration.coefficient=Coefficient isisfish.populationMigrationMigration.departureZone=Zone de d\u00E9part -isisfish.populationMigrationMigration.title=Saisie de la migration des populations isisfish.populationRecruitment.comments=Commentaires isisfish.populationRecruitment.recruitmentDistribution=Distribution du recrutement isisfish.populationRecruitment.reproductionEquation=Equation de reproduction @@ -851,15 +695,10 @@ isisfish.populationSeasonInfo.migration=Migration isisfish.populationSeasonInfo.months=Mois isisfish.populationSeasonInfo.toString=%1$s saison %2$s-%3$s -isisfish.populationSeasons.Reproduction=Reproduction isisfish.populationSeasons.changeGroup=Changement de groupe isisfish.populationSeasons.comments=Commentaires -isisfish.populationSeasons.computeCoefficient=Calculer le coefficient isisfish.populationSeasons.distributionSpawning=R\u00E9partition des apparitions -isisfish.populationSeasons.noSpacialized=Non spacialized isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison -isisfish.populationSeasons.showSpacialized=Voir les spacialized -isisfish.populationSeasons.spacialized=Sp\u00E9cialis\u00E9 isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Correspondance entre les zones d'apparitions et de recrutement isisfish.populationZones.selectPopulationAreas=S\u00E9lectionnez les zones des populations @@ -869,15 +708,10 @@ isisfish.port.cell=Maille du port isisfish.port.comments=Commentaires isisfish.port.name=Nom -isisfish.port.title=Saisie des ports isisfish.preScript.backParameter=Retour aux param\u00E8tres isisfish.preScript.title=Script de pr\u00E9-simulation -isisfish.preScripts.title= -isisfish.queue.cancelled=annul\u00E9 isisfish.queue.id=identifiant isisfish.queue.launcher=Lanceur de simulation -isisfish.queue.local=Locale -isisfish.queue.name=Queue isisfish.queue.plan=Plan isisfish.queue.progression=Progression isisfish.queue.showLog=Voir les logs de la simulation @@ -955,17 +789,15 @@ isisfish.script.import.labelOverwrite=Le(s) fichier(s) suivant(s) existe(nt) d\u00E9j\u00E0, Confirmer pour l'\u00E9crasement isisfish.script.import.ok=importer isisfish.script.import.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 importer -isisfish.script.menu.about=A propos isisfish.script.menu.checkSyntax=V\u00E9rifier la syntaxe -isisfish.script.menu.close=Fermer isisfish.script.menu.code=Code -isisfish.script.menu.commit=Commiter des scripts sur le server +isisfish.script.menu.commit=Commiter des scripts sur le serveur isisfish.script.menu.copy=Copier isisfish.script.menu.cut=Couper isisfish.script.menu.deleteLocaly=Supprimer localement isisfish.script.menu.deleteLocalyServer=Supprimer localement et sur le serveur isisfish.script.menu.diff=Voir les diff\u00E9rences avec la version du serveur -isisfish.script.menu.edit=Edit +isisfish.script.menu.edit=Edition isisfish.script.menu.evaluate=Evaluer isisfish.script.menu.file=Fichier isisfish.script.menu.new=Nouveau @@ -989,13 +821,11 @@ isisfish.script.save=Sauver isisfish.script.title=Editeur de scripts isisfish.script.txtExport=Exporter -isisfish.script.update=Mettre \u00E0 jour isisfish.season.toString=saison %1$s-%2$s isisfish.selectivity.equation=Equation isisfish.selectivity.selectPopulation=S\u00E9lectionnez une population isisfish.selectivity.title=S\u00E9lectivit\u00E9 isisfish.sens.backParameter=Retour aux param\u00E8tres -isisfish.sens.planParameters=Param\u00E8tres du Plan isisfish.sens.title=Analyse de sensibilit\u00E9 isisfish.sensWizardPanels.add=Ajouter isisfish.sensWizardPanels.clear=Effacer @@ -1007,7 +837,6 @@ isisfish.sensWizardPanels.remove=Supprimer isisfish.sensWizardPanels.scripts=Liste des scripts isisfish.sensWizardPanels.selectType=Selectionner le type \u00E0 ajouter -isisfish.sensWizardPanels.title=wizpnl isisfish.sensWizardPanels.type=Type isisfish.sensWizardPanels.up=Haut isisfish.sensWizardPanels.validate=Valider @@ -1028,14 +857,10 @@ isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12 isisfish.simulation.log.console.title=Console de log simulation '%1$s' isisfish.simulation.log.showConsole=affichage de la console de log pour la simulation %1$s -isisfish.simulation.menu.about=A propos -isisfish.simulation.menu.close=Fermer -isisfish.simulation.menu.file=Fichier -isisfish.simulation.menu.help=Aide isisfish.simulation.name=Nom de la simulation -isisfish.simulation.title=Lanceur de simulations -isisfish.simulationQueue.title=Queue des simulations +isisfish.simulation.title=Lanceur de simulation isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus +isisfish.simulator.launcher.remote=sur un serveur distant isisfish.simulator.launcher.subprocess=dans un sous processus isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=age @@ -1046,7 +871,6 @@ isisfish.species.rubbinCode=Code Rubbin isisfish.species.scientificName=Scientific name isisfish.species.structured=Structur\u00E9 -isisfish.species.title=Saisie des esp\u00E8ces isisfish.strategy.comments=Commentaires isisfish.strategy.inactivity= isisfish.strategy.inactivityEquationUsed= @@ -1067,16 +891,12 @@ isisfish.tripType.duration=Dur\u00E9e isisfish.tripType.minTime=Temps minimal entre deux voyages isisfish.tripType.name=Nom -isisfish.tripType.title=Saisie des types de trajet isisfish.vcs.ask.passphrase=Entrez votre passe phrase (si votre clef ssh en contient une). isisfish.vcs.ask.passphrase.title=Demande de passe phrase isisfish.vcs.commit=Message de sauvegarde isisfish.vcs.commit.cancel=annuler isisfish.vcs.commit.label=Entrer quelques mots concernant la modification des scripts isisfish.vcs.commit.ok=confirmer -isisfish.vcs.config.title=Modification de la configuration vcs d'IsisFish -isisfish.vcs.configuration.title=Configuration du serveur vcs -isisfish.vcs.migrate.end=La migration est termin\u00E9e en %1$ss.\nLa nouvelle base est localis\u00E9e ici [%2$s] isisfish.vcs.update=R\u00E9sultats de la synchronisation avec le serveur isisfish.vcs.update.cancel=annuler isisfish.vcs.update.checkAll=(de)-select tout @@ -1112,7 +932,6 @@ isisfish.vesselType.miniCrew=Taille minimale d'\u00E9quipage isisfish.vesselType.name=Nom isisfish.vesselType.speed=Vitesse -isisfish.vesselType.title=Saisie des types de navires isisfish.welcome.menu.about=A propos isisfish.welcome.menu.close=Fermer isisfish.welcome.menu.configuration=Configuration @@ -1132,11 +951,18 @@ isisfish.wizardGroupCreation.allValues=Input all the values isisfish.wizardGroupCreation.computedGrowthCurve=Calcul\u00E9 par une courbe de croissance isisfish.wizardGroupCreation.firstAge=Premier age +isisfish.wizardGroupCreation.firstAgeHelp=First age \= minimal age isisfish.wizardGroupCreation.firstGroup=Premier groupe isisfish.wizardGroupCreation.firstLength=Premi\u00E8re taille +isisfish.wizardGroupCreation.firstLengthHelp=First length \= minimal length of first group +isisfish.wizardGroupCreation.gapBetweenGroupsHelp=gap between to group is 1 year. +isisfish.wizardGroupCreation.groupNumberHelp=number of Group \= number of group wanted isisfish.wizardGroupCreation.groupWidth=Longueur du groupe +isisfish.wizardGroupCreation.groupWidthHelp=Group width \= width of group isisfish.wizardGroupCreation.lastAge=Dernier age +isisfish.wizardGroupCreation.lastAgeHelp=Last age \= maximal age isisfish.wizardGroupCreation.maxGroupsLength=Taille maximale de groupes +isisfish.wizardGroupCreation.maxGroupsLengthHelp=A semicolon ';' must separe maximal length of each group isisfish.wizardGroupCreation.numberGroup=Nombre de groupes isisfish.wizardGroupCreation.numberGroups=Nombre de groupes isisfish.wizardGroupCreation.populationCharacteristics=Input the population characteristics @@ -1146,48 +972,11 @@ isisfish.zone.cells=cellules de la Zone isisfish.zone.comments=Commentaires isisfish.zone.name=Nom -isisfish.zone.title=Saisie zone -lutinutil.common.action=Action -lutinutil.common.file=Fichier -lutinutil.common.logDiff=LogDiff -lutinutil.common.module=Module -lutinutil.common.rev=R\u00E9vision -lutinutil.common.select=S\u00E9lectionner -lutinutil.error.checkout.dir=Can't checkout dir %1$s -lutinutil.error.fieldmodel.already.registred=FieldAccess [%1$s] is already registred -lutinutil.error.fieldmodel.not.registred=could not found a matching entry in cache for [%1$s] -lutinutil.error.fieldmodel.unmatchin.options= -lutinutil.error.init.config=config is not init, you should invoke on the config validate(true) method to validate it and finish his init %1$s -lutinutil.error.init.no.config=should invoke %1$s\#init(VCSType,Properties) before required instance. -lutinutil.vcs.action.add=Add -lutinutil.vcs.action.changeLog=journal des changements -lutinutil.vcs.action.checkout=R\u00E9cup\u00E9rer -lutinutil.vcs.action.commit=Commiter -lutinutil.vcs.action.delete=Supprimer -lutinutil.vcs.action.diff=voir les diff\u00E9rences -lutinutil.vcs.action.overwriteAndUpdate=Update -lutinutil.vcs.action.revert=Rollback -lutinutil.vcs.action.update=Update -lutinutil.vcs.state.missing=fichier non pr\u00E9sent localement -lutinutil.vcs.state.modified=fichier modifi\u00E9 -lutinutil.vcs.state.outofdate=fichier obsol\u00E8te -lutinutil.vcs.state.outofdateAndModified=fichier modifi\u00E9 et obsol\u00E8te -lutinutil.vcs.state.unknown=fichier d'\u00E9tat inconnu -lutinutil.vcs.state.unversionned=fichier non versionn\u00E9 -lutinutil.vcs.state.unversionnedOrMissing=fichier non versionn\u00E9 ou non pr\u00E9sent localement -lutinutil.vcs.state.uptodate=fichier \u00E0 jour -msg= -no\ properties\ found\ or\ unsafe\ properties\ found\ %1$s=no properties found or unsafe properties found %1$s not\ started= -number\ of\ Group\ = region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= repository\ host\ change\ from\ %s\ to\ %s= repository\ protocol\ change\ from\ %s\ to\ %s= repository\ user\ change\ from\ %s\ to\ %s= simulate\ %s\ with\ file\ %s= status\ for\ %s\ is\ %s=Le statut du fichier %s est %s -strategyMonthInfo.getNumberOfTrips().toString()= -the\ property\ %1$s\ is\ mandatory\ but\ missed.=the property %1$s is mandatory but missed. to\ revision\ %d=\u00C0 la r\u00E9vision %d -to\ use\ ssh\ authentication\ mode,\ you\ must\ have\ a\ username.\ %1$s.=to use ssh authentication mode, you must have a username. %1$s. -to\ use\ ssh\ authentication\ mode,\ you\ must\ have\ an\ existing\ private\ key\ %1$s\ \:\ %2$s.=to use ssh authentication mode, you must have an existing private key %1$s \: %2$s.

1 0

r1633 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 16:18:07 +0000 (Fri, 28 Nov 2008) New Revision: 1633 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx Log: Change i18n key Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2008-11-28 16:17:06 UTC (rev 1632) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2008-11-28 16:18:07 UTC (rev 1633) @@ -122,7 +122,7 @@ } protected void refreshResult() { if (model == null) return; - labelResult.setText(_("isisfish.filter.result2", model.getNbResult(), model.getNbOriginal())); + labelResult.setText(_("isisfish.filter.result.found", model.getNbResult(), model.getNbOriginal())); if (getComboResult() != null) { if (modelResult == null) {

1 0

r1632 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 16:17:06 +0000 (Fri, 28 Nov 2008) New Revision: 1632 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Add simalutor name sort (to set "local" always default first choice in list) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2008-11-28 16:14:57 UTC (rev 1631) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2008-11-28 16:17:06 UTC (rev 1632) @@ -44,6 +44,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -131,7 +132,7 @@ /** La queue contenant toutes les simulations a faire */ protected SimulationQueue queue = new SimulationQueue(); - /** Contient les identifiants des simulations presentes dans {@ link #jobs}*/ + /** Contient les identifiants des simulations presentes dans {@link #jobs}*/ protected Set<String> idJobs = new HashSet<String>(); /** La liste des jobs existant (queue + job demarre) */ protected Set<SimulationJob> jobs = new TreeSet<SimulationJob>(); @@ -145,7 +146,14 @@ protected SimulationService() { // on cree un executor par type SimulatorLauncher Properties prop = IsisFish.config.getOptionStartsWith(SIMULATION_LAUNCHER); - for (String key : prop.stringPropertyNames()) { + + // sort simulation names by... names + // this solve "local" "sub", "remote" order + // default "local" is in first in UI. + List<String> simulationKeys = new ArrayList<String>(prop.stringPropertyNames()); + Collections.sort(simulationKeys); + + for (String key : simulationKeys) { String value = prop.getProperty(key); try { SimulatorLauncher sl = (SimulatorLauncher) ObjectUtil.newInstance(value);

1 0

r1631 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chatellier Date: 2008-11-28 16:14:57 +0000 (Fri, 28 Nov 2008) New Revision: 1631 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Disable very big error box Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2008-11-28 15:48:39 UTC (rev 1630) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2008-11-28 16:14:57 UTC (rev 1631) @@ -411,9 +411,12 @@ Logger.getLogger(ScriptAction.class.getName()).log(Level.SEVERE, null, ex); } return resultLog; - } + } public String evaluateScript(String content) { - showMsgBox("Error.xml" + "test" + content); + + // FIXME disabled huge error box :) + //showMsgBox("Error.xml" + "test" + content); + log.debug("evaluateScript called"); String msg = ""; try {

1 0