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

r2492 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 15:23:51 +0000 (Thu, 16 Jul 2009) New Revision: 2492 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: Add comment about layers. Remove icons and accept action on blocking layer. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-07-16 15:22:47 UTC (rev 2491) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-07-16 15:23:51 UTC (rev 2492) @@ -31,23 +31,22 @@  <java.lang.String id='nextPath' javaBean='null'/> +  <jaxx.runtime.swing.BlockingLayerUI id='layerUI' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - useIcon='true' - blockingColor='{new Color(50,50,50)}' - acceptAction='{new AbstractAction() { + blockingColor='{new Color(50,50,50)}' /> +  + }}' --> + +  <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - acceptAction='{new AbstractAction() { + blockIcon='{SwingUtil.createImageIcon("building.png")}' + acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' + acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; @Override public void actionPerformed(ActionEvent e) { @@ -149,15 +148,20 @@ } } +/** + * Action appelée lors du clic sur un layer. + * + * @param e l'event initial intersepté par le layer + */ protected void accept(ActionEvent e) { JComponent source = (JComponent) e.getSource(); Class classBean = (Class)source.getClientProperty("bean"); String beanID = (String)source.getClientProperty("beanID"); TopiaEntity bean = null; - if (beanID == null){ + if (beanID == null) { bean = getVerifier().getEntity(classBean); } - else{ + else { bean = getVerifier().getEntity(classBean, beanID); } if (bean != null) {

1 0

r2491 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 15:22:47 +0000 (Thu, 16 Jul 2009) New Revision: 2491 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx Log: Effort list is selectable Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-16 15:19:36 UTC (rev 2490) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-16 15:22:47 UTC (rev 2491) @@ -106,7 +106,7 @@ <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" onValueChanged='effortDescriptionSelectionChanged()' cellRenderer='{new EffortDescriptionListRenderer()}' - enabled='{isActif()}' decorator='boxed' /> + enabled='{isActif()}' /> </JScrollPane> </cell> <cell columns='2' fill='both' weightx='1.0'>

1 0

r2490 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 15:19:36 +0000 (Thu, 16 Jul 2009) New Revision: 2490 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Wrong plans instances were used 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 2009-07-16 10:11:08 UTC (rev 2489) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-07-16 15:19:36 UTC (rev 2490) @@ -823,7 +823,9 @@ // doNext = true; // appel de tous les plans pour modifier la simulation - for (AnalysePlan plan : sim.getParameter().getAnalysePlans()) { + // EC20090716 : use param.getAnalysePlans() instances, + // not sim.getParameters().getAnalysePlans() not sames !!! + for (AnalysePlan plan : param.getAnalysePlans()) { try { boolean result = plan.afterSimulation(planContext, sim); doNext = doNext && result;

1 0

r2489 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 10:11:08 +0000 (Thu, 16 Jul 2009) New Revision: 2489 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: String in non multiline label 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 2009-07-16 10:06:43 UTC (rev 2488) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-16 10:11:08 UTC (rev 2489) @@ -983,7 +983,7 @@ isisfish.vcs.init.notfoundcantdownload=No database version %s found and can't get it.\nYou must go to ISIS-Fish web site and download database manually. isisfish.vcs.init.wrongprotocol=Your database repository\: %s\n don't use correct protocol.\nDo you want to make backup of your database and take the correct one ? isisfish.vcs.switchprotocol.confirm=Protocol to access repository script has changed.\nDo you want to switch your repository ? -isisfish.vcs.switchtag.warningconflict=Your repository is now up-to-date, but following files are conflicted, you may check them \:\n +isisfish.vcs.switchtag.warningconflict=Your repository is now up-to-date, but following files are conflicted, you may check them \: isisfish.vcs.switchversion.confirm=You don't use correct repository script for your application version %s.\nDo you want to switch your repository ? isisfish.vcs.update=vcs.update isisfish.vcs.update.cancel=cancel 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 2009-07-16 10:06:43 UTC (rev 2488) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-07-16 10:11:08 UTC (rev 2489) @@ -983,7 +983,7 @@ isisfish.vcs.init.notfoundcantdownload=La base de donn\u00E9es pour la version %s n'a ni pu \u00EAtre trouv\u00E9e, ni t\u00E9l\u00E9charg\u00E9e.\nVous devez la t\u00E9l\u00E9charger manullement \u00E0 partir du site d'Isis-Fish. isisfish.vcs.init.wrongprotocol=Votre base de donn\u00E9es locale \: %s n'utilise pas un protocole correct.\nVoulez-vous faire une sauvegarde de cette base et r\u00E9cup\u00E9rer une meilleure version ? isisfish.vcs.switchprotocol.confirm=Le protocole d'acc\u00E8s au d\u00E9p\u00F4t des scripts a chang\u00E9.\nVoulez-vous changer vers le nouveau d\u00E9p\u00F4t ? -isisfish.vcs.switchtag.warningconflict=Votre base de donn\u00E9es a \u00E9t\u00E9 mise \u00E0 jour\nmais les fichiers suivants sont en conflit, merci de les v\u00E9rifier \:\n +isisfish.vcs.switchtag.warningconflict=Votre base de donn\u00E9es a \u00E9t\u00E9 mise \u00E0 jour mais les fichiers suivants sont en conflit, merci de les v\u00E9rifier \: isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le d\u00E9p\u00F4t correct pour votre version d'Isis-Fish \: %s.\nVoulez-vous changer de d\u00E9p\u00F4t ? isisfish.vcs.update=R\u00E9sultats de la synchronisation avec le serveur isisfish.vcs.update.cancel=annuler

1 0

r2488 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 16 Jul '09

16 Jul '09

Author: chatellier Date: 2009-07-16 10:06:43 +0000 (Thu, 16 Jul 2009) New Revision: 2488 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: Clean unused strings 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 2009-07-15 14:57:58 UTC (rev 2487) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-16 10:06:43 UTC (rev 2488) @@ -323,14 +323,6 @@ isisfish.error.not.possible.metier=Pas de m\u00E9tier possible 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 -isisfish.error.obtain.doc.export=Can't obtain @Doc on class export -isisfish.error.obtain.doc.resultName=Can't obtain @Doc on ResultName -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.field.export=Can't obtain field @Doc for Export %1$s -isisfish.error.obtain.field.sensitivitycalculator=Can't obtain field @Doc for Calculator %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 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 2009-07-15 14:57:58 UTC (rev 2487) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-07-16 10:06:43 UTC (rev 2488) @@ -323,14 +323,6 @@ isisfish.error.not.possible.metier=Pas de m\u00E9tier possible isisfish.error.not.support.class=La classe %s ne supporte pas les descritions 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 -isisfish.error.obtain.doc.export=Can't obtain @Doc on class Export -isisfish.error.obtain.doc.resultName=Can't obtain @Doc on ResultName -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.field.export=Can't obtain field @Doc for Export %1$s -isisfish.error.obtain.field.sensitivitycalculator=Can't obtain field @Doc for Calculator %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

1 0

r2487 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: chatellier Date: 2009-07-15 14:57:58 +0000 (Wed, 15 Jul 2009) New Revision: 2487 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties Log: Fix some translation 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 2009-07-15 13:21:06 UTC (rev 2486) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-15 14:57:58 UTC (rev 2487) @@ -1066,7 +1066,7 @@ isisfish.welcome.menu.configuration.sshlauncher=Caparmor configuration isisfish.welcome.menu.configuration.vcs=VCS Configuration isisfish.welcome.menu.file=File -isisfish.welcome.menu.frame=Frame +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 @@ -1078,8 +1078,8 @@ isisfish.welcome.menu.queue=Simulation queue isisfish.welcome.menu.result=Result isisfish.welcome.menu.script=Script -isisfish.welcome.menu.simulation=Simulation Launcher -isisfish.welcome.menu.synchro=Server Synchronisation +isisfish.welcome.menu.simulation=Simulation launcher +isisfish.welcome.menu.synchro=Server synchronization isisfish.welcome.title=Ifremer Simulation isisfish.wizardGroupCreation.allGroupsSameSize=All groups have the same size isisfish.wizardGroupCreation.allValues=Input all the values

1 0

r2486 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: chatellier Date: 2009-07-15 13:21:06 +0000 (Wed, 15 Jul 2009) New Revision: 2486 Modified: isis-fish/trunk/pom.xml Log: Update lw release Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-07-15 12:02:01 UTC (rev 2485) +++ isis-fish/trunk/pom.xml 2009-07-15 13:21:06 UTC (rev 2486) @@ -365,7 +365,7 @@ <lutinmatrix.version>1.3</lutinmatrix.version> <lutinutil.version>1.0.6</lutinutil.version> <i18n.version>0.9</i18n.version> - <lutinwidget.version>0.14.1-SNAPSHOT</lutinwidget.version> + <lutinwidget.version>0.14.1</lutinwidget.version> <generator.version>0.64</generator.version> <lutinj2r.version>0.4</lutinj2r.version> <jrst.version>0.8.4</jrst.version>

1 0

r2485 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: chatellier Date: 2009-07-15 12:02:01 +0000 (Wed, 15 Jul 2009) New Revision: 2485 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: #1904 : accent en trop 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 2009-07-15 08:49:45 UTC (rev 2484) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-07-15 12:02:01 UTC (rev 2485) @@ -682,7 +682,7 @@ isisfish.params.title=Param\u00E8tres isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n isisfish.params.toString.lib.logger.level=niveau du logger de librairies %1$s -isisfish.params.toString.number.years=Nombre d'ann\u00E9\u00E9s \: %1$s\n\n +isisfish.params.toString.number.years=Nombre d'ann\u00E9s \: %1$s\n\n isisfish.params.toString.plan=Plan\: %1$s isisfish.params.toString.plan.number=Analyse plan sequence number\: %1$s\n\n isisfish.params.toString.populations=Populations\:

1 0

r2484 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: chatellier Date: 2009-07-15 08:49:45 +0000 (Wed, 15 Jul 2009) New Revision: 2484 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties Log: Translate some strings 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 2009-07-15 07:44:39 UTC (rev 2483) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-15 08:49:45 UTC (rev 2484) @@ -822,7 +822,7 @@ isisfish.result.openWindowButton=defaultToolTip-fr.ifremer.resultat.ResultatView.openWindowButton isisfish.result.quit=Quitter isisfish.result.reject.metier=Rejet par metier -isisfish.result.remove.simulation=Supprimer Simulation +isisfish.result.remove.simulation=Remove simulation isisfish.result.removeSimulationButton=defaultToolTip-fr.ifremer.resultat.ResultatView.supprimerSimulationButton isisfish.result.resultat=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resultat isisfish.result.scroll=defaultToolTip-fr.ifremer.resultat.ResultatEdit.scroll @@ -831,10 +831,10 @@ isisfish.result.statusBar=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusbar1 isisfish.result.statusImage=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusImage isisfish.result.stress.metier=Effort par metier -isisfish.result.summary=R\u00E9sum\u00E9 +isisfish.result.summary=Summary isisfish.result.summaryRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resumeRadioButton isisfish.result.table=defaultToolTip-fr.ifremer.resultat.ResultatView.table33 -isisfish.result.title=Resultat +isisfish.result.title=Results isisfish.result.tooltip.show.simulation.log=Click to display the log console of the simulation isisfish.result.unload.metier=Debarquement par metier isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1

1 0

r2483 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: chatellier Date: 2009-07-15 07:44:39 +0000 (Wed, 15 Jul 2009) New Revision: 2483 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Log: Set noModif BEFORE path change Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-07-15 07:34:02 UTC (rev 2482) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-07-15 07:44:39 UTC (rev 2483) @@ -243,10 +243,11 @@ ErrorDialogUI.showError(eee); } rootUI.setInfoText(msg); + // set noModif BEFORE path changed + noModif(); String path = currentNode.getParent().getContextPath(); rootUI.setTreeModel(); rootUI.setTreeSelection(path); - noModif(); } /**

1 0