Author: kmorin Date: 2014-11-06 16:33:02 +0100 (Thu, 06 Nov 2014) New Revision: 4126 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4126 Log: fixes #3885 zone de selection (fixed in nuiton-matrix: https://nuiton.org/issues/3566) Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-11-06 13:36:18 UTC (rev 4125) +++ trunk/pom.xml 2014-11-06 15:33:02 UTC (rev 4126) @@ -95,14 +95,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> <scope>compile</scope> </dependency> 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-06 13:36:18 UTC (rev 4125) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-11-06 15:33:02 UTC (rev 4126) @@ -209,9 +209,10 @@ // long operation, run status bar setStatusMessage(inputUI, t("isisfish.message.loading.region", name), true); + inputUI.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + 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()); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-11-06 13:36:18 UTC (rev 4125) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-11-06 15:33:02 UTC (rev 4126) @@ -53,6 +53,7 @@ javax.swing.SwingUtilities javax.swing.DefaultComboBoxModel java.awt.CardLayout + java.awt.Cursor java.awt.Dimension java.io.IOException javax.swing.DefaultListModel @@ -189,9 +190,12 @@ // le premier item est " " pour ne pas avoir de selection par defaut if (selected != null && !selected.equals(" ")) { getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.loading.old.simulation")); + setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + SwingUtilities.invokeLater(new Runnable() { @Override public void run() { + simulAction.loadOldSimulation(selected); fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName()); @@ -211,6 +215,7 @@ ruleChooser.setRulesList(simulAction.getSimulationParameter().getRules()); getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.old.simulation.loaded")); + setCursor(Cursor.getDefaultCursor()); } }); }