Author: sletellier Date: 2009-07-06 15:31:36 +0000 (Mon, 06 Jul 2009) New Revision: 2470 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx Log: Maturity group can be null 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 2009-07-06 15:30:38 UTC (rev 2469) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-07-06 15:31:36 UTC (rev 2470) @@ -63,13 +63,10 @@ setBean((PopulationImpl) population); if (getBean() != null) { - // TODO : Selection equation - if (getBean() != null) { - if (getBean().getPopulationGroup() != null) { - jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true); - } - setTableAgeLengthModel(); - } + if (getBean().getPopulationGroup() != null) { + jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true); + } + setTableAgeLengthModel(); } getVerifier().addCurrentPanel(growthEquation, growthReverseEquation); } @@ -101,8 +98,8 @@ } protected void matureClassChanged(){ Object selected = fieldPopulationBasicsMatureClass.getSelectedItem(); - if (selected != null){ - getBean().setMaturityGroup((PopulationGroup) selected); + if (getBean() != null){ + getBean().setMaturityGroup((PopulationGroup) selected); } } protected void setTableAgeLengthModel(){ @@ -180,7 +177,7 @@ </row> <row> <cell columns='3' fill='both' weightx='1.0'> - <JTable id='tableAgeLength' rowHeight='24' enabled='{isActif()}' decorator='boxed'/> + <JTable id='tableAgeLength' rowHeight='24' enabled='false' decorator='boxed'/> </cell> </row> <row>