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

r3551 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 01 Dec '11

01 Dec '11

Author: echatellier Date: 2011-12-01 16:22:24 +0100 (Thu, 01 Dec 2011) New Revision: 3551 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3551 Log: ISIS fish typo Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-12-01 14:43:36 UTC (rev 3550) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-12-01 15:22:24 UTC (rev 3551) @@ -64,9 +64,9 @@ destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2011. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Please, report any bug you can found.<html> -isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. -isisfish.about.title=About Isis-Fish... +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2011. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> +isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ISIS-Fish. All rights reserved. No guarantees are provided for use of this program. +isisfish.about.title=About ISIS-Fish... isisfish.advancedParameters.title=Advanced parameters isisfish.advancedParams.freeParameters=Free parameters isisfish.advancedParams.libLevelLogger=Library log level @@ -168,10 +168,10 @@ isisfish.config.main.script.autoconfig.description=Display a dialog to force script configuration isisfish.config.main.simulation.ssh.control.check.interval=Control check interval (seconds) isisfish.config.main.simulation.ssh.control.check.interval.description=Control check interval (seconds) -isisfish.config.main.simulation.ssh.datapath=Isis-Fish database -isisfish.config.main.simulation.ssh.datapath.description=Isis-Fish database path -isisfish.config.main.simulation.ssh.isis.home=Isis-Fish home -isisfish.config.main.simulation.ssh.isis.home.description=Isis-Fish installation directory +isisfish.config.main.simulation.ssh.datapath=ISIS-Fish database +isisfish.config.main.simulation.ssh.datapath.description=ISIS-Fish database path +isisfish.config.main.simulation.ssh.isis.home=ISIS-Fish home +isisfish.config.main.simulation.ssh.isis.home.description=ISIS-Fish installation directory isisfish.config.main.simulation.ssh.javapath=Java path isisfish.config.main.simulation.ssh.javapath.description=Java location on remote server (full path or relative to $PATH, by default value is caparmor configuration) isisfish.config.main.simulation.ssh.max.threads=SSH threads count @@ -295,7 +295,7 @@ isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable isisfish.error.invalid.values.params=Parametre controlable hors valeurs possibles isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s -isisfish.error.linkageerror.message=Isis-Fish has detected a script use error.\nCompilation directory has been deleted to force recompilation.\n\nPlease, restart Isis-Fish. +isisfish.error.linkageerror.message=ISIS-Fish has detected a script use error.\nCompilation directory has been deleted to force recompilation.\n\nPlease, restart ISIS-Fish. 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 isisfish.error.load.file=could not load file %1$s @@ -957,9 +957,9 @@ isisfish.strategyMonthInfo.toString=%1$s %2$s isisfish.timeUnit.day=Day isisfish.timeUnit.hours=Hours -isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s -isisfish.tray.simulation.multi=Isis-fish - %s / %s -isisfish.tray.simulation.no=Isis-fish - No simulation +isisfish.tray.simulation=ISIS-fish - %1$s \: %2$s/%3$s +isisfish.tray.simulation.multi=ISIS-fish - %s / %s +isisfish.tray.simulation.no=ISIS-fish - No simulation isisfish.tripType.comments=Comments isisfish.tripType.duration=Duration isisfish.tripType.minTime=Minimum time between trips @@ -1056,8 +1056,8 @@ isisfish.welcome.menu.file=File isisfish.welcome.menu.frame=Window isisfish.welcome.menu.help=Help -isisfish.welcome.menu.help.isisfish=Isis-Fish Website -isisfish.welcome.menu.help.isisfishapi=Isis-Fish API +isisfish.welcome.menu.help.isisfish=ISIS-Fish Website +isisfish.welcome.menu.help.isisfishapi=ISIS-Fish API isisfish.welcome.menu.help.javaapi=Java API isisfish.welcome.menu.help.matrixapi=NuitonMatrix API isisfish.welcome.menu.help.topiaapi=ToPIA API Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-12-01 14:43:36 UTC (rev 3550) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-12-01 15:22:24 UTC (rev 3551) @@ -64,9 +64,9 @@ destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2011. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Merci de rapporter les bugs.<html> -isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec Isis-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. -isisfish.about.title=À propos de Isis-Fish... +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2011. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> +isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec ISIS-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. +isisfish.about.title=À propos de ISIS-Fish... isisfish.advancedParameters.title=Paramètres avancés isisfish.advancedParams.freeParameters=Paramètres libres isisfish.advancedParams.libLevelLogger=Niveau de tracage des librairies @@ -170,8 +170,8 @@ isisfish.config.main.simulation.ssh.control.check.interval.description=Temps d'attente en secondes entre deux vérifications de progression isisfish.config.main.simulation.ssh.datapath=Base de données isisfish.config.main.simulation.ssh.datapath.description=Emplacement de la base de données (isis-database) -isisfish.config.main.simulation.ssh.isis.home=Installation d'Isis-Fish -isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'Isis-Fish sur le serveur +isisfish.config.main.simulation.ssh.isis.home=Installation d'ISIS-Fish +isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'ISIS-Fish sur le serveur isisfish.config.main.simulation.ssh.javapath=Emplacement de java isisfish.config.main.simulation.ssh.javapath.description=Emplacement de java sur le serveur (chemin total, ou relatif au $PATH, par défaut la valeur est celle de caparmor) isisfish.config.main.simulation.ssh.max.threads=Nombre de thread SSH @@ -295,7 +295,7 @@ isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable isisfish.error.invalid.values.params=Paramètre controlable hors valeurs possibles isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s -isisfish.error.linkageerror.message=Isis-Fish a détecté une erreur d'utilisation des scripts.\nLe dossier de compilation a été supprimé pour forcer leur recompilation.\n\nMerci de relancer Isis-Fish. +isisfish.error.linkageerror.message=ISIS-Fish a détecté une erreur d'utilisation des scripts.\nLe dossier de compilation a été supprimé pour forcer leur recompilation.\n\nMerci de relancer ISIS-Fish. 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 isisfish.error.load.file=could not load file %1$s @@ -550,7 +550,7 @@ isisfish.message.import.equation.convert=Conversion manuelle de l'équation isisfish.message.import.finished=Import terminé isisfish.message.import.region.name=Entre le nom de la réegion à importer -isisfish.message.import.region.xml=Région XML (Isis-Fish V2.x) +isisfish.message.import.region.xml=Région XML (ISIS-Fish V2.x) isisfish.message.import.region.zipped=Zipped Region isisfish.message.import.scripts.file=Importer des scripts depuis une archive zip isisfish.message.import.scripts.file.cancelled=Importation des scripts annulé @@ -957,9 +957,9 @@ isisfish.strategyMonthInfo.toString=%1$s %2$s isisfish.timeUnit.day=Jour isisfish.timeUnit.hours=Heures -isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s -isisfish.tray.simulation.multi=Isis-fish - %s / %s -isisfish.tray.simulation.no=Isis-fish - Pas de simulation +isisfish.tray.simulation=ISIS-fish - %1$s \: %2$s/%3$s +isisfish.tray.simulation.multi=ISIS-fish - %s / %s +isisfish.tray.simulation.no=ISIS-fish - Pas de simulation isisfish.tripType.comments=Commentaires isisfish.tripType.duration=Durée isisfish.tripType.minTime=Temps minimal entre deux voyages @@ -974,12 +974,12 @@ isisfish.vcs.commit.ok=confirmer isisfish.vcs.factory.cantinstanciate=Can't instanciate wanted VCS (%s), use default isisfish.vcs.howto.save.key=Comment enregister sa clef publique ssh auprès du labs -isisfish.vcs.init.notfoundcantdownload=La base de données pour la version %s n'a ni pu être trouvée, ni téléchargée.\nVous devez la télécharger manullement à partir du site d'Isis-Fish. +isisfish.vcs.init.notfoundcantdownload=La base de données pour la version %s n'a ni pu être trouvée, ni téléchargée.\nVous devez la télécharger manullement à partir du site d'ISIS-Fish. isisfish.vcs.init.wrongprotocol=Votre base de données locale \: %s n'utilise pas un protocole correct.\nVoulez-vous faire une sauvegarde de cette base et récupérer une meilleure version ? isisfish.vcs.save.key=Accéder au labs pour enregister votre clef publique ssh isisfish.vcs.switchprotocol.confirm=Le protocole d'accès au dépôt des scripts a changé.\nVoulez-vous changer vers le nouveau dépôt ? isisfish.vcs.switchtag.warningconflict=Votre base de données a été mise à jour mais les fichiers suivants sont en conflit, merci de les vérifier \: -isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le dépôt correct pour votre version d'Isis-Fish \: %s.\nVoulez-vous changer de dépôt ? +isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le dépôt correct pour votre version d'ISIS-Fish \: %s.\nVoulez-vous changer de dépôt ? isisfish.vcs.update=Résultats de la synchronisation avec le serveur isisfish.vcs.update.cancel=annuler isisfish.vcs.update.checkAll=(de)-select tout @@ -1056,8 +1056,8 @@ isisfish.welcome.menu.file=Fichier isisfish.welcome.menu.frame=Fenêtre isisfish.welcome.menu.help=Aide -isisfish.welcome.menu.help.isisfish=Site d'Isis-Fish -isisfish.welcome.menu.help.isisfishapi=API Isis-Fish +isisfish.welcome.menu.help.isisfish=Site d'ISIS-Fish +isisfish.welcome.menu.help.isisfishapi=API ISIS-Fish isisfish.welcome.menu.help.javaapi=API Java isisfish.welcome.menu.help.matrixapi=API NuitonMatrix isisfish.welcome.menu.help.topiaapi=API ToPIA

1 0

r3550 - trunk/src/main/java/fr/ifremer/isisfish/datastore/migration
by echatellier＠users.forge.codelutin.com 01 Dec '11

01 Dec '11

Author: echatellier Date: 2011-12-01 15:43:36 +0100 (Thu, 01 Dec 2011) New Revision: 3550 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3550 Log: Migration automatique des ogive de maturit?\195?\169 et du taux de reproduction Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-12-01 13:19:20 UTC (rev 3549) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-12-01 14:43:36 UTC (rev 3550) @@ -27,11 +27,14 @@ import static org.nuiton.i18n.I18n._; +import java.math.BigInteger; import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.SQLQuery; +import org.hibernate.Session; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; @@ -40,6 +43,8 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; import fr.ifremer.isisfish.util.EvaluatorHelper; @@ -73,24 +78,57 @@ protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + + Session session = tx.getHibernate(); + + // get capturability value + SQLQuery query = session.createSQLQuery("SELECT p.topiaid as pop, g.topiaid as popgroup, g.id, (select count(*) FROM POPULATIONGROUP WHERE population = p.topiaid) as c FROM POPULATION p, POPULATIONGROUP g WHERE p.MATURITYGROUP = g.TOPIAID"); + List<Object[]> maturityGroupResult = query.list(); + + // get reproduction rate value + query = session.createSQLQuery("SELECT population, id, REPRODUCTIONRATE FROM POPULATIONGROUP"); + List<Object[]> reproductionResults = query.list(); + // remove maturity group - queries.add("alter table POPULATIONGROUP drop column REPRODUCTIONRATE;"); - queries.add("alter table POPULATION drop column MATURITYGROUP;"); + tx.executeSQL("alter table POPULATIONGROUP drop column REPRODUCTIONRATE;"); + tx.executeSQL("alter table POPULATION drop column MATURITYGROUP;"); // new equation - queries.add("alter table POPULATION add column MATURITYOGIVEEQUATION VARCHAR(255);"); - queries.add("alter table POPULATION add column REPRODUCTIONRATEEQUATION VARCHAR(255);"); + tx.executeSQL("alter table POPULATION add column MATURITYOGIVEEQUATION VARCHAR(255);"); + tx.executeSQL("alter table POPULATION add column REPRODUCTIONRATEEQUATION VARCHAR(255);"); // date > step - queries.add("alter table Result ALTER COLUMN resultdate RENAME TO resultstep;"); - queries.add("alter table ActiveRule ALTER COLUMN activeruledate RENAME TO activerulestep;"); + tx.executeSQL("alter table Result ALTER COLUMN resultdate RENAME TO resultstep;"); + tx.executeSQL("alter table ActiveRule ALTER COLUMN activeruledate RENAME TO activerulestep;"); // capturability equation - queries.add("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); - queries.add("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); + tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); + tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); + // build new equation for maturity group + for (Object[] maturityRow : maturityGroupResult) { + String population = (String)maturityRow[0]; + String populationgroup = (String)maturityRow[1]; + int groupId = (Integer)maturityRow[2]; + int groupCount = ((BigInteger)maturityRow[3]).intValue(); + if (populationgroup != null) { + Population pop = (Population)tx.findByTopiaId(population); + String content = getMaturityEquationContent(groupId, groupCount); + ((PopulationImpl)pop).setMaturityOgiveEquationContent(content); + pop.update(); + } + } + + // build new equation for maturity group and reproduction rate + List<Population> pops = tx.find("from " + Population.class.getName()); + for (Population pop : pops) { + String content = getReproductionRateContent(pop, reproductionResults); + ((PopulationImpl)pop).setReproductionRateEquationContent(content); + pop.update(); + } + + // start equation migration if (IsisFish.config.isLaunchUI()) { - // start equation migration List<Equation> equations = tx.find("from " + Equation.class.getName()); for (Equation equation : equations) { @@ -105,6 +143,7 @@ if (ok != 0) { content = StringUtils.replace(content, "Date ", "TimeStep "); content = StringUtils.replace(content, ".getDate()", ".getStep()"); + content = StringUtils.replace(content, "new Date(", "new TimeStep("); // second compilation ok = EvaluatorHelper.check(equation.getJavaInterface(), content, null); if (ok == 0) { @@ -133,4 +172,57 @@ } } } + + /** + * Return reproduction rate equation content generated from previous group + * reproduction rate fields (v3). + * + * @param pop pop + * @param reproductionResults v3 reproduction rate (gtopiaid, rate); + * @return equation content + */ + protected String getReproductionRateContent(Population pop, List<Object[]> reproductionResults) { + + StringBuffer b = new StringBuffer(); + b.append("if (group == null) return 0;\n"); + b.append("switch (group.getId()) {\n"); + for (Object[] reproContent : reproductionResults) { + String popid = (String)reproContent[0]; + int gid = (Integer)reproContent[1]; + double rate = (Double)reproContent[2]; + if (pop.getTopiaId().equals(popid)) { // take care of current pop only + b.append(" case " + gid + ": return " + rate + ";\n"); + } + } + b.append(" default: return 0;\n"); + b.append("}\n"); + + return b.toString(); + } + + /** + * Return maturity equation content generated from previous + * maturity group (v3) value. + * + * @param groupId previous group id + * @param groupCount population group count + * @return equation content + */ + protected String getMaturityEquationContent(int groupId, int groupCount) { + + StringBuffer b = new StringBuffer(); + b.append("if (group == null) return 0;\n"); + b.append("switch (group.getId()) {\n"); + for (int i = 0 ; i < groupCount; ++i) { + if (i > groupId) { + b.append(" case " + i + ": return 0;\n"); + } else { + b.append(" case " + i + ": return 1;\n"); + } + } + b.append(" default: return 0;\n"); + b.append("}\n"); + + return b.toString(); + } }

1 0

r3549 - in trunk/src/main: java/fr/ifremer/isisfish/ui resources/images
by echatellier＠users.forge.codelutin.com 01 Dec '11

01 Dec '11

Author: echatellier Date: 2011-12-01 14:19:20 +0100 (Thu, 01 Dec 2011) New Revision: 3549 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3549 Log: Update isis fish logo. Added: trunk/src/main/resources/images/isislogo.png Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-11-30 14:38:44 UTC (rev 3548) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-12-01 13:19:20 UTC (rev 3549) @@ -324,7 +324,7 @@ public void about(WelcomeUI welcomeUI) { AboutFrame about = new AboutFrame(); about.setTitle(_("isisfish.about.title")); - about.setIconPath("images/strategy.jpg"); + about.setIconPath("images/isislogo.png"); about.setAboutHtmlText(_("isisfish.about.abouthtmltext", IsisConfig.getVersion())); about.setLicenseText(_("isisfish.about.licensetext")); about.setBackgroundColor(Color.WHITE); Added: trunk/src/main/resources/images/isislogo.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/images/isislogo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r3548 - in trunk/src/main: java/fr/ifremer/isisfish/ui/widget resources/i18n
by echatellier＠users.forge.codelutin.com 30 Nov '11

30 Nov '11

Author: echatellier Date: 2011-11-30 15:38:44 +0100 (Wed, 30 Nov 2011) New Revision: 3548 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3548 Log: Reduce button texts Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-30 09:41:16 UTC (rev 3547) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-30 14:38:44 UTC (rev 3548) @@ -29,9 +29,6 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-30 09:41:16 UTC (rev 3547) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-30 14:38:44 UTC (rev 3548) @@ -755,13 +755,13 @@ isisfish.queue.stopSimulation=Stop simulation isisfish.queue.title=Queue isisfish.result.begin.simulation=Simulation start \: -isisfish.result.choose.simulation=Choose a Simulation +isisfish.result.choose.simulation=Simulation \: isisfish.result.end.simulation=Simuation end \: isisfish.result.export=Export isisfish.result.export.file=Export text file isisfish.result.map=Map -isisfish.result.new.window=Open a new window -isisfish.result.remove.simulation=Remove simulation +isisfish.result.new.window=Open +isisfish.result.remove.simulation=Remove isisfish.result.selectResult=Result \: isisfish.result.show.simulation.log=Show logs isisfish.result.summary=Summary Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-30 09:41:16 UTC (rev 3547) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-30 14:38:44 UTC (rev 3548) @@ -755,13 +755,13 @@ isisfish.queue.stopSimulation=Arrêter la simulation isisfish.queue.title=Queue isisfish.result.begin.simulation=En début de simulation \: -isisfish.result.choose.simulation=Choisir une simulation +isisfish.result.choose.simulation=Simulation \: isisfish.result.end.simulation=En fin de Simulation\: isisfish.result.export=Export isisfish.result.export.file=Exporter un fichier texte isisfish.result.map=Carte -isisfish.result.new.window=Ouvrir une nouvelle fenêtre -isisfish.result.remove.simulation=Supprimer Simulation +isisfish.result.new.window=Ouvrir +isisfish.result.remove.simulation=Supprimer isisfish.result.selectResult=Résultat \: isisfish.result.show.simulation.log=Voir les logs isisfish.result.summary=Résumé

1 0

r3547 - in trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui resources/i18n
by echatellier＠users.forge.codelutin.com 30 Nov '11

30 Nov '11

Author: echatellier Date: 2011-11-30 10:41:16 +0100 (Wed, 30 Nov 2011) New Revision: 3547 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3547 Log: Modify isis main frame title Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-11-30 09:41:03 UTC (rev 3546) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-11-30 09:41:16 UTC (rev 3547) @@ -49,7 +49,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; @@ -614,6 +613,7 @@ // lauch first UI (welcomeUI) WelcomeUI welcome = new WelcomeUI(); + welcome.setTitle(_("isisfish.welcome.title", IsisConfig.getVersion())); // Set to exit on close welcome.setDefaultCloseOperation(WelcomeUI.DO_NOTHING_ON_CLOSE); welcome.addWindowListener(new WindowAdapter() { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2011-11-30 09:41:03 UTC (rev 3546) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2011-11-30 09:41:16 UTC (rev 3547) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-2.0.html>. #L% --> -<JFrame title="isisfish.welcome.title" width='874' height='736' resizable="true" layout='{new BorderLayout()}'> +<JFrame width='874' height='736' resizable="true" layout='{new BorderLayout()}'> <WelcomeHandler id="handler" /> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-30 09:41:03 UTC (rev 3546) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-30 09:41:16 UTC (rev 3547) @@ -1067,7 +1067,7 @@ isisfish.welcome.menu.script=Script isisfish.welcome.menu.simulation=Simulation launcher isisfish.welcome.menu.synchro=Server synchronization -isisfish.welcome.title=Ifremer Simulation +isisfish.welcome.title=ISIS-Fish %s isisfish.wizardGroupCreation.allGroupsSameSize=All groups have the same size isisfish.wizardGroupCreation.allValues=Input all the values isisfish.wizardGroupCreation.computedGrowthCurve=Computed by a growth curve Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-30 09:41:03 UTC (rev 3546) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-30 09:41:16 UTC (rev 3547) @@ -1067,7 +1067,7 @@ isisfish.welcome.menu.script=Script isisfish.welcome.menu.simulation=Lanceur de simulations isisfish.welcome.menu.synchro=Synchronisation Serveur -isisfish.welcome.title=Simulation Ifremer +isisfish.welcome.title=ISIS-Fish %s isisfish.wizardGroupCreation.allGroupsSameSize=Tous les groupes ont la même taille isisfish.wizardGroupCreation.allValues=Entrer toutes les valeurs isisfish.wizardGroupCreation.computedGrowthCurve=Calculé par une courbe de croissance

1 0

r3546 - trunk/src/main/java/fr/ifremer/isisfish/ui/widget
by echatellier＠users.forge.codelutin.com 30 Nov '11

30 Nov '11

Author: echatellier Date: 2011-11-30 10:41:03 +0100 (Wed, 30 Nov 2011) New Revision: 3546 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3546 Log: Fix header Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-30 09:13:02 UTC (rev 3545) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-30 09:41:03 UTC (rev 3546) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ @@ -226,4 +224,4 @@ public boolean removeActionListener(ActionListener o) { return actionListeners.remove(o); } -} \ No newline at end of file +}

1 0

r3545 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 30 Nov '11

30 Nov '11

Author: echatellier Date: 2011-11-30 10:13:02 +0100 (Wed, 30 Nov 2011) New Revision: 3545 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3545 Log: Fix migration after import Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-11-28 22:23:47 UTC (rev 3544) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-11-30 09:13:02 UTC (rev 3545) @@ -450,6 +450,9 @@ tx.commitTransaction(); tx.closeContext(); } + + // close storage to force migration in next opening + result.closeStorage(); } // add storage modification event

1 0

r3544 - trunk
by maven-release＠users.forge.codelutin.com 28 Nov '11

28 Nov '11

Author: maven-release Date: 2011-11-28 23:23:47 +0100 (Mon, 28 Nov 2011) New Revision: 3544 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3544 Log: Update mavenpom4redmine to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 12:52:01 UTC (rev 3543) +++ trunk/pom.xml 2011-11-28 22:23:47 UTC (rev 3544) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3543 - trunk/src/main/java/fr/ifremer/isisfish/ui/result
by echatellier＠users.forge.codelutin.com 28 Nov '11

28 Nov '11

Author: echatellier Date: 2011-11-28 13:52:01 +0100 (Mon, 28 Nov 2011) New Revision: 3543 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3543 Log: Remove sysout Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-11-28 12:46:27 UTC (rev 3542) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-11-28 12:52:01 UTC (rev 3543) @@ -207,7 +207,6 @@ String selectedMatrixName = (String)e.getItem(); MatrixND matrix = resultStorage.getMatrix(selectedMatrixName, resultSimulationFrame.topiaContext); matrixViewerPanel.setMatrix(matrix); - System.out.println("adding matrix"); } } });

1 0

r3542 - trunk
by echatellier＠users.forge.codelutin.com 28 Nov '11

28 Nov '11

Author: echatellier Date: 2011-11-28 13:46:27 +0100 (Mon, 28 Nov 2011) New Revision: 3542 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3542 Log: Fix strange i18n NPE Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 09:47:12 UTC (rev 3541) +++ trunk/pom.xml 2011-11-28 12:46:27 UTC (rev 3542) @@ -71,6 +71,12 @@ <artifactId>nuiton-matrix-gui</artifactId> <version>2.2.1</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0