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

r2681 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/simulator/launcher main/resources/templates/ssh test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 21 Oct '09

21 Oct '09

Author: chatellier Date: 2009-10-21 11:58:23 +0000 (Wed, 21 Oct 2009) New Revision: 2681 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-cron.seq isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-qsub.seq isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Log: Ajout de la redirection de la sortie d'Isis vers un fichier avant que cela n'arrive sur qsub Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-10-21 09:54:29 UTC (rev 2680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-10-21 11:58:23 UTC (rev 2681) @@ -950,6 +950,7 @@ // context values Map<String, Object> root = new HashMap<String, Object>(); root.put("isishome", IsisFish.config.getSimulatorSshIsisHome()); + root.put("isistemp", getRemoteTempDirectory()); root.put("simulationid", simuationId); root.put("simulationzip", simulationZip); root.put("simulationresultzip", simulationZipResult); @@ -1035,6 +1036,8 @@ /** * Get remote directory absolute path. * + * Don't use File.separator here, caparmor is always unix. + * * @return remote temp directory path */ protected String getRemoteTempDirectory() { Modified: isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-cron.seq =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-cron.seq 2009-10-21 09:54:29 UTC (rev 2680) +++ isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-cron.seq 2009-10-21 11:58:23 UTC (rev 2681) @@ -3,7 +3,7 @@ cd "${isishome}" <#if simulationprescript?length > 0> -java -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" +java -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" >& "${isistemp}output-${simulationid}" <#else> -java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" -</#if> \ No newline at end of file +java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" >& "${isistemp}output-${simulationid}" +</#if> Modified: isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-qsub.seq =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-10-21 09:54:29 UTC (rev 2680) +++ isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-10-21 11:58:23 UTC (rev 2681) @@ -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}" +/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}" <#else> -/home3/caparmor/poussin/jdk1.6.0_13/bin/java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" -</#if> \ No newline at end of file +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" >& "${isistemp}output-${simulationid}" +</#if> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-10-21 09:54:29 UTC (rev 2680) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-10-21 11:58:23 UTC (rev 2681) @@ -64,15 +64,19 @@ final String SIMULATIONRESULTZIP = "/tmp/test-result.zip"; final String SIMULATIONPRESCRIPT = "prescript-1234567890.txt"; final String ISISHOME = IsisFish.config.getSimulatorSshIsisHome(); + final String ISISTMP = IsisFish.config.getSimulatorSshTmpPath(); SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); String content = launcher.getSimulationScriptLaunchContent( SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, SIMULATIONID, SIMULATIONZIP, SIMULATIONRESULTZIP, SIMULATIONPRESCRIPT); + if (log.isDebugEnabled()) { + log.debug("Script content = " + content); + } + // simulation parameters - Assert - .assertTrue("String \"" + SIMULATIONID + Assert.assertTrue("String \"" + SIMULATIONID + "\" not found in template", content .indexOf(SIMULATIONID) > 0); Assert.assertTrue("String \"" + SIMULATIONZIP @@ -91,6 +95,10 @@ // isis location Assert.assertTrue("String \"" + ISISHOME + "\" not found in template", content.indexOf(ISISHOME) > 0); + + // isis temp + Assert.assertTrue("String \"" + ISISTMP + "\" not found in template", + content.indexOf(ISISTMP) > 0); } /** @@ -113,15 +121,19 @@ final String SIMULATIONRESULTZIP = "/tmp/test-result.zip"; final String SIMULATIONPRESCRIPT = null; final String ISISHOME = IsisFish.config.getSimulatorSshIsisHome(); + final String ISISTMP = IsisFish.config.getSimulatorSshTmpPath(); SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); String content = launcher.getSimulationScriptLaunchContent( SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, SIMULATIONID, SIMULATIONZIP, SIMULATIONRESULTZIP, SIMULATIONPRESCRIPT); + if (log.isDebugEnabled()) { + log.debug("Script content = " + content); + } + // simulation parameters - Assert - .assertTrue("String \"" + SIMULATIONID + Assert.assertTrue("String \"" + SIMULATIONID + "\" not found in template", content .indexOf(SIMULATIONID) > 0); Assert.assertTrue("String \"" + SIMULATIONZIP @@ -136,9 +148,25 @@ // isis location Assert.assertTrue("String \"" + ISISHOME + "\" not found in template", content.indexOf(ISISHOME) > 0); + + // isis temp + Assert.assertTrue("String \"" + ISISTMP + "\" not found in template", + content.indexOf(ISISTMP) > 0); } /** + * Test get le chemin distant commence et fini toujours par / + */ + @Test + public void testGetRemoteTempDirectory() { + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + + String remoteTemp = launcher.getRemoteTempDirectory(); + Assert.assertTrue(remoteTemp.startsWith("/")); + Assert.assertTrue(remoteTemp.endsWith("/")); + } + + /** * Pour tester, un autre script est present, mais * celui ci ne doit jamais être utilisé hors des tests. *

1 0

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

21 Oct '09

Author: chatellier Date: 2009-10-21 09:54:29 +0000 (Wed, 21 Oct 2009) New Revision: 2680 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Log: Force ".zip" extension to be set 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-10-21 09:47:45 UTC (rev 2679) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-21 09:54:29 UTC (rev 2680) @@ -230,13 +230,20 @@ /** * Exporter la region dans un zip * - * @return TODO + * @param regionStorage storage to export + * @return file were region were exported */ public File exportRegion(RegionStorage regionStorage) { File file = null; try { file = FileUtil.getFile(".*.zip$", _("isisfish.message.import.region.zipped")); + + // add .zip extension is not set + if (!file.getAbsolutePath().endsWith(".zip")) { + file = new File(file.getAbsolutePath() + ".zip"); + } + if (file != null) { int resp = JOptionPane.YES_OPTION; if (file.exists()) {

1 0

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

21 Oct '09

Author: chatellier Date: 2009-10-21 09:47:45 +0000 (Wed, 21 Oct 2009) New Revision: 2679 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/InputUI.jaxx Log: Make delete action more "user friendly" 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-10-21 09:39:13 UTC (rev 2678) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-21 09:47:45 UTC (rev 2679) @@ -287,20 +287,17 @@ * * @param regionStorage region storage * @param cvsDelete if true delete region in CVS too - * @return status message + * @return removed region */ - public String removeRegion(RegionStorage regionStorage, boolean cvsDelete) { - String result = null; + public boolean removeRegion(RegionStorage regionStorage, boolean cvsDelete) { + boolean result = false; try { int resp = JOptionPane.showConfirmDialog(null, _( "isisfish.message.confirm.remove.region", regionStorage .getName())); if (resp == JOptionPane.YES_OPTION) { regionStorage.delete(cvsDelete); - result = _("isisfish.message.region.removed"); - - } else { - result = _("isisfish.message.region.remove.canceled"); + result = true; } } catch (Exception eee) { if (log.isErrorEnabled()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-10-21 09:39:13 UTC (rev 2678) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-10-21 09:47:45 UTC (rev 2679) @@ -204,8 +204,14 @@ } protected void removeRegion() { setStatusMessage(_("isisfish.message.removing.region", getRegionStorage().getName()), true); - setStatusMessage(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false)); - regionNull(); + boolean deleted = getContextValue(InputAction.class).removeRegion(getRegionStorage(), false); + if (deleted) { + setStatusMessage(_("isisfish.message.region.removed")); + regionNull(); + } + else { + setStatusMessage(_("isisfish.message.region.remove.canceled")); + } } protected void commitRegionInCVS() { setStatusMessage(_("isisfish.message.commiting.region", getRegionStorage().getName()), true); @@ -230,9 +236,6 @@ <JSeparator/> <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocalyRemotely" enabled='{getRegion() != null}' onActionPerformed="removeRegion()" accelerator="accRemove"/> </JMenu> -  </JMenuBar> <JSplitPane oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}' minimumSize="{new java.awt.Dimension(0,0)}">

1 0

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

21 Oct '09

Author: chatellier Date: 2009-10-21 09:39:13 +0000 (Wed, 21 Oct 2009) New Revision: 2678 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/InputUI.jaxx Log: Fix canceled copy action 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-10-21 09:25:45 UTC (rev 2677) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-21 09:39:13 UTC (rev 2678) @@ -31,6 +31,7 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixFactory; @@ -40,8 +41,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.widget.editor.Editor; -import com.bbn.openmap.layer.shape.SpatialIndex; - import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.datastore.FormuleStorage; import fr.ifremer.isisfish.datastore.RegionStorage; @@ -134,7 +133,8 @@ _("isisfish.message.import.region.zipped")); if (file != null) { - String newName = JOptionPane.showInputDialog(_("isisfish.message.name.imported.region")); + String newName = JOptionPane + .showInputDialog(_("isisfish.message.name.imported.region")); RegionStorage.importAndRenameZip(file, newName); } } catch (Exception eee) { @@ -180,8 +180,8 @@ String simulationName; try { //TODO Should use a shared model ? - simulationName = SimulationFilterUtil.selectSimulation(SimulationStorage - .getSimulationNames()); + simulationName = SimulationFilterUtil + .selectSimulation(SimulationStorage.getSimulationNames()); if (simulationName == null) { return null; } @@ -191,7 +191,8 @@ if (log.isWarnEnabled()) { log.warn(msg, eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.no.select.simulation"), eee); + ErrorHelper.showErrorDialog( + _("isisfish.error.no.select.simulation"), eee); return null; } @@ -258,14 +259,16 @@ /** * Copy la region avec un autre nom. * + * @param regionStorage region to copy * @return le nom de la nouvelle region */ public String copyRegion(RegionStorage regionStorage) { String newName = null; try { - newName = JOptionPane.showInputDialog(_("isisfish.message.new.region.name")); + newName = JOptionPane + .showInputDialog(_("isisfish.message.new.region.name")); - if (newName != null) { + if (!StringUtils.isEmpty(newName)) { File zip = regionStorage.createZip(); RegionStorage.importAndRenameZip(zip, newName); } @@ -355,7 +358,7 @@ if (log.isDebugEnabled()) { log.debug("loadRegion : " + name); } - + FisheryRegion region = null; try { RegionStorage regionStorage = null; @@ -594,7 +597,8 @@ */ public Object saveAsModel(String category, String language, String content) { try { - String name = JOptionPane.showInputDialog(_("isisfish.message.saveModel.dialog")); + String name = JOptionPane + .showInputDialog(_("isisfish.message.saveModel.dialog")); /*if ("".equals(name)) { showMsgBox("Error " +_("isisfish.error.invalid.equation.name")); }*/ @@ -608,7 +612,8 @@ if (log.isErrorEnabled()) { log.error("Can't save equation as model", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.equation.savemodel"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.equation.savemodel"), + eee); } return null; } @@ -630,7 +635,8 @@ if (log.isErrorEnabled()) { log.error("Can't open editor", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.equation.openeditor"), eee); + ErrorHelper.showErrorDialog( + _("isisfish.error.equation.openeditor"), eee); } return null; } @@ -660,7 +666,8 @@ if (log.isErrorEnabled()) { log.error("Can't add selectivity", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Selectivity"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "Selectivity"), eee); } return null; } @@ -677,7 +684,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove TargetSpecies", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "Selectivity"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + "Selectivity"), eee); } return null; } @@ -726,17 +734,18 @@ }*/ public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, - Species species, String targetFactorEquationContent, boolean primaryCatch) { + Species species, String targetFactorEquationContent, + boolean primaryCatch) { if (log.isDebugEnabled()) { log.debug("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquationContent); } try { // build targetFactorEquation name - String targetFactorEquationName = metier.getName() + "-" + species.getName() - + "(" + m.getFirstMonth() + "-" + m.getLastMonth() + ")"; - - + String targetFactorEquationName = metier.getName() + "-" + + species.getName() + "(" + m.getFirstMonth() + "-" + + m.getLastMonth() + ")"; + TargetSpeciesDAO dao = IsisFishDAOHelper.getTargetSpeciesDAO(metier .getTopiaContext()); TargetSpecies targetSpecies = dao.create(); @@ -752,7 +761,8 @@ if (log.isErrorEnabled()) { log.error("Can't add TargetSpecies", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "TargetSpecies"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "TargetSpecies"), eee); } return null; } @@ -770,7 +780,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove TargetSpecies", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "TargetSpecies"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + "TargetSpecies"), eee); } return null; } @@ -798,7 +809,8 @@ if (log.isErrorEnabled()) { log.error("Can't create EffortDescription", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "EffortDescription"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "EffortDescription"), eee); } } @@ -814,7 +826,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove entity: " + effort, eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "EffortDescription"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + "EffortDescription"), eee); } return null; } @@ -854,7 +867,8 @@ if (log.isErrorEnabled()) { log.error("Can't create Population", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Population"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "Population"), eee); } return null; } @@ -872,15 +886,16 @@ seasonInfo.setLastMonth(Month.MONTH[3]); pop.addPopulationSeasonInfo(seasonInfo); seasonInfo.setPopulation(pop); - + // EC-20090710 ajout du code d'initailisation // d'un populationseasoninfo // il a du se perdre au changement d'interface // swiat>jaxx seasonInfo.setSimpleLengthChangeMatrix(true); - MatrixND matrix = ((PopulationSeasonInfoImpl)seasonInfo).createNoSpacializedChangeGroupMatrix(); + MatrixND matrix = ((PopulationSeasonInfoImpl) seasonInfo) + .createNoSpacializedChangeGroupMatrix(); seasonInfo.setLengthChangeMatrix(matrix); - + seasonInfo.update(); pop.update(); // isisContext.commitTransaction(); @@ -888,7 +903,8 @@ if (log.isErrorEnabled()) { log.error("Can't create PopulationSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "PopulationSeasonInfo"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + "PopulationSeasonInfo"), eee); } return seasonInfo; } @@ -906,7 +922,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove PopulationSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "PopulationSeasonInfo"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + "PopulationSeasonInfo"), eee); } } @@ -928,7 +945,8 @@ if (log.isErrorEnabled()) { log.error("Can't create MetierSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "MetierSeasonInfo"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "MetierSeasonInfo"), eee); } } @@ -945,7 +963,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove MetierSeasonInfo", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "MetierSeasonInfo"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "MetierSeasonInfo"), eee); } } @@ -986,7 +1005,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove RecruitmentDistribution", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "RecruitmentDistribution"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", + "RecruitmentDistribution"), eee); } return null; } @@ -1007,7 +1027,8 @@ if (log.isErrorEnabled()) { log.error("Can't add migration", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Migration"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "Migration"), eee); } return null; } @@ -1026,7 +1047,8 @@ if (log.isErrorEnabled()) { log.error("Can't add emigration", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Emigration"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "Emigration"), eee); } return null; } @@ -1045,13 +1067,14 @@ if (log.isErrorEnabled()) { log.error("Can't add immigration", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Immigration"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", + "Immigration"), eee); } return null; } // FisheryRegion - + /** * Add new map in region. * @@ -1136,7 +1159,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove map", eee); } - ErrorHelper.showErrorDialog(_("isisfish.error.region.removemap"), eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.removemap"), + eee); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-10-21 09:25:45 UTC (rev 2677) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-10-21 09:39:13 UTC (rev 2678) @@ -197,7 +197,9 @@ setStatusMessage(_("isisfish.message.export.done")); } protected void copyRegion() { - setStatusMessage(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion(getRegionStorage())), true); + // TODO region name in not knwon before copy + setStatusMessage(_("isisfish.message.copy.region"), true); + getContextValue(InputAction.class).copyRegion(getRegionStorage()); setStatusMessage(_("isisfish.message.copy.finished")); } protected void removeRegion() {

1 0

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

21 Oct '09

Author: chatellier Date: 2009-10-21 09:25:45 +0000 (Wed, 21 Oct 2009) New Revision: 2677 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Log: Fix canceled copy action 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-10-21 09:09:33 UTC (rev 2676) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-21 09:25:45 UTC (rev 2677) @@ -265,8 +265,10 @@ try { newName = JOptionPane.showInputDialog(_("isisfish.message.new.region.name")); - File zip = regionStorage.createZip(); - RegionStorage.importAndRenameZip(zip, newName); + if (newName != null) { + File zip = regionStorage.createZip(); + RegionStorage.importAndRenameZip(zip, newName); + } } catch (Exception eee) { if (log.isErrorEnabled()) {

1 0

r2676 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity
by chatellier＠users.labs.libre-entreprise.org 21 Oct '09

21 Oct '09

Author: chatellier Date: 2009-10-21 09:09:33 +0000 (Wed, 21 Oct 2009) New Revision: 2676 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java Log: Maybe hudson will be happy with closed context ? Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2009-10-20 13:21:50 UTC (rev 2675) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2009-10-21 09:09:33 UTC (rev 2676) @@ -195,6 +195,7 @@ log.debug(zone + " - " + zone.getClass().getName()); context.rollbackTransaction(); + context.closeContext(); } @@ -352,6 +353,7 @@ o = ps.update(o); } context.rollbackTransaction(); + context.closeContext(); } @Test @@ -496,6 +498,7 @@ log.debug(list + " - " +ps.getClass().getName()); } context.rollbackTransaction(); + context.closeContext(); } /* public void testDelete() throws Exception {

1 0

r2675 - isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 20 Oct '09

20 Oct '09

Author: chatellier Date: 2009-10-20 13:21:50 +0000 (Tue, 20 Oct 2009) New Revision: 2675 Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml Log: Rename tag value form "order-by" to "orderBy" Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-10-20 13:21:35 UTC (rev 2674) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-10-20 13:21:50 UTC (rev 2675) @@ -14,7 +14,7 @@ <key column="possibleMetiers"/> <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="metierSeasonInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="false"> + <bag name="metierSeasonInfo" inverse="true" order-by="firstMonth, lastMonth" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="false"> <key column="metier"/> <one-to-many class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" node="topiaId" embed-xml="false"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-10-20 13:21:35 UTC (rev 2674) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-10-20 13:21:50 UTC (rev 2675) @@ -47,11 +47,11 @@ <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="populationGroup" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="false"> + <bag name="populationGroup" order-by="id" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="false"> <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.PopulationGroupImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="populationSeasonInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="false"> + <bag name="populationSeasonInfo" inverse="true" order-by="firstMonth, lastMonth" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="false"> <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" node="topiaId" embed-xml="false"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-10-20 13:21:35 UTC (rev 2674) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-10-20 13:21:50 UTC (rev 2675) @@ -11,7 +11,7 @@ <property name="inactivityEquationUsed" type="boolean" access="field" column="inactivityEquationUsed" node="inactivityEquationUsed"/> <many-to-one name="inactivityEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="inactivityEquation" cascade="delete" node="inactivityEquation/@topiaId" embed-xml="false"/> <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false"/> - <bag name="strategyMonthInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="false"> + <bag name="strategyMonthInfo" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="false"> <key column="strategy"/> <one-to-many class="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" node="topiaId" embed-xml="false"/> </bag>

1 0

r2674 - isis-fish/trunk/src/main/xmi
by chatellier＠users.labs.libre-entreprise.org 20 Oct '09

20 Oct '09

Author: chatellier Date: 2009-10-20 13:21:35 +0000 (Tue, 20 Oct 2009) New Revision: 2674 Modified: isis-fish/trunk/src/main/xmi/isis-fish.zargo Log: Rename tag value form "order-by" to "orderBy" Modified: isis-fish/trunk/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ)

1 0

r2673 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 20 Oct '09

20 Oct '09

Author: chatellier Date: 2009-10-20 13:20:33 +0000 (Tue, 20 Oct 2009) New Revision: 2673 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Fix compilation directory per simulation problem (aspect were defined before simulation context definition) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-10-20 12:44:50 UTC (rev 2672) +++ isis-fish/trunk/changelog.txt 2009-10-20 13:20:33 UTC (rev 2673) @@ -1,11 +1,20 @@ isis-fish (3.3.0.0) stable; urgency=low + * Fix a depth commit problem on script UI + * Readd diff on script UI * Update to svnkit 1.3.1 * Unification of error frames * Move codelutin libs to nuiton.org -- mar. oct. 13 09:48:15 CEST 2009 +isis-fish (3.2.0.8) stable; urgency=high + + * Fix compilation directory per simulation problem (aspect were defined + before simulation context definition) + + -- mar. oct. 20 12:21:46 CEST 2009 + isis-fish (3.2.0.7) stable; urgency=low * Fix a missing hashCode() problem in month (cause problem in matrixND) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-20 12:44:50 UTC (rev 2672) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-20 13:20:33 UTC (rev 2673) @@ -318,21 +318,22 @@ File rootDirectory = simulation.getDirectory(); // - // changement de classloader - // - classLoader = changeClassLoader(Thread.currentThread(), - rootDirectory); - - // // Creation et initialisation du context de simulation // SimulationContext context = SimulationContext.get(); + context.setSimulationControl(control != null ? control + : new SimulationControl(simulation.getName())); + + // changement de classloader + // IMPORTANT : must be set AFTER : + // - SimulationContext.get(); + // - context.setSimulationControl() + classLoader = changeClassLoader(Thread.currentThread(), rootDirectory); + context.setClassLoader(classLoader); context.setScriptDirectory(rootDirectory); context.setSimulationStorage(simulation); - context.setSimulationControl(control != null ? control - : new SimulationControl(simulation.getName())); - + // Warning : Rule have to be instanciated after aspect definition classLoader.deploy(RuleAspect.class);

1 0

r2672 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 20 Oct '09

20 Oct '09

Author: chatellier Date: 2009-10-20 12:44:50 +0000 (Tue, 20 Oct 2009) New Revision: 2672 Added: isis-fish/tags/isis-fish-3.2.0.8/ Log: Tag version 3.2.0.8

1 0