Author: chatellier Date: 2010-01-22 15:38:16 +0000 (Fri, 22 Jan 2010) New Revision: 2936 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/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Log: Simplify input one equation ui. Use less parameters based on conventions. 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 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 + * Copyright (C) 2005 - 2010 * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -18,34 +18,38 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ --> - <fr.ifremer.isisfish.ui.input.InputContentUI> - <!-- bean property --> - <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> - <String id='lblText' javaBean='null'/> + <!-- Equation name (just for display purpose, not mandatory) --> + <String id='text' javaBean='null'/> + <!-- Bean containing equation --> <org.nuiton.topia.persistence.TopiaEntity id='bean' javaBean='null'/> + <!-- Bean property used to access equation --> + <String id='beanProperty' javaBean='null'/> + <!-- Used to get documentation in opened editor (not mandatory) --> <Class id='clazz' javaBean='null'/> - <String id='methodGet' javaBean='null'/> - <String id='methodSet' javaBean='null'/> - <String id='nameEquation' javaBean='null'/> + + <!-- Bean property --> + <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> + <!-- Equation name used to auto select formule in combo box --> + <String id='formuleCategory' javaBean='null'/> + <!-- Selected equation --> <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/> <script><![CDATA[ +import java.lang.reflect.Method; +import java.io.File; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.ui.input.formule.FormuleComboModel; -import java.lang.reflect.Method; +import org.apache.commons.lang.StringUtils; import org.nuiton.topia.TopiaContext; -import jaxx.runtime.swing.Item; protected DocumentListener listener = null; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); formuleComboBox.setModel(new DefaultComboBoxModel()); try { editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java")); @@ -56,10 +60,6 @@ } } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - //setComboModel(); - // chatellier 20090526 : force refresh in bean change ? refresh(); } @@ -88,12 +88,19 @@ setComboModel(); editor.getCurrentEditor().addDocumentListener(listener); } + +/** + * Get equation on entity. + */ protected Equation getEquation() { Equation result = null; try { - if (bean != null && methodGet != null){ - Method m = bean.getClass().getMethod("get" + methodGet, null); - result = (Equation) m.invoke(bean, (Object[])null); + // can be null in some uis + // content is managed by caller, can do anythings here + if (bean != null && beanProperty != null) { + String localBeanProperty = StringUtils.capitalize(beanProperty); + Method m = bean.getClass().getMethod("get" + localBeanProperty, null); + result = (Equation)m.invoke(bean); } } catch (Exception e) { if (log.isErrorEnabled()) { @@ -102,30 +109,53 @@ } return result; } -protected void setEquation(){ + +/** + * Call setXXXContent on topia entity (convention). + */ +protected void setEquation() { try { - if (bean != null && methodSet != null) { - Method m = bean.getClass().getMethod("set" + methodSet, String.class); + // can be null in some uis + // content is managed by caller, can do anythings here + if (bean != null && beanProperty != null) { + if (log.isDebugEnabled()) { + log.debug("Saving equation content (" + bean.getClass().getSimpleName() + + "#" + beanProperty + ")"); + } + String localBeanProperty = StringUtils.capitalize(beanProperty); + Method m = bean.getClass().getMethod("set" + localBeanProperty + "Content", String.class); m.invoke(bean, editor.getText()); } + else { + if (log.isDebugEnabled()) { + log.debug("No bean property defined, skipping content saving"); + } + } } catch (Exception e) { if (log.isErrorEnabled()) { - log.error("Can't set equation", e); + log.error("Can't set equation content", e); } } } @Override -public void refresh(){ +public void refresh() { + + // TODO binding don't work + if (getText() == null) { + setText(_("isisfish.common.equation")); + } + editor.getCurrentEditor().removeDocumentListener(listener); try { - editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java")); + File equationContentFile = org.nuiton.util.FileUtil.getTempFile("", ".java"); + editor.open(equationContentFile); } catch (IOException ex) { if (log.isErrorEnabled()) { log.error("Can't refresh editor", ex); } } - if (nameEquation != null){ + if (formuleCategory != null) { // chatellier 20090526 (change to get combo selected on this equation) selectedEquation = getEquation(); setComboModel(); @@ -134,7 +164,7 @@ } editor.getCurrentEditor().addDocumentListener(listener); } - + @Override public void setActionButtons() { @@ -144,8 +174,8 @@ if (getBean() != null){ TopiaContext isisContext = getBean().getTopiaContext(); java.util.List<Formule> formules = null; - if (nameEquation != null) { - formules = getAction().getFormules(isisContext, nameEquation); + if (formuleCategory != null) { + formules = getAction().getFormules(isisContext, formuleCategory); FormuleComboModel formulesModel = new FormuleComboModel(formules); formuleComboBox.setModel(formulesModel); // fix default selection @@ -154,17 +184,21 @@ } } protected void saveModel() { - getContextValue(InputAction.class).saveAsModel(nameEquation, "Java", editor.getText()); + getContextValue(InputAction.class).saveAsModel(formuleCategory, "Java", editor.getText()); setComboModel(); setInfoText(_("isisfish.message.saveModel.finished")); } + +/** + * Open external editor, with equation documentation. + */ protected void openEditor() { Formule e = (Formule)formuleComboBox.getSelectedItem(); if (e != null) { - getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), clazz, e.getContent(), editor); + getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), clazz, e.getContent(), editor); } else { - getContextValue(InputAction.class).openEditor(nameEquation, "new", clazz, editor.getText(), editor); + getContextValue(InputAction.class).openEditor(formuleCategory, "new", clazz, editor.getText(), editor); } } protected void setEditorText() { @@ -182,6 +216,9 @@ } } +/** + * New formule selected, replace content. + */ protected void formuleChanged() { Formule selectedFormule = (Formule)formuleComboBox.getSelectedItem(); setFormule(selectedFormule); @@ -192,7 +229,7 @@ <Table> <row> <cell fill='horizontal' anchor='east'> - <JLabel id='lbl' text='{getLblText()}' enabled='{isActif()}'/> + <JLabel text='{getText()}' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="formuleComboBox" onActionPerformed='formuleChanged()' enabled='{isActif()}' @@ -204,12 +241,12 @@ <Table> <row> <cell fill='horizontal'> - <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()' enabled='{isActif()}'/> + <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()' enabled='{isActif() && formuleCategory != null}'/> </cell> </row> <row> <cell fill='horizontal'> - <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif()}'/> + <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif() && clazz != null && formuleCategory != null}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -139,18 +139,20 @@ <Table> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" enabled='{isMetierSeasonSelected()}'/> + <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" + enabled='{isMetierSeasonSelected()}' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' enabled='{isMetierSeasonSelected()}'/> + <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' + enabled='{isMetierSeasonSelected()}' decorator='boxed'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='targetFactor' constructorParams='this' actif='{isTargetSpeciesSelected()}' - lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}' - bean='{getBean()}' nameEquation='TargetFactor' + text='isisfish.metierSeasonInfoSpecies.targetFactor' + bean='{getBean()}' formuleCategory='TargetFactor' clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' decorator='boxed' _bean='{MetierImpl.class}' _method='""'/> </cell> @@ -160,7 +162,8 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" enabled='{isTargetSpeciesSelected()}'/> + <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" + enabled='{isTargetSpeciesSelected()}' decorator='boxed'/> </cell> </row> </Table> @@ -171,19 +174,21 @@ <Table> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isMetierSeasonSelected()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' + enabled='{isMetierSeasonSelected()}' decorator='boxed'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTable id="tableTargetSpecies" rowHeight='24' enabled='{isMetierSeasonSelected()}'/> + <JTable id="tableTargetSpecies" rowHeight='24' enabled='{isMetierSeasonSelected()}' decorator='boxed'/> </JScrollPane> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='false'/> + <JButton id="remove" text="isisfish.common.remove" + onActionPerformed='remove()' enabled='false' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -81,9 +81,9 @@ metierSeasonInfoSpeciesEditor.refresh(); } ]]></script> - <Table id='body'> + <Table> <row> - <cell fill='both' weightx='1.0' weighty='0.5'> + <cell columns="2" fill='both' weightx='1.0' weighty='0.5'> <Table> <row> <cell fill='horizontal' anchor='east'> @@ -98,7 +98,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <MetierSeasonInfoSpeciesEditorUI id='metierSeasonInfoSpeciesEditor' constructorParams='this' bean='{getBean()}' metierSeasonInfo='{getMetierSeasonInfo()}' metierSeasonSelected='{isMetierSeasonInfoSelected()}' - actif='{isActif()}' decorator='boxed' + actif='{isActif()}' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/> </cell> </row> @@ -106,18 +106,12 @@ </cell> </row> <row> - <cell fill='horizontal' weightx='1.0'> - <Table> - <row> - <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> - </cell> - </row> - </Table> + <cell fill='horizontal' weightx='0.5'> + <JButton id='save' decorator='boxed'/> </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id='cancel' decorator='boxed'/> + </cell> </row> </Table> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -193,8 +193,8 @@ <row> <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='growthEquation' constructorParams='this' - lblText='{_("isisfish.populationBasics.growth")}' actif='{isActif()}' - bean='{getBean()}' nameEquation='Growth' methodGet='Growth' methodSet='EquationGrowth' + text='isisfish.populationBasics.growth' actif='{isActif()}' + bean='{getBean()}' beanProperty='growth' formuleCategory='Growth' clazz='{fr.ifremer.isisfish.equation.PopulationGrowth.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/> </cell> @@ -202,8 +202,8 @@ <row> <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='growthReverseEquation' constructorParams='this' - lblText='{_("isisfish.populationBasics.growthReverse")}' actif='{isActif()}' - bean='{getBean()}' nameEquation='GrowthReverse' methodGet='GrowthReverse' methodSet='EquationGrowthReverse' + text='isisfish.populationBasics.growthReverse' actif='{isActif()}' + bean='{getBean()}' formuleCategory='GrowthReverse' beanProperty='GrowthReverse' clazz='{fr.ifremer.isisfish.equation.PopulationGrowthReverse.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"GrowthReverse"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -49,38 +49,38 @@ </script> <Table id='body'> <row> - <cell columns='2' fill='both' weightx='0.5' weighty='0.3'> + <cell columns='2' fill='both' weightx='0.5' weighty='0.3'> <InputOneEquationUI id='naturalDeathRate' constructorParams='this' - lblText='{_("isisfish.populationEquation.naturalDeathRate")}' - bean='{getBean()}' nameEquation='NaturalDeathRate' methodGet='NaturalDeathRate' methodSet='EquationNaturalDeathRate' + text='isisfish.populationEquation.naturalDeathRate' + bean='{getBean()}' formuleCategory='NaturalDeathRate' beanProperty='NaturalDeathRate' clazz='{fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRate"'/> </cell> </row> <row> - <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> + <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> <InputOneEquationUI id='meanWeight' constructorParams='this' - lblText='{_("isisfish.populationEquation.meanWeight")}' - bean='{getBean()}' nameEquation='MeanWeight' methodGet='MeanWeight' methodSet='EquationMeanWeight' + text='isisfish.populationEquation.meanWeight' + bean='{getBean()}' formuleCategory='MeanWeight' beanProperty='MeanWeight' clazz='{fr.ifremer.isisfish.equation.PopulationMeanWeight.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MeanWeight"'/> </cell> </row> <row> - <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> + <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> <InputOneEquationUI id='price' constructorParams='this' - lblText='{_("isisfish.populationEquation.price")}' - bean='{getBean()}' nameEquation='Price' methodGet='Price' methodSet='EquationPrice' + text='isisfish.populationEquation.price' + bean='{getBean()}' formuleCategory='Price' beanProperty='Price' clazz='{fr.ifremer.isisfish.equation.PopulationPrice.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Price"'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -188,7 +188,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.nuiton.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' + <org.nuiton.math.matrix.gui.MatrixPanelEditor id='populationMigrationEmigrationTable' linearModel="true" enabled='{isActif()}' onMatrixChanged="populationMigrationEmigrationMatrixChanged(event)" /> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -50,8 +50,8 @@ <row> <cell fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='migrationEquation' constructorParams='this' - lblText='{_("isisfish.common.migration")}' actif='{isActif()}' - bean='{getPopInfo()}' nameEquation='Migration' methodGet='MigrationEquation' methodSet='MigrationEquationAsString' + text='isisfish.common.migration' actif='{isActif()}' + bean='{getPopInfo()}' formuleCategory='Migration' beanProperty='MigrationEquation' clazz='{fr.ifremer.isisfish.equation.MigrationEquation.class}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationEquation"'/> </cell> @@ -59,8 +59,8 @@ <row> <cell fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='emigrationEquation' constructorParams='this' - lblText='{_("isisfish.common.emigration")}' actif='{isActif()}' - bean='{getPopInfo()}' nameEquation='Emigration' methodGet='EmigrationEquation' methodSet='EmigrationEquationAsString' + text='isisfish.common.emigration' actif='{isActif()}' + bean='{getPopInfo()}' formuleCategory='Emigration' beanProperty='EmigrationEquation' clazz='{fr.ifremer.isisfish.equation.EmigrationEquation.class}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationEquation"'/> </cell> @@ -68,8 +68,8 @@ <row> <cell fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='immigrationEquation' constructorParams='this' - lblText='{_("isisfish.common.immigration")}' actif='{isActif()}' - bean='{getPopInfo()}' nameEquation='Immigration' methodGet='ImmigrationEquation' methodSet='ImmigrationEquationAsString' + text='isisfish.common.immigration' actif='{isActif()}' + bean='{getPopInfo()}' formuleCategory='Immigration' beanProperty='ImmigrationEquation' clazz='{fr.ifremer.isisfish.equation.ImmigrationEquation.class}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationEquation"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -86,8 +86,8 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <InputOneEquationUI id='reproductionEquation' constructorParams='this' - lblText='{_("isisfish.populationRecruitment.reproductionEquation")}' - bean='{getBean()}' nameEquation='Reproduction' methodGet='ReproductionEquation' methodSet='EquationReproductionEquation' + text='isisfish.populationRecruitment.reproductionEquation' + bean='{getBean()}' formuleCategory='Reproduction' beanProperty='ReproductionEquation' clazz='{fr.ifremer.isisfish.equation.PopulationReproductionEquation.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"ReproductionEquation"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -47,25 +47,21 @@ } ]]> </script> - <Table id='body'> + <Table> <row> - <cell fill='both' weightx='1.0' weighty='1'> - <PopulationZonesEditorUI id='popZones' constructorParams='this' bean='{getBean()}' actif='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/> + <cell columns="2" fill='both' weightx='1.0' weighty='1'> + <PopulationZonesEditorUI id='popZones' constructorParams='this' + bean='{getBean()}' actif='{isActif()}' decorator='boxed' + _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/> </cell> </row> <row> - <cell fill='horizontal' weightx='1.0'> - <Table> - <row> - <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> - </cell> - </row> - </Table> + <cell fill='horizontal' weightx='0.5'> + <JButton id='save' decorator='boxed'/> </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id='cancel' decorator='boxed'/> + </cell> </row> </Table> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -133,55 +133,43 @@ addSelectivityButton.setEnabled(isSelectivityPopulationSelected()); } ]]></script> - <Table id='body'> + <Table> <row> - <cell fill='both' weightx='1.0' weighty='1.0'> - <Table> - <row> - <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.selectivity.selectPopulation" enabled='{isActif()}' decorator='boxed' /> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSelectivityPopulation" onActionPerformed='selectivityChanged()' enabled='{isActif()}' - decorator='boxed' /> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <InputOneEquationUI id='selectivityEquation' constructorParams='this' - lblText='{_("isisfish.selectivity.equation")}' - bean='{getBean()}' nameEquation='Selectivity' actif='{isSelectivityPopulationSelected()}' - clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}' - decorator='boxed' /> - </cell> - </row> - </Table> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.selectivity.selectPopulation" enabled='{isActif()}' decorator='boxed' /> </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSelectivityPopulation" onActionPerformed='selectivityChanged()' enabled='{isActif()}' + decorator='boxed' /> + </cell> </row> <row> - <cell fill='both' weightx='1.0' weighty='1.0'> - <Table> - <row> - <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="addSelectivityButton" text="isisfish.common.add" onActionPerformed='addSelectivity()' - enabled='{isSelectivityPopulationSelected()}' decorator='boxed' /> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <JTable id="selectivityTable" rowHeight='24' enabled='{isActif()}' decorator='boxed' /> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="removeSelectivityButton" text="isisfish.common.remove" onActionPerformed='removeSelectivity()' - enabled='false' decorator='boxed' /> - </cell> - </row> - </Table> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0' insets="0"> + <InputOneEquationUI id='selectivityEquation' constructorParams='this' + text='isisfish.selectivity.equation' + bean='{getBean()}' formuleCategory='Selectivity' actif='{isSelectivityPopulationSelected()}' + clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}' + decorator='boxed' /> </cell> </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="addSelectivityButton" text="isisfish.common.add" onActionPerformed='addSelectivity()' + enabled='{isSelectivityPopulationSelected()}' decorator='boxed' /> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTable id="selectivityTable" rowHeight='24' enabled='{isActif()}' decorator='boxed' /> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="removeSelectivityButton" text="isisfish.common.remove" onActionPerformed='removeSelectivity()' + enabled='false' decorator='boxed' /> + </cell> + </row> </Table> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -42,34 +42,21 @@ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); } - ]]></script> - <Table id='body'> + <Table> <row> - <cell fill='both' weightx='1.0' weighty='1.0'> - <Table> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <SelectivityEditorUI id='editor' constructorParams='this' bean='{getBean()}' - _bean='{GearImpl.class}' _method='"PopulationSelectivity"'/> - </cell> - </row> - </Table> + <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> + <SelectivityEditorUI id='editor' constructorParams='this' bean='{getBean()}' + _bean='{GearImpl.class}' _method='"PopulationSelectivity"'/> </cell> </row> <row> <cell fill='horizontal' weightx='1.0'> - <Table> - <row> - <cell fill='horizontal' weightx='1.0'> - <JButton id='save'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JButton id='cancel'/> - </cell> - </row> - </Table> + <JButton id='save' decorator='boxed'/> </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton id='cancel' decorator='boxed'/> + </cell> </row> </Table> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -137,8 +137,8 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> <InputOneEquationUI id='technicalEfficiency' constructorParams='this' - lblText='{_("isisfish.setOfVessels.technicalEfficiency")}' - bean='{getBean()}' nameEquation='TechnicalEfficiency' methodGet='TechnicalEfficiencyEquation' methodSet='EquationTechnicalEfficiency' + text='isisfish.setOfVessels.technicalEfficiency' + bean='{getBean()}' formuleCategory='TechnicalEfficiency' beanProperty='TechnicalEfficiencyEquation' clazz='{fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"TechnicalEfficiencyEquation"'/> </cell> 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 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -134,8 +134,8 @@ <row> <cell columns="2" fill='both' weightx='1.0' weighty='0.5'> <InputOneEquationUI id="strategyInactivity" constructorParams='this' - lblText='{_("isisfish.strategy.inactivity")}' - bean='{getBean()}' nameEquation='Inactivity' methodGet='InactivityEquation' methodSet='EquationInactivity' + text='isisfish.strategy.inactivity' + bean='{getBean()}' formuleCategory='Inactivity' beanProperty='InactivityEquation' clazz='{fr.ifremer.isisfish.equation.StrategyInactivityEquation.class}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Inactivity"'/> <!-- bindings not work well actif='{getBean().getInactivityEquationUsed()}' --> </cell>