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

r2759 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org Nov. 17, 2009

Nov. 17, 2009

Author: chatellier Date: 2009-11-17 13:15:23 +0000 (Tue, 17 Nov 2009) New Revision: 2759 Modified: isis-fish/trunk/src/main/resources/sensitivity.properties Log: Fix sensitivity enabled factor name. Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-11-17 10:24:31 UTC (rev 2758) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-11-17 13:15:23 UTC (rev 2759) @@ -1,3 +1,4 @@ +# this file contains authorized entities factors creation EffortDescription.CrewFoodCost EffortDescription.CrewShareRate EffortDescription.CrewSize @@ -12,7 +13,6 @@ Gear.PossibleValue Gear.StandardisationFactor Metier.GearParameterValue -Metier.Zone Population.Capturability Population.GeographicId PopulationGroup.ReproductionRate @@ -31,8 +31,7 @@ SetOfVessels.FixedCosts SetOfVessels.NumberOfVessels SetOfVessels.TechnicalEfficiencyEquation -Strategy.Inactivity -StrategyMonthInfo.LengthChangeMatrix +Strategy.InactivityEquation StrategyMonthInfo.MinInactivityDays StrategyMonthInfo.ProportionMetier Strategy.ProportionSetOfVessels

1 0

r2758 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Nov. 17, 2009

Nov. 17, 2009

Author: chatellier Date: 2009-11-17 10:24:31 +0000 (Tue, 17 Nov 2009) New Revision: 2758 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 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: Add confirmation message before launching groups creation wizard Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-11-16 13:38:26 UTC (rev 2757) +++ isis-fish/trunk/changelog.txt 2009-11-17 10:24:31 UTC (rev 2758) @@ -1,5 +1,6 @@ isis-fish (3.3.0.0) stable; urgency=low + * Add confirmation message before launching groups creation wizard * Fix metierSeasonInfo deletion (#1914) * Remove some deprecated unused UI classes * Remove all GenericCell reference (now model based implementation) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-11-16 13:38:26 UTC (rev 2757) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-11-17 10:24:31 UTC (rev 2758) @@ -78,23 +78,33 @@ getVerifier().setNewButton(create, "Population", false); getVerifier().setDeleteButton(remove); } + +/** + * Open creation classe wizard after confirmation. + */ +protected void createGroups() { + + int response = JOptionPane.showConfirmDialog(this, _("isisfish.populationBasics.confirmCreateGroups"), _("isisfish.common.confirm"), + JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); -protected void createClasses(){ - JFrame wizardFrame = new JFrame(); - wizardFrame.setLayout(new BorderLayout()); - WizardGroupCreationUI wizard = new WizardGroupCreationUI(this); - wizard.init(this); - wizardFrame.add(wizard, BorderLayout.CENTER); - wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title")); - wizardFrame.setVisible(true); - wizardFrame.pack(); - wizard.setAgeType(getBean().getSpecies().getAgeGroupType()); - if (wizard.isAgeType()) { - wizard.setCard("singleGroupAge"); - } else { - wizard.setCard("beginGroupLength"); + if (response == JOptionPane.YES_OPTION) { + JFrame wizardFrame = new JFrame(); + wizardFrame.setLayout(new BorderLayout()); + WizardGroupCreationUI wizard = new WizardGroupCreationUI(this); + wizard.init(this); + wizardFrame.add(wizard, BorderLayout.CENTER); + wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title")); + wizard.setAgeType(getBean().getSpecies().getAgeGroupType()); + if (wizard.isAgeType()) { + wizard.setCard("singleGroupAge"); + } else { + wizard.setCard("beginGroupLength"); + } + wizardFrame.pack(); + wizardFrame.setVisible(true); + //refresh(); } - refresh(); + } protected void matureClassChanged(){ Object selected = fieldPopulationBasicsMatureClass.getSelectedItem(); @@ -161,7 +171,7 @@ <JTextField id="fieldPopulationBasicsNbClasses" text='{getBean() == null ? "" : getBean().sizePopulationGroup()}' editable="false" enabled='{isActif()}' decorator='boxed'/> </cell> <cell fill='horizontal'> - <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' enabled='{isActif()}' decorator='boxed'/> + <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createGroups()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> 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-11-16 13:38:26 UTC (rev 2757) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-11-17 10:24:31 UTC (rev 2758) @@ -93,6 +93,7 @@ isisfish.common.cancel=Cancel isisfish.common.check=Check isisfish.common.clear=Clear +isisfish.common.confirm=Confirm isisfish.common.date=Date isisfish.common.debug=debug isisfish.common.delete=Delete @@ -633,7 +634,7 @@ isisfish.message.import.zip=Import zip file isisfish.message.launchui.notlaunch= isisfish.message.load.finished=load finished -isisfish.message.load.map=Try to load map file\: %1$s (%2$s, %3$s) +isisfish.message.load.map=Try to load map file\: %1$s (%2$s) isisfish.message.loading.old.simulation=Loading old simulation ... isisfish.message.loading.region=Loading region ... isisfish.message.name.imported.region=Enter name for imported region @@ -732,6 +733,7 @@ isisfish.population.reproduction=Reproduction isisfish.population.season=Season isisfish.population.zones=Zones +isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier isisfish.populationBasics.growth=Growth isisfish.populationBasics.growthReverse=Reverse growth 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-11-16 13:38:26 UTC (rev 2757) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-11-17 10:24:31 UTC (rev 2758) @@ -93,6 +93,7 @@ isisfish.common.cancel=Annuler isisfish.common.check=V\u00E9rifier isisfish.common.clear=Effacer +isisfish.common.confirm=Confirmation isisfish.common.date=Date isisfish.common.debug=Debug isisfish.common.delete=Supprimer @@ -633,7 +634,7 @@ isisfish.message.import.zip=Import zip file isisfish.message.launchui.notlaunch=Interface utilisateur non lanc\u00E9e isisfish.message.load.finished=Chargement termin\u00E9 -isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s, %3$s) +isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s) isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ... isisfish.message.loading.region=Chargement de la r\u00E9gion isisfish.message.name.imported.region=Entrez le nom de la r\u00E9gion \u00E0 importer @@ -732,6 +733,7 @@ isisfish.population.reproduction=Reproduction isisfish.population.season=Saison isisfish.population.zones=Zones +isisfish.populationBasics.confirmCreateGroups=Attention, la re-cr\u00E9ation des groupes supprimera les groupes existants et tous les objets qui en d\u00E9pendent.\n\u00CAtes vous sur de vouloir re-cr\u00E9er les groupes ? isisfish.populationBasics.geographicID=Identifiant g\u00E9ographique isisfish.populationBasics.growth=Croissance isisfish.populationBasics.growthReverse=Croissance inverse @@ -884,7 +886,7 @@ isisfish.script.cut=Couper isisfish.script.cut.tooltip=Couper la s\u00E9lection courante (Ctrl-x) isisfish.script.evaluate=\u00C9valuer -isisfish.script.evaluate.tooltip=Lance le script (doit contenir un methode main() pour fonctionner) +isisfish.script.evaluate.tooltip=Lance le script (doit contenir une methode main() pour fonctionner) isisfish.script.export=Exporter isisfish.script.export.checkAll=Tout (d\u00E9-)s\u00E9lectionner isisfish.script.export.chooseDir=...

1 0

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

Nov. 16, 2009

Author: chatellier Date: 2009-11-16 13:38:26 +0000 (Mon, 16 Nov 2009) New Revision: 2757 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Modify independent analyze plan loop to known which simulation is the last one. 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-11-13 08:53:26 UTC (rev 2756) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-11-16 13:38:26 UTC (rev 2757) @@ -712,7 +712,7 @@ } } catch (Exception eee) { // add manual log - // we are in a thread, IsisFishRuntimeException is displyed + // we are in a thread, IsisFishRuntimeException is displayed // outside a log if (log.isErrorEnabled()) { log.error(_("isisfish.error.evaluate.preplan.script"), eee); @@ -723,8 +723,14 @@ /** * Genere toutes les sous simulations et les places dans la queue. + * + * Cette methode {@code run()} est appelée seulement dans le cas de la + * génération de plans indépendants. + * + * @see SimulationJob#run() pour les plans dépendants */ public void run() { + /* Original code while (hasNext()) { try { SimulationJob subJob = next(); @@ -739,8 +745,48 @@ .getControl().getId()), eee); } } + }*/ + + // New iteration remember always simulation N and N+1 + // needed to know witch simulation is the last one + // get simulation N + SimulationJob subJobN = null; + if (hasNext()) { + subJobN = next(); } + while (subJobN != null) { + + try { + if (log.isInfoEnabled()) { + log.info("Simulation generated: " + subJobN.getId()); + } + + // set item additionnal informations + SimulationItem itemN = subJobN.getItem(); + itemN.setStandaloneSimulation(true); // idependant plan + // - 1 because planContext.getNumber() is set to next simulation to generate + itemN.setSimulationNumber(planContext.getNumber() - 1); + + // job N+1 + // carefull call this next after itemN.setSimulationNumber() + SimulationJob subJobNp1 = next(); + if (subJobNp1 == null) { + // there is no N+1 job, N is the last one + itemN.setLastSimulation(true); + } + + simulationService.submitSubJob(subJobN); + + subJobN = subJobNp1; + } + catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error(_("Can't add simulation: %s", job.getItem() + .getControl().getId()), eee); + } + } + } } /**

1 0

r2756 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 13, 2009

Nov. 13, 2009

Author: chatellier Date: 2009-11-13 08:53:26 +0000 (Fri, 13 Nov 2009) New Revision: 2756 Modified: isis-fish/trunk/changelog.txt Log: Merge changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-11-12 17:31:36 UTC (rev 2755) +++ isis-fish/trunk/changelog.txt 2009-11-13 08:53:26 UTC (rev 2756) @@ -1,5 +1,6 @@ isis-fish (3.3.0.0) stable; urgency=low + * Fix metierSeasonInfo deletion (#1914) * Remove some deprecated unused UI classes * Remove all GenericCell reference (now model based implementation) * Add missing log category in simulation filter appender @@ -12,11 +13,18 @@ -- mar. oct. 13 09:48:15 CEST 2009 +isis-fish (3.2.0.10) stable; urgency=high + + * Increase default java memory for caparmor jobs (2Go) + * Fix a problem with dependant plans not blocked on current simulation + + -- jeu. nov. 12 18:05:49 CET 2009 + isis-fish (3.2.0.9) stable; urgency=high * Add file redirection in caparmor simulation launch scripts --- mer. oct. 21 14:27:05 CEST 2009 + -- mer. oct. 21 14:27:05 CEST 2009 isis-fish (3.2.0.8) stable; urgency=high

1 0

r2755 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org Nov. 12, 2009

Nov. 12, 2009

Author: chatellier Date: 2009-11-12 17:31:36 +0000 (Thu, 12 Nov 2009) New Revision: 2755 Added: isis-fish/tags/isis-fish-3.2.0.10/ Log: Tag version 3.2.0.10

1 0

r2754 - in isis-fish/branches/isis-fish-3.2.0.8: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Nov. 12, 2009

Nov. 12, 2009

Author: chatellier Date: 2009-11-12 17:23:20 +0000 (Thu, 12 Nov 2009) New Revision: 2754 Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt isis-fish/branches/isis-fish-3.2.0.8/pom.xml isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java Log: Fix a problem with dependant plans not blocked on current simulation Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-11-12 17:15:10 UTC (rev 2753) +++ isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-11-12 17:23:20 UTC (rev 2754) @@ -1,7 +1,7 @@ isis-fish (3.2.0.10) stable; urgency=high * Increase default java memory for caparmor jobs (2Go) - * Fix a problem with dependant plans not bloqued on current simulation + * Fix a problem with dependant plans not blocked on current simulation -- jeu. nov. 12 18:05:49 CET 2009 Modified: isis-fish/branches/isis-fish-3.2.0.8/pom.xml =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/pom.xml 2009-11-12 17:15:10 UTC (rev 2753) +++ isis-fish/branches/isis-fish-3.2.0.8/pom.xml 2009-11-12 17:23:20 UTC (rev 2754) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.9</version> + <version>3.2.0.10</version>  <dependencies> @@ -585,9 +585,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.9</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.9</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> </scm>  Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-11-12 17:15:10 UTC (rev 2753) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-11-12 17:23:20 UTC (rev 2754) @@ -121,7 +121,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 9); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 10); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber( Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-11-12 17:15:10 UTC (rev 2753) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-11-12 17:23:20 UTC (rev 2754) @@ -218,6 +218,18 @@ SimulationJob subjob = i.next(); subjob.setLauncher(getLauncher()); subjob.run(); + + // FIXME temp fix les thread des launchers + // ne sont plus bloquants + // on bloque le thread par un sleep + // tant que le sous thread n'est pas fini + SimulationItem subItem = subjob.getItem(); + SimulationControl subControl = subItem.getControl(); + do { + Thread.sleep(2000); + } while (!subControl.isStopSimulationRequest() && + (subControl.getProgress() == 0 || control.getProgress() < control.getProgressMax()) + && !SimulationStorage.exists(control.getId())); } // nettoyage si besoin apres toutes les simulations

1 0

r2753 - in isis-fish/branches/isis-fish-3.2.0.8: . src/main/resources/templates/ssh
by chatellier＠users.labs.libre-entreprise.org Nov. 12, 2009

Nov. 12, 2009

Author: chatellier Date: 2009-11-12 17:15:10 +0000 (Thu, 12 Nov 2009) New Revision: 2753 Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq Log: Increase heap memory for non AS simulation too Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-11-12 16:07:02 UTC (rev 2752) +++ isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-11-12 17:15:10 UTC (rev 2753) @@ -1,3 +1,10 @@ +isis-fish (3.2.0.10) stable; urgency=high + + * Increase default java memory for caparmor jobs (2Go) + * Fix a problem with dependant plans not bloqued on current simulation + + -- jeu. nov. 12 18:05:49 CET 2009 + isis-fish (3.2.0.9) stable; urgency=high * Add file redirection in caparmor simulation launch scripts @@ -2,3 +9,3 @@ --- mer. oct. 21 14:27:05 CEST 2009 + -- mer. oct. 21 14:27:05 CEST 2009 @@ -9,7 +16,7 @@ * Fix compilation directory per simulation problem (aspect were defined before simulation context definition) --- mar. oct. 20 12:21:46 CEST 2009 + -- mar. oct. 20 12:21:46 CEST 2009 isis-fish (3.2.0.7) stable; urgency=low Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-11-12 16:07:02 UTC (rev 2752) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-11-12 17:15:10 UTC (rev 2753) @@ -6,7 +6,7 @@ module load java/1.6.0 <#if simulationprescript?length > 0> -/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" >& "${isistemp}output-${simulationid}" +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2000M -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" >& "${isistemp}output-${simulationid}" <#else> -/home3/caparmor/poussin/jdk1.6.0_13/bin/java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" >& "${isistemp}output-${simulationid}" +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2000M -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" >& "${isistemp}output-${simulationid}" </#if> \ No newline at end of file

1 0

r2752 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org Nov. 12, 2009

Nov. 12, 2009

Author: chatellier Date: 2009-11-12 16:07:02 +0000 (Thu, 12 Nov 2009) New Revision: 2752 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java Log: Use List interface instead of Impl Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2009-11-12 13:53:13 UTC (rev 2751) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2009-11-12 16:07:02 UTC (rev 2752) @@ -45,11 +45,11 @@ /** serialVersionUID */ private static final long serialVersionUID = 1L; - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getMapFileList() */ public List<String> getMapFileList() { - ArrayList<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<String>(); String mapfiles = getMapFiles(); if (mapfiles != null) { String[] mapNames = mapfiles.split(","); @@ -62,7 +62,7 @@ return result; } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#setMapFileList(java.util.List) */ public void setMapFileList(List<String> maps) { @@ -77,12 +77,12 @@ setMapFiles(result.toString()); } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getMapFilePath() */ public List<String> getMapFilePath() { List<String> mapNames = getMapFileList(); - ArrayList<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<String>(); RegionStorage regionStorage = RegionStorage.getRegion(getName()); for (String mapName : mapNames) { result.add(regionStorage.getMapRepository().getPath() @@ -91,7 +91,7 @@ return result; } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getPort() */ public List<Port> getPort() { @@ -104,7 +104,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getCell() */ public List<Cell> getCell() { @@ -117,7 +117,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getVesselType() */ public List<VesselType> getVesselType() { @@ -131,7 +131,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getGear() */ public List<Gear> getGear() { @@ -144,7 +144,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getMetier() */ public List<Metier> getMetier() { @@ -157,7 +157,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getSetOfVessels() */ public List<SetOfVessels> getSetOfVessels() { @@ -171,7 +171,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getSpecies() */ public List<Species> getSpecies() { @@ -184,7 +184,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getStrategy() */ public List<Strategy> getStrategy() { @@ -198,7 +198,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getTripType() */ public List<TripType> getTripType() { @@ -212,7 +212,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegion#getZone() */ public List<Zone> getZone() { @@ -225,7 +225,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() */ @Override

1 0

r2751 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org Nov. 12, 2009

Nov. 12, 2009

Author: chatellier Date: 2009-11-12 13:53:13 +0000 (Thu, 12 Nov 2009) New Revision: 2751 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Log: Don't not commit modification, will be saved later by user. And comiting transaction twice cause hibernate error "Found two representations of same collection:" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-11-12 10:31:28 UTC (rev 2750) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-11-12 13:53:13 UTC (rev 2751) @@ -825,7 +825,9 @@ } try { sov.removePossibleMetiers(effort); - sov.getTopiaContext().commitTransaction(); + // EC-20091112 : commit() twice cause hibernate error: + // Found two representations of same collection: + //sov.getTopiaContext().commitTransaction(); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't remove entity: " + effort, eee); @@ -865,7 +867,9 @@ pop.setSpecies(species); species.update(); pop.update(); - context.commitTransaction(); + // EC-20091112 : commit() twice cause hibernate error: + // Found two representations of same collection: + //context.commitTransaction(); return pop; } catch (Exception eee) { if (log.isErrorEnabled()) { @@ -921,7 +925,7 @@ try { pop.removePopulationSeasonInfo(populationSeasonInfo); pop.update(); - pop.getTopiaContext().commitTransaction(); + //pop.getTopiaContext().commitTransaction(); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't remove PopulationSeasonInfo", eee); @@ -944,6 +948,9 @@ metier.addMetierSeasonInfo(metierSeasonInfo); metierSeasonInfo.update(); metier.update(); + + // EC-20091112 : commit() twice cause hibernate error: + // Found two representations of same collection: // isisContext.commitTransaction(); } catch (Exception eee) { if (log.isErrorEnabled()) { @@ -961,7 +968,10 @@ try { metier.removeMetierSeasonInfo(info); metier.update(); - metier.getTopiaContext().commitTransaction(); + + // EC-20091112 : commit() twice cause hibernate error: + // Found two representations of same collection: + //metier.getTopiaContext().commitTransaction(); } catch (Exception eee) { if (log.isErrorEnabled()) {

1 0

r2750 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 12, 2009

Nov. 12, 2009

Author: chatellier Date: 2009-11-12 10:31:28 +0000 (Thu, 12 Nov 2009) New Revision: 2750 Modified: isis-fish/trunk/pom.xml Log: Set new mailing lists Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-11-10 18:02:24 UTC (rev 2749) +++ isis-fish/trunk/pom.xml 2009-11-12 10:31:28 UTC (rev 2750) @@ -374,17 +374,17 @@ </mailingList> <mailingList> <name>isis-fish-devel</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-devel</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-devel</unsubscribe> - <post>isis-fish-devel at lists.lists.labs.libre-entreprise.org</post> - <archive>http://lists.labs.libre-entreprise.org/pipermail/isis-fish-devel/</archive> + <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-devel</subscribe> + <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-devel</unsubscribe> + <post>isis-fish-devel at list.isis-fish.org</post> + <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-devel/</archive> </mailingList> <mailingList> <name>isis-fish-user</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-user</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-user</unsubscribe> - <post>isis-fish-user at lists.lists.labs.libre-entreprise.org</post> - <archive>http://lists.labs.libre-entreprise.org/pipermail/isis-fish-user/</archive> + <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user</subscribe> + <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user</unsubscribe> + <post>isis-fish-user at list.isis-fish.org</post> + <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user/</archive> </mailingList> </mailingLists>

1 0