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

r1839 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: tchemit Date: 2009-02-18 20:39:12 +0000 (Wed, 18 Feb 2009) New Revision: 1839 Modified: isis-fish/trunk/pom.xml Log: utilisation des versions stables des librairies Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-18 17:15:31 UTC (rev 1838) +++ isis-fish/trunk/pom.xml 2009-02-18 20:39:12 UTC (rev 1839) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <groupId>ifremer</groupId> @@ -345,14 +345,14 @@ <jaxx.version>1.1-SNAPSHOT</jaxx.version> <topia.version>2.1.3-SNAPSHOT</topia.version> <topia.service.version>1.0.2-SNAPSHOT</topia.service.version> - <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> - <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> - <i18n.version>0.9-SNAPSHOT</i18n.version> - <lutinwidget.version>0.12</lutinwidget.version> - <generator.version>0.64-SNAPSHOT</generator.version> + <lutinmatrix.version>1.2</lutinmatrix.version> + <lutinutil.version>1.0.3</lutinutil.version> + <i18n.version>0.9</i18n.version> + <lutinwidget.version>0.13</lutinwidget.version> + <generator.version>0.64</generator.version> <lutinj2r.version>0.2</lutinj2r.version> - <jrst.version>0.8.4-SNAPSHOT</jrst.version> - <license-switcher.version>0.6-SNAPSHOT</license-switcher.version> + <jrst.version>0.8.4</jrst.version> + <license-switcher.version>0.6</license-switcher.version> <openmap.version>4.6.4</openmap.version> <aspectwerkz.version>2.0</aspectwerkz.version>

1 0

r1838 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: sletellier Date: 2009-02-18 17:15:31 +0000 (Wed, 18 Feb 2009) New Revision: 1838 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx Log: Only metier's name are displayed in list Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-02-18 17:12:46 UTC (rev 1837) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-02-18 17:15:31 UTC (rev 1838) @@ -45,6 +45,7 @@ import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.types.TimeUnit; +import jaxx.runtime.swing.Item; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -84,7 +85,11 @@ } protected void setEffortDescriptionEffortDescriptionList(){ if (getBean().getPossibleMetiers() != null){ - fieldEffortDescriptionEffortDescriptionList.fillList(getBean().getPossibleMetiers(), (Object)null); + java.util.List<Item> items = new ArrayList<Item>(); + for (EffortDescription e : getBean().getPossibleMetiers()){ + items.add(new Item(e.toString(), e.getPossibleMetiers().getName(), e, false)); + } + fieldEffortDescriptionEffortDescriptionList.setItems(items); } } protected void add(){

1 0

r1837 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: sletellier Date: 2009-02-18 17:12:46 +0000 (Wed, 18 Feb 2009) New Revision: 1837 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Log: Delete is enabled only if Entity is selected 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-02-18 17:12:18 UTC (rev 1836) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-02-18 17:12:46 UTC (rev 1837) @@ -130,7 +130,7 @@ setEnabled(currentSaveButton, false); setEnabled(currentCancelButton, false); setEnabled(currentNewButton, true); - setEnabled(currentDeleteButton, true); + setEnabled(currentDeleteButton, editable); } protected void setEnabled(JButton b, boolean enabled){ if (b != null){ @@ -372,7 +372,7 @@ deleteButton.removeActionListener(deleteListener); deleteButton.addActionListener(deleteListener); } - deleteButton.setEnabled(!changed); + deleteButton.setEnabled(editable); deleteButton.setText(_("isisfish.common.remove")); this.currentDeleteButton = deleteButton; }

1 0

r1836 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: sletellier Date: 2009-02-18 17:12:18 +0000 (Wed, 18 Feb 2009) New Revision: 1836 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx Log: TripType selected bug is fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-02-18 17:11:24 UTC (rev 1835) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-02-18 17:12:18 UTC (rev 1836) @@ -42,7 +42,7 @@ import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.types.TimeUnit; -boolean tripTypeChanged = true; +boolean init = false; setButtonTitle(_("isisfish.input.continueSetOfVessels")); setNextPath("$root/$setOfVessels"); @@ -75,13 +75,13 @@ VesselType vesselType = getVerifier().getEntity(VesselType.class); setBean((VesselTypeImpl) vesselType); if (getBean() != null){ - tripTypeChanged = false; - vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType() == null ? (Object) null : getBean().getTripType()); - tripTypeChanged = true; + init = true; + vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType()); + init = false; } } protected void tripTypeChanged(){ - if (tripTypeChanged){ + if (!init){ Object[] values = vesselTypeTripType.getSelectedValues(); Collection<TripType> tripTypes = new LinkedList<TripType>(); for (Object o : values){ @@ -157,7 +157,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane> - <JList id="vesselTypeTripType" onValueChanged='tripTypeChanged()' enabled='{isActif()}'/> + <JList id="vesselTypeTripType" onMouseClicked='tripTypeChanged()' enabled='{isActif()}'/> </JScrollPane> </cell> </row>

1 0

r1835 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: sletellier Date: 2009-02-18 17:11:24 +0000 (Wed, 18 Feb 2009) New Revision: 1835 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx Log: Initialisation bug fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-02-18 17:10:47 UTC (rev 1834) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-02-18 17:11:24 UTC (rev 1835) @@ -48,6 +48,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +boolean init = false; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -70,13 +71,22 @@ SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null){ + init = true; jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort()); jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType()); - + init=false; technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), getBean(), "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); getVerifier().addCurrentPanel(technicalEfficiency); } } +protected void portChanged(){ + if (!init) + getBean().setPort((Port)fieldSetOfVesselsPort.getSelectedItem()); +} +protected void vesselTypeChanged(){ + if (!init) + getBean().setVesselType((VesselType)fieldSetOfVesselsVesselType.getSelectedItem()); +} ]]> </script> <Table id='body'> @@ -96,7 +106,7 @@ <JLabel text="isisfish.common.port" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='getBean().setPort((Port)fieldSetOfVesselsPort.getSelectedItem())' enabled='{isActif()}'/> + <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -104,7 +114,7 @@ <JLabel text="isisfish.setOfVessels.vesselType" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='getBean().setVesselType((VesselType)fieldSetOfVesselsVesselType.getSelectedItem())' enabled='{isActif()}'/> + <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}'/> </cell> </row> <row>

1 0

r1834 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: sletellier Date: 2009-02-18 17:10:47 +0000 (Wed, 18 Feb 2009) New Revision: 1834 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx Log: Pop season info can be null Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-02-18 17:10:20 UTC (rev 1833) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-02-18 17:10:47 UTC (rev 1834) @@ -80,8 +80,10 @@ } protected void setFieldPopulationMigrationSeasonChooserModel(){ DefaultComboBoxModel model = new DefaultComboBoxModel(); - for (PopulationSeasonInfo psi : getBean().getPopulationSeasonInfo()){ - model.addElement(new GenericCell(psi.getFirstMonth() + " - " + psi.getLastMonth(), psi, PopulationSeasonInfo.class)); + if (getBean().getPopulationSeasonInfo() != null){ + for (PopulationSeasonInfo psi : getBean().getPopulationSeasonInfo()){ + model.addElement(new GenericCell(psi.getFirstMonth() + " - " + psi.getLastMonth(), psi, PopulationSeasonInfo.class)); + } } fieldPopulationMigrationSeasonChooser.setModel(model); }

1 0

r1833 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: sletellier Date: 2009-02-18 17:10:20 +0000 (Wed, 18 Feb 2009) New Revision: 1833 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Log: Population group can be null Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-18 16:01:44 UTC (rev 1832) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-18 17:10:20 UTC (rev 1833) @@ -80,7 +80,9 @@ Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); if (getBean() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null); + if (getBean().getPopulationGroup() != null){ + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null); + } } } ]]>

1 0

r1832 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: tchemit Date: 2009-02-18 16:01:44 +0000 (Wed, 18 Feb 2009) New Revision: 1832 Modified: isis-fish/trunk/pom.xml Log: suppression des versions de nos librairies de lutinproject Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-18 13:20:34 UTC (rev 1831) +++ isis-fish/trunk/pom.xml 2009-02-18 16:01:44 UTC (rev 1832) @@ -351,6 +351,8 @@ <lutinwidget.version>0.12</lutinwidget.version> <generator.version>0.64-SNAPSHOT</generator.version> <lutinj2r.version>0.2</lutinj2r.version> + <jrst.version>0.8.4-SNAPSHOT</jrst.version> + <license-switcher.version>0.6-SNAPSHOT</license-switcher.version> <openmap.version>4.6.4</openmap.version> <aspectwerkz.version>2.0</aspectwerkz.version> @@ -454,7 +456,6 @@ </configuration> <executions> <execution> -  <goals> <goal>parserJava</goal> <goal>gen</goal>

1 0

r1831 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: chatellier Date: 2009-02-18 13:20:34 +0000 (Wed, 18 Feb 2009) New Revision: 1831 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Gestion des demandes d'arret de monitoring de simulations Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-02-18 13:10:43 UTC (rev 1830) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-02-18 13:20:34 UTC (rev 1831) @@ -172,7 +172,10 @@ String simulationOnlyExport = simulationInfos[2]; String simulationExports = simulationInfos[3]; String simulationUseAnalysePlan = simulationInfos[4]; - String simulationPlans = simulationInfos[5]; + String simulationPlans = ""; + if(simulationInfos.length >= 6) { + simulationPlans = simulationInfos[5]; + } if (log.isInfoEnabled()) { log.info("Restart monitoring of " + simulationId); @@ -351,6 +354,9 @@ SimulationJob job = checkMap.get(date); SimulatorLauncher launcher = job.getLauncher(); + // retourne true if : + // - simulation is finished + // - simulation end has been asked boolean jobIsFinished = checkProgression(job, launcher); // always remove this simulation from map @@ -360,6 +366,7 @@ if (jobIsFinished) { doPostSimulationOperation(job, launcher); } else { + // next check date long nextJobTimeMs = date.getTime() + launcher.getCheckProgressionInterval() * 1000; @@ -407,8 +414,8 @@ // WARNING this condition is VERY important // and set by end of // fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher#localSimulateSameThread(SimulationControl, SimulationStorage) - if (control.getProgress() > 0 - && control.getProgress() >= control.getProgressMax()) { + if ((control.getProgress() > 0 + && control.getProgress() >= control.getProgressMax()) || control.isStopSimulationRequest()) { simulationEnded = true; } } catch (RemoteException e) { @@ -440,12 +447,17 @@ } try { - // get storage - SimulationStorage simulation = launcher.getSimulationStorage( - service, control); - - // post manage this storage - exportResult(job, simulation); + + // on ne fait de post traitement que si + // la simulation n'a pas été arretée + if (!control.isStopSimulationRequest()) { + // get storage + SimulationStorage simulation = launcher.getSimulationStorage( + service, control); + + // post manage this storage + exportResult(job, simulation); + } } catch (RemoteException e) { if (log.isErrorEnabled()) { log.error("Can't get simulation results after simulation end",

1 0

r1830 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Feb. 18, 2009

Feb. 18, 2009

Author: chatellier Date: 2009-02-18 13:10:43 +0000 (Wed, 18 Feb 2009) New Revision: 1830 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Manage: - onlyexport - plan dependant in saved simulation list Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-02-18 11:33:03 UTC (rev 1829) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-02-18 13:10:43 UTC (rev 1830) @@ -25,7 +25,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.rmi.RemoteException; +import java.util.Collection; import java.util.Date; +import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.SortedMap; @@ -36,7 +38,11 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.launcher.SimulationJob.PostAction; @@ -72,11 +78,18 @@ * Saved in $HOME/.isis-simulations-3 */ protected File monitorFile; + + /** + * Separator used in monitor file. + * + * Can't be "," + */ + protected static final String MONITORFILESEPARATOR = "/"; /** * Liste des simulations en cours, * Le format est défini ainsi : - * id=launcher,datedelancement,export,plandependant + * id=launcher/datedelancement/onlyexport/exports/plandependant/plans */ protected Properties properties = new Properties(); @@ -153,11 +166,13 @@ // 1 = date // 2 = export // 3 = plan dependent - String[] simulationInfos = simulationInfo.split(","); + String[] simulationInfos = simulationInfo.split(MONITORFILESEPARATOR); String simulationLauncher = simulationInfos[0]; String simulationDate = simulationInfos[1]; - String simulationExport = simulationInfos[2]; - String simulationPlan = simulationInfos[3]; + String simulationOnlyExport = simulationInfos[2]; + String simulationExports = simulationInfos[3]; + String simulationUseAnalysePlan = simulationInfos[4]; + String simulationPlans = simulationInfos[5]; if (log.isInfoEnabled()) { log.info("Restart monitoring of " + simulationId); @@ -171,14 +186,40 @@ // re add simulation in try { + // launcher SimulatorLauncher launcher = (SimulatorLauncher) Class.forName( simulationLauncher).newInstance(); SimulationParameter params = new SimulationParameter(); - params.setUseAnalysePlan("true" - .equalsIgnoreCase(simulationPlan)); - params.setOnlyExport("true".equalsIgnoreCase(simulationExport)); - + // UseAnalysePlan + params.setUseAnalysePlan("true".equalsIgnoreCase(simulationUseAnalysePlan)); + // plans + String[] planList = simulationPlans.split(","); + for (String name : planList) { + if (name != null && !name.isEmpty()) { + try { + AnalysePlan plan = AnalysePlanStorage.getAnalysePlan(name).getNewAnalysePlanInstance(); + params.getAnalysePlans().add(plan); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find plan: " + name, eee); + } + } + } + } + // OnlyExport + params.setOnlyExport("true".equalsIgnoreCase(simulationOnlyExport)); + // exports + String[] exportList = simulationExports.split(","); + for (String name : exportList) { + if (name != null && !name.isEmpty()) { + params.getExportNames().add(name); + } + } + + // FIXME needed + params.setExportDirectory(IsisFish.config.getDefaultExportDirectory().toString()); + service.submitForCheckOnly(simulationId, params, launcher, 0); } catch (ClassNotFoundException e) { if (log.isErrorEnabled()) { @@ -200,15 +241,24 @@ String monitorKey = job.getId(); SimulatorLauncher launcher = job.getLauncher(); - + SimulationParameter params = job.getItem().getParameter(); + // 0 = launcher - String monitorValue = job.getLauncher().getClass().getName(); + String monitorValue = launcher.getClass().getName(); // 1 = date - monitorValue += "," + System.currentTimeMillis(); - // 2 = export - monitorValue += "," + job.getItem().getParameter().getOnlyExport(); - // 3 = plan dependent - monitorValue += "," + job.getItem().getParameter().getUseAnalysePlan(); + monitorValue += MONITORFILESEPARATOR + System.currentTimeMillis(); + // 2 = onlyexport + monitorValue += MONITORFILESEPARATOR + params.getOnlyExport(); + // 3 = exports + monitorValue += MONITORFILESEPARATOR + collectionToString(params.getExportNames()); + // 4 = plan dependent + monitorValue += MONITORFILESEPARATOR + params.getUseAnalysePlan(); + // 5 = plan dependent + String planList = ""; + for (AnalysePlan plan : params.getAnalysePlans()) { + planList += AnalysePlanStorage.getName(plan) + ","; + } + monitorValue += MONITORFILESEPARATOR + planList; properties.put(monitorKey, monitorValue); try { @@ -306,7 +356,7 @@ // always remove this simulation from map checkMap.remove(date); - // if not finished, re-add it at + // if not finished, re-add it at end if (jobIsFinished) { doPostSimulationOperation(job, launcher); } else { @@ -317,11 +367,6 @@ checkMap.put(nextJobDate, job); } - // finally, schedule, next check - /*if (!checkMap.isEmpty()) { - Date nextDate = checkMap.firstKey(); - checkScheduler.schedule(this, nextDate); - }*/ } else { //checkScheduler.schedule(this, date); if (log.isDebugEnabled()) { @@ -349,8 +394,8 @@ SimulationControl control = job.getItem().getControl(); // log - if (log.isInfoEnabled()) { - log.info("Checking simulation progression : " + control.getId()); + if (log.isDebugEnabled()) { + log.debug("Checking simulation progression : " + control.getId()); log.debug(" with launcher = " + launcher); } @@ -359,8 +404,11 @@ launcher.updateControl(service, control); // by default, Progress = ProgressMax = 0 + // WARNING this condition is VERY important + // and set by end of + // fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher#localSimulateSameThread(SimulationControl, SimulationStorage) if (control.getProgress() > 0 - && control.getProgress() >= control.getProgressMax() - 1) { + && control.getProgress() >= control.getProgressMax()) { simulationEnded = true; } } catch (RemoteException e) { @@ -458,24 +506,26 @@ if (param.getOnlyExport()) { // pour les plan dependant il faut le faire apres toutes // les simulations donc pas ici - // FIXME fix parent job test - if (/*getParentJob() == null || */param.getUseAnalysePlan() + if (job.getParentJob() == null || param.getUseAnalysePlan() && param.isIndependentPlan()) { // log if (log.isDebugEnabled()) { - log - .debug("Export \"onlyExport\" : deleting simulation"); + log.debug("Export \"onlyExport\" : deleting simulation"); } simulation.delete(false); } else { // log if (log.isDebugEnabled()) { - log - .debug("Not onlyExport options : not delete simulation"); + log.debug("OnlyExport options true, but plan dependant : not delete simulation"); } } + } else { + // log + if (log.isDebugEnabled()) { + log.debug("OnlyExport options not set : not delete simulation"); + } } } catch (Exception eee) { if (log.isErrorEnabled()) { @@ -493,4 +543,25 @@ } } } + + /** + * Convertit une collection de string, en une chaine + * séparée par des ",". + * + * @param collection collection to convert + * @return string + */ + protected static String collectionToString(Collection<String> collection) { + String str = ""; + + Iterator<String> it = collection.iterator(); + while(it.hasNext()) { + str += it.next(); + if(it.hasNext()) { + str += ","; + } + } + + return str; + } }

1 0