Author: kmorin Date: 2014-11-06 14:36:18 +0100 (Thu, 06 Nov 2014) New Revision: 4125 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4125 Log: fixes #5491 Erreur apr?\195?\168s la copie ou l'export d'une r?\195?\169gion add a waiting cursor when loading a region Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-11-05 17:48:02 UTC (rev 4124) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-11-06 13:36:18 UTC (rev 4125) @@ -123,8 +123,8 @@ TopiaContext tx = getStorage().beginTransaction(); tx.backup(file, true); - //tx.closeContext(); - closeStorage(); + tx.closeContext(); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(t("isisfish.error.prepare.data"), eee); } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-11-05 17:48:02 UTC (rev 4124) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-11-06 13:36:18 UTC (rev 4125) @@ -106,6 +106,8 @@ String simId = s.getName(); File zip = s.createZip(); + s.closeStorage(); + SimulationParameter childParam = s.getParameter(); int childNumber = childParam.getSimulationPlanNumber(); SimulationControl childControl = new SimulationControl(simId); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-11-05 17:48:02 UTC (rev 4124) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-11-06 13:36:18 UTC (rev 4125) @@ -26,7 +26,7 @@ import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; -import java.awt.BorderLayout; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.io.File; @@ -211,8 +211,10 @@ setStatusMessage(inputUI, t("isisfish.message.loading.region", name), true); SwingUtilities.invokeLater(new Runnable() { public void run() { + inputUI.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); loadRegion(inputUI, name); setStatusMessage(inputUI, t("isisfish.message.load.finished")); + inputUI.setCursor(Cursor.getDefaultCursor()); } }); }