Author: chatellier Date: 2009-06-02 15:46:28 +0000 (Tue, 02 Jun 2009) New Revision: 2310 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx Log: Fix refresh cancel UI Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-06-02 15:46:04 UTC (rev 2309) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-06-02 15:46:28 UTC (rev 2310) @@ -42,8 +42,8 @@ fieldStrategyMonthInfoProportion.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (fieldStrategyMonthInfoProportion.getMatrix() != null){ - if (fieldStrategyMonthInfoProportion.getMatrix() != null){ + if (fieldStrategyMonthInfoProportion.getMatrix() != null) { + if (fieldStrategyMonthInfoProportion.getMatrix() != null) { getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); } } @@ -52,7 +52,12 @@ public void refresh() { Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); - setBean((StrategyImpl) strategy); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); + setBean((StrategyImpl)strategy); + if (getBean() != null) { Object[] monthInfos = getBean().getStrategyMonthInfo().toArray(); if (monthInfos.length != 0) { @@ -124,7 +129,7 @@ </cell> <cell fill='horizontal' weightx='0.5' anchor='west'> <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}' - decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> + decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> </cell> </row> <row> @@ -138,14 +143,14 @@ _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/--> <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> + enabled='{isActif()}' decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' - enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> + enabled='{isActif()}' decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-02 15:46:04 UTC (rev 2309) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-02 15:46:28 UTC (rev 2310) @@ -46,12 +46,13 @@ setBean((StrategyImpl) strategy); if (getBean() != null) { - getVerifier().addCurrentPanel(strategyInactivity); setSetOfVesselsModel(); //fieldStrategyProportionSetOfVessels.init(); // code to replace bindings : strategyInactivity.setActif(isActif() && getBean().getInactivityEquationUsed()); + + getVerifier().addCurrentPanel(strategyInactivity); } else { // listener seam to be called after refresh and remove content :( Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-02 15:46:04 UTC (rev 2309) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-02 15:46:28 UTC (rev 2310) @@ -22,17 +22,21 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; -getVerifier().addCurrentPanel(this); public void refresh() { + // is this add needed ? + //getVerifier().addCurrentPanel(this); + if (isSens()){ strategyTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { strategyTab.addChangeListener(new InputTabbedPaneListener()); } + + getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> - <JTabbedPane id="strategyTab" name="Strategy" constraints='BorderLayout.CENTER'> + <JTabbedPane id="strategyTab" constraints='BorderLayout.CENTER'> <tab title='isisfish.strategy.title'> <StrategyTabUI id='strategyTabUI' constructorParams='this'/> </tab>