Author: chatellier Date: 2009-06-02 12:45:12 +0000 (Tue, 02 Jun 2009) New Revision: 2303 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Log: Replace a non working binding Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-02 09:52:06 UTC (rev 2302) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-02 12:45:12 UTC (rev 2303) @@ -38,14 +38,9 @@ import fr.ifremer.isisfish.entities.FisheryRegion; import org.codelutin.topia.persistence.TopiaEntity; import javax.swing.JComponent; -import jaxx.runtime.SwingUtil; -import java.lang.reflect.Method; -import org.apache.commons.beanutils.MethodUtils; import fr.ifremer.isisfish.ui.util.UtilsUI; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; -import jaxx.runtime.JAXXInitialContext; // TODO comment this empty method !!! public void refresh() { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-06-02 09:52:06 UTC (rev 2302) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-06-02 12:45:12 UTC (rev 2303) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 + * Copyright (C) 2005 - 2009 * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,18 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> <fr.ifremer.isisfish.ui.input.InputContentUI> 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 09:52:06 UTC (rev 2302) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-02 12:45:12 UTC (rev 2303) @@ -40,10 +40,14 @@ getVerifier().setDeleteButton(remove); Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); + if (getBean() != null) { getVerifier().addCurrentPanel(strategyInactivity); setSetOfVesselsModel(); //fieldStrategyProportionSetOfVessels.init(); + + // code to replace bindings : + strategyInactivity.setActif(isActif() && getBean().getInactivityEquationUsed()); } else { // listener seam to be called after refresh and remove content :( @@ -51,6 +55,9 @@ //fieldStrategyProportionSetOfVessels.setModelText("0.0"); fieldStrategyProportionSetOfVessels.setText("0.0"); fieldStrategyComment.setText(""); + + // code to replace bindings : + strategyInactivity.setActif(isActif()); } } protected void setSetOfVesselsModel() { @@ -63,6 +70,12 @@ fieldStrategySetOfVessels.addActionListener(listener); } } + +protected void inactivityEquationActionPerformed() { + boolean checked = fieldUseEquationInactivity.isSelected(); + getBean().setInactivityEquationUsed(checked); + strategyInactivity.setActif(checked); +} ]]></script> <Table id='body'> <row> @@ -103,16 +116,18 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected());strategyInactivity.setActif(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed'/> + <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' + text="isisfish.strategy.inactivityEquationUsed" + onActionPerformed='inactivityEquationActionPerformed()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> <cell columns="2" fill='both' weightx='1.0'> <InputOneEquationUI id="strategyInactivity" constructorParams='this' - lblText='{_("isisfish.strategy.inactivity")}' actif='{fieldUseEquationInactivity.isSelected()}' - bean='{getBean()}' nameEquation='Inactivity' methodGet='InactivityEquation' methodSet='EquationInactivity' + lblText='{_("isisfish.strategy.inactivity")}' + bean='{getBean()}' nameEquation='Inactivity' methodGet='InactivityEquation' methodSet='EquationInactivity' clazz='{fr.ifremer.isisfish.equation.StrategyInactivityEquation.class}' - decorator='boxed' _bean='{StrategyImpl.class}' _method='"Inactivity"'/> + decorator='boxed' _bean='{StrategyImpl.class}' _method='"Inactivity"'/> <!-- bindings not work well actif='{getBean().getInactivityEquationUsed()}' --> </cell> </row> <row>