Author: tchemit Date: 2009-02-14 13:58:57 +0000 (Sat, 14 Feb 2009) New Revision: 1813 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: improve event (in conbo prefer itemStateChanged than actionPerformed) loading region in event thread 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-02-14 13:57:58 UTC (rev 1812) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-02-14 13:58:57 UTC (rev 1813) @@ -99,6 +99,9 @@ } protected void regionChange(){ final String name = fieldCurrentRegion.getSelectedItem().toString(); + if (log.isDebugEnabled()) { + log.debug(" selected " + name); + } setInfoText(_("isisfish.message.loading.region", name)); SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -242,7 +245,8 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id="fieldCurrentRegion" model='{getFieldCurrentRegionModel()}' onActionPerformed='regionChange()'/> + <JComboBox id="fieldCurrentRegion" model='{getFieldCurrentRegionModel()}' onItemStateChanged='regionChange()'/> + <!--JComboBox id="fieldCurrentRegion" model='{getFieldCurrentRegionModel()}' onActionPerformed='regionChange()'/--> </cell> </row> </Table> @@ -254,8 +258,8 @@ </JPanel> </JPanel> <JPanel id='inputPanePrincipal' layout='{getCardlayoutPrincipal()}'> - <NoneUI id='noneUI' constraints='{"none"}'/> - <JPanel id="inputPane" layout='{getCardlayout()}' constraints='{"normale"}'/> + <NoneUI id='noneUI' constraints='"none"'/> + <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> </JPanel> </JSplitPane> </JPanel> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-14 13:57:58 UTC (rev 1812) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-14 13:58:57 UTC (rev 1813) @@ -104,13 +104,20 @@ // } protected void regionChange(){ // le premier item est " " pour ne pas avoir de selection par defaut - String selected = fieldSimulParamsRegion.getSelectedItem().toString(); - if(selected != null && !selected.trim().isEmpty()) { - WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(_("isisfish.message.loading.region")); - getContextValue(SimulAction.class).regionChange(fieldSimulParamsRegion.getSelectedItem().toString()); - refresh(); - root.setInfoText(_("isisfish.message.region.loaded")); + final String selected = fieldSimulParamsRegion.getSelectedItem().toString(); + if (log.isDebugEnabled()) { + log.debug(" selected " + selected); + } + if(selected != null && !selected.trim().isEmpty()) { + getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.region")); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + getContextValue(SimulAction.class).regionChange(selected); + refresh(); + getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded")); + } + }); } } public void setSimulationParameter(SimulAction simulAction){ @@ -392,7 +399,8 @@ <JLabel text="isisfish.common.region"/> </cell> <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' onActionPerformed='regionChange()'/> + <JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' onItemStateChanged='regionChange()'/> + <!--JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' onActionPerformed='regionChange()'/--> </cell> </row> </Table>