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

r3193 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:47:37 +0000 (Tue, 22 Mar 2011) New Revision: 3193 Log: Fix i18n parsing Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-22 14:47:17 UTC (rev 3192) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-22 14:47:37 UTC (rev 3193) @@ -362,8 +362,7 @@ parameter = new SimulationParameterImpl(); parameter.fromProperties(prop); } catch (IOException eee) { - throw new IsisFishRuntimeException(_( - "isisfish.error.read.simulation.parameters", file), eee); + throw new IsisFishRuntimeException(_("isisfish.error.read.simulation.parameters", file), eee); } } return this.parameter; @@ -392,8 +391,7 @@ parameter = new SimulationParameterImpl(); parameter.fromProperties(prop); } catch (IOException eee) { - throw new IsisFishRuntimeException(_( - "isisfish.error.read.simulation.parameters", file), eee); + throw new IsisFishRuntimeException(_("isisfish.error.read.simulation.parameters", file), eee); } return this.parameter; }

1 0

r3192 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:47:17 +0000 (Tue, 22 Mar 2011) New Revision: 3192 Log: Use nuiton matrix snapshot Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-22 14:47:02 UTC (rev 3191) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-22 14:47:17 UTC (rev 3192) @@ -48,14 +48,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <scope>compile</scope> </dependency>

1 0

r3191 - isis-fish/branches/3.3.1/src/license
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:47:02 +0000 (Tue, 22 Mar 2011) New Revision: 3191 Log: Fix third party Modified: isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties Modified: isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties =================================================================== --- isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties 2011-03-22 14:41:07 UTC (rev 3190) +++ isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties 2011-03-22 14:47:02 UTC (rev 3191) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 3 License @@ -14,28 +14,24 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 -# - GNU General Public License - Version 2 +# - GNU General Public License - Version 2 with the class path exception # - GNU LESSER GENERAL PUBLIC LICENSE # - GNU Lesser General Public Licence # - GNU Lesser General Public License # - GPL # - ICU License # - JDom license -# - JGoodies license # - Java Transaction API (JTA) License # - Jaxen license # - LGPL -# - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - License Agreement for JavaMail(TM) API # - MIT License -# - Mozilla Public License 1.1 (MPL 1.1) +# - Revised BSD # - Sun's Binary Code License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - The OpenSymphony Software License 1.1 -# - The OpenSymphony Software License, Version 1.1 # - http://sqljet.com/ # - http://svnkit.com/license.html # - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ @@ -43,7 +39,7 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jan 20 17:35:50 CET 2011 +#Tue Mar 22 15:45:15 CET 2011 antlr--antlr--2.7.6--jar=BSD License aspectwerkz--aspectwerkz--2.0--jar=GNU Lesser General Public License aspectwerkz--aspectwerkz-core--2.0--jar=GNU Lesser General Public License @@ -55,23 +51,20 @@ dom4j--dom4j--1.6.1--jar=BSD License javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License javax.activation--activation--1.1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.help--javahelp--2.0.02--jar=GNU General Public License - Version 2 javax.mail--mail--1.4.1--jar=License Agreement for JavaMail(TM) API javax.transaction--jta--1.1--jar=Java Transaction API (JTA) License jaxen--jaxen--1.1.1--jar=Jaxen license jdom--jdom--1.0--jar=JDom license -jgoodies--looks--1.2.2--jar=JGoodies license jrexx--jrexx--1.1.1--jar=Apache Software License -net.java.dev.jna--jna--3.2.2--jar=Lesser General Public License (LGPL v. 2.1) -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License, Version 1.1 +net.java.dev.jna--jna--3.2.3--jar=Lesser General Public License (LGPL v. 2.1) +ognl--ognl--3.0--jar=The OpenSymphony Software License, Version 1.1 org.antlr--antlr-runtime--3.1.3--jar=ANTLR 3 License -org.nuiton.thirdparty--JRI--0.8-0--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--REngine--0.6-0--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--Rserve--0.6-0--jar=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--JRI--0.8-4--jar=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--REngine--0.6-1--jar=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--Rserve--0.6-1--jar=Lesser General Public License (LGPL v. 2.1) org.nuiton.thirdparty--asm--1.5.4-snapshot--jar=ASM License org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot--jar=ASM License org.nuiton.thirdparty--asm-util--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--l2fprod-common--0.1--jar=Apache Software License qdox--qdox--1.4--jar=Apache Software License, Version 2.0 trove--trove--1.0.2--jar=Lesser General Public License (LGPL) xalan--xalan--2.6.0--jar=Apache Software License Version 2.0

1 0

r3190 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:41:07 +0000 (Tue, 22 Mar 2011) New Revision: 3190 Log: Fix i18n parsing Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-22 14:40:09 UTC (rev 3189) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-22 14:41:07 UTC (rev 3190) @@ -1027,9 +1027,8 @@ } String name = codeStorage.getName(); - int resp = JOptionPane.showConfirmDialog(scriptUI, _( - "isisfish.message.confirm.remove.script", name), null, - JOptionPane.YES_NO_OPTION); + int resp = JOptionPane.showConfirmDialog(scriptUI, _("isisfish.message.confirm.remove.script", name), + null, JOptionPane.YES_NO_OPTION); if (resp == JOptionPane.YES_OPTION) { // stay in UI even if deleted scriptUI.getEditor().close();

1 0

r3189 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity: . domain
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:40:09 +0000 (Tue, 22 Mar 2011) New Revision: 3189 Log: Fix javadoc and move FactorGroup to parent package Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/group/ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2011-03-22 14:39:17 UTC (rev 3188) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2011-03-22 14:40:09 UTC (rev 3189) @@ -68,7 +68,7 @@ /** * Add factor. * - * @param e factor to add + * @param f factor to add * @return {@code true} if factor has been added * @see java.util.List#add(java.lang.Object) */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-22 14:39:17 UTC (rev 3188) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-22 14:40:09 UTC (rev 3189) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -34,9 +34,6 @@ /** * Facteur de variation des parametres de simulation. * - * @param <E> type des valeurs gérées par le facteur - * @param <F> type des labels - * * La classe doit être {@link Serializable} avec ses valeurs pour permettre * l'export XML. * Copied: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java (from rev 3148, isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/group/FactorGroup.java) =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-03-22 14:40:09 UTC (rev 3189) @@ -0,0 +1,269 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 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, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.simulator.sensitivity; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; + +/** + * Factor group. Used for group screening. + * + * A factor mixed can accept both discrete and continuous factors (used + * for convenience : factor tree root). + * + * A factor group without factors is untyped. + * + * @author chatellier + * @version $Revision$ + * + * @since 3.3.1.0 + * + * Last update : $Date$ + * By : $Author$ + */ +public class FactorGroup extends Factor { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1893573810633639712L; + + /** Factors collection. */ + protected List<Factor> factors; + + protected static class FactorComparator implements Comparator<Factor> { + @Override + public int compare(Factor o1, Factor o2) { + int result = 1; + + if (o1 instanceof FactorGroup) { + if (o2 instanceof FactorGroup) { + result = o1.getName().compareTo(o2.getName()); + } + else { + result = -1; + } + } + else { // factor + if (o2 instanceof Factor) { + result = o1.getName().compareTo(o2.getName()); + } + } + return result; + } + }; + + /** + * Mixed factor composition. + * + * Default to false; + * + * To enable both {@link DiscreteDomain} and {@link ContinuousDomain} in current group. + * Currently used in UI to use it as tree root and drag'n'drop. + */ + protected boolean mixed; + + /** + * Init factor group. + * + * @param name group name + * @param mixed mixed property + */ + public FactorGroup(String name, boolean mixed) { + super(name); + this.mixed = mixed; + factors = new ArrayList<Factor>(); + } + + /** + * Init factor group. + * + * @param name group name + */ + public FactorGroup(String name) { + this(name, false); + } + + /** + * Add all checked factors. + * + * @param allFactors factors to add + */ + public void addAllFactors(List<Factor> allFactors) { + for (Factor factor : allFactors) { + // check all factors to add are from same types + checkFactor(allFactors, factor); + // add factors to add are from same type as current + checkFactor(factors, factor); + } + + factors.addAll(allFactors); + + // sort : factor group, by name, and factor by name + Collections.sort(factors, new FactorComparator()); + } + + /** + * Check factor type and add it into factor collection. + * + * @param factor + */ + public void addFactor(Factor factor) { + // if mixed enabled, don't check + if (!mixed) { + checkFactor(factors, factor); + } + + factors.add(factor); + + // sort : factor group, by name, and factor by name + Collections.sort(factors, new FactorComparator()); + } + + /** + * Check factor type with other factor collection types. + * + * @param factorsList factors list to check + * @param factor factor to check + * @throws IllegalArgumentException if factor doesn't match other factor type + */ + protected void checkFactor(List<Factor> factorsList, Factor factor) { + // basiquement, il doit être du même type que le + // premier element + if (factor.getDomain() == null) { + throw new IllegalArgumentException("Factor domain is null"); + } + + // on va dire, que si c'est le premier, il est du meme + // type que lui meme + if (!factorsList.isEmpty()) { + Factor first = factorsList.get(0); + + // les deux sont discret ou continue + if ((first.getDomain() instanceof DiscreteDomain && !(factor.getDomain() instanceof DiscreteDomain)) || + (first.getDomain() instanceof ContinuousDomain && !(factor.getDomain() instanceof ContinuousDomain))) { + throw new IllegalArgumentException( + "Factor type is not in same type as other factor in group"); + } + } + } + + /** + * Remove factors collection. + * + * @param allFactors factors to remove + */ + public void removeAll(Collection<Factor> allFactors) { + factors.removeAll(allFactors); + } + + /** + * Get groups factors. + * + * @return unmodifiable factors list + */ + public List<Factor> getFactors() { + return Collections.unmodifiableList(factors); + } + + /** + * Convenient method to access specific factor. + * + * @param index index + * @return factor at index + */ + public Factor get(int index) { + return factors.get(index); + } + + /** + * Get factor list size. + * + * @return factor list size + */ + public int size() { + return factors.size(); + } + + /** + * Returns the index of the first occurrence of the specified element in this + * group. + * @param o element to search for + * @return the index of the first occurrence of the specified element in this + * group, or -1 if this list does not contain the element + */ + public int indexOf(Object o) { + return factors.indexOf(o); + } + + /** + * Return {@code true} if factor group is mixed. + * + * @return {@code true} if factor group is mixed + */ + public boolean isMixed() { + return mixed; + } + + /** + * Return {@code true} if factor group has at least one factor + * and this factor is discrete. + * + * @return {@code true} if factor group is discrete + */ + public boolean isDiscrete() { + boolean result = false; + if (!factors.isEmpty()) { + Domain domain = factors.get(0).getDomain(); + result = domain instanceof DiscreteDomain; + } + return result; + } + + /** + * Return {@code true} if factor group has at least one factor + * and this factor is continuous. + * + * @return {@code true} if factor group is continuous + */ + public boolean isContinuous() { + boolean result = false; + if (!factors.isEmpty()) { + Domain domain = factors.get(0).getDomain(); + result = domain instanceof ContinuousDomain; + } + return result; + } + + @Override + public String toString() { + return "FactorGroup(" + name + ")"; + } +} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-03-22 14:39:17 UTC (rev 3188) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-03-22 14:40:09 UTC (rev 3189) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2010 Ifremer, Code Lutin, Chatellier Eric - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator.sensitivity.domain;

1 0

r3188 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:39:17 +0000 (Tue, 22 Mar 2011) New Revision: 3188 Log: Fix i18n parsing Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2011-03-22 14:39:01 UTC (rev 3187) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2011-03-22 14:39:17 UTC (rev 3188) @@ -77,8 +77,7 @@ double result = ((Number) val).doubleValue(); return result; } else { - throw new IsisFishRuntimeException(_( - "isisfish.error.equation.return.number", eq)); + throw new IsisFishRuntimeException(_("isisfish.error.equation.return.number", eq)); } } else if (Language.JAVA.equals(getLanguage()) || getJavaInterface() != null) { @@ -90,18 +89,15 @@ double result = ((Number) val).doubleValue(); return result; } else { - throw new IsisFishRuntimeException(_( - "isisfish.error.equation.return.number", eq)); + throw new IsisFishRuntimeException(_("isisfish.error.equation.return.number", eq)); } } else { // TODO other language support - throw new IsisFishRuntimeException(_( - "isisfish.error.unsupported.equation.langage", + throw new IsisFishRuntimeException(_("isisfish.error.unsupported.equation.langage", getLanguage(), eq)); } } catch (Exception eee) { - throw new IsisFishRuntimeException(_( - "isisfish.error.evaluate.equation", eq), eee); + throw new IsisFishRuntimeException(_("isisfish.error.evaluate.equation", eq), eee); } }

1 0

r3187 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org March 22, 2011

March 22, 2011

Author: chatellier Date: 2011-03-22 14:39:01 +0000 (Tue, 22 Mar 2011) New Revision: 3187 Log: Fix message body Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-18 13:35:19 UTC (rev 3186) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-22 14:39:01 UTC (rev 3187) @@ -135,7 +135,7 @@ // remove isis build directory FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); - ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.title"), cause); + ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.message"), cause); } else { if (log.isErrorEnabled()) {

1 0

r3186 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org March 18, 2011

March 18, 2011

Author: chatellier Date: 2011-03-18 13:35:19 +0000 (Fri, 18 Mar 2011) New Revision: 3186 Log: Fix fuel cost i18n Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-03-18 11:43:17 UTC (rev 3185) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-03-18 13:35:19 UTC (rev 3186) @@ -198,6 +198,7 @@ isisfish.config.main.userName.description=User name isisfish.config.ssh.key.file=SSH key isisfish.config.ssh.key.file.description=Private SSH key path +isisfish.config.title=Preferences isisfish.config.vcs.hostName.description= isisfish.config.vcs.localDatabasePath.description= isisfish.config.vcs.noPassPhrase.description= @@ -1070,7 +1071,7 @@ isisfish.versionStorage.removed=Removed isisfish.vesselType.activityRange=Activity range isisfish.vesselType.comments=Comments -isisfish.vesselType.fuelCost=Fuel cost of travel +isisfish.vesselType.fuelCost=Travel fuel cost isisfish.vesselType.length=Length isisfish.vesselType.maxDuration=Maximum trip duration isisfish.vesselType.miniCrew=Minimum crew size Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-03-18 11:43:17 UTC (rev 3185) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-03-18 13:35:19 UTC (rev 3186) @@ -198,6 +198,7 @@ isisfish.config.main.userName.description=le nom - pr\u00E9nom de l'utilisateur isisfish.config.ssh.key.file=Cl\u00E9 SSH isisfish.config.ssh.key.file.description=Emplacement de la cl\u00E9 priv\u00E9e SSH +isisfish.config.title=Pr\u00E9f\u00E9rences isisfish.config.vcs.hostName.description=le nom du serveur vcs \u00E0 utiliser isisfish.config.vcs.localDatabasePath.description= isisfish.config.vcs.noPassPhrase.description=pour indiquer si la clef priv\u00E9e ssh2 utilis\u00E9e pour communiquer avec le serveur vcs est prot\u00E9g\u00E9 par une passe-phrase @@ -1070,7 +1071,7 @@ isisfish.versionStorage.removed=Supprim\u00E9 isisfish.vesselType.activityRange=Intervalle d'activit\u00E9 isisfish.vesselType.comments=Commentaires -isisfish.vesselType.fuelCost=Co\u00FBt d'un trajet en fuel +isisfish.vesselType.fuelCost=Co\u00FBt fuel en route isisfish.vesselType.length=Longueur isisfish.vesselType.maxDuration=Dur\u00E9e maximale du trajet isisfish.vesselType.miniCrew=Taille minimale d'\u00E9quipage

1 0

r3185 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org March 18, 2011

March 18, 2011

Author: tchemit Date: 2011-03-18 11:43:17 +0000 (Fri, 18 Mar 2011) New Revision: 3185 Log: use mavenpom 2.5.2 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-03-18 11:42:37 UTC (rev 3184) +++ isis-fish/trunk/pom.xml 2011-03-18 11:43:17 UTC (rev 3185) @@ -735,7 +735,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor>

1 0

r3184 - isis-fish/branches/3.3.1
by tchemit＠users.labs.libre-entreprise.org March 18, 2011

March 18, 2011

Author: tchemit Date: 2011-03-18 11:42:37 +0000 (Fri, 18 Mar 2011) New Revision: 3184 Log: use mavenpom 2.5.2 Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-18 11:30:44 UTC (rev 3183) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-18 11:42:37 UTC (rev 3184) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <groupId>fr.ifremer</groupId> @@ -712,7 +712,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor>

1 0