Author: chatellier Date: 2009-11-05 15:22:13 +0000 (Thu, 05 Nov 2009) New Revision: 2742 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx Log: Replace jaxx item use by list models Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-11-05 14:29:02 UTC (rev 2741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-11-05 15:22:13 UTC (rev 2742) @@ -27,17 +27,17 @@ <Boolean id='metierSeasonInfoNotNull' javaBean='false'/> <script><![CDATA[ + import fr.ifremer.isisfish.entities.Metier; + import fr.ifremer.isisfish.entities.MetierImpl; + import fr.ifremer.isisfish.entities.MetierSeasonInfo; + import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; import fr.ifremer.isisfish.entities.Season; + import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.types.Month; + import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; import fr.ifremer.isisfish.ui.widget.Interval; - import fr.ifremer.isisfish.entities.MetierSeasonInfo; - import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; import fr.ifremer.isisfish.ui.widget.IntervalPanel; - import fr.ifremer.isisfish.entities.Zone; - import fr.ifremer.isisfish.entities.Metier; - import fr.ifremer.isisfish.entities.MetierImpl; - import jaxx.runtime.swing.Item; - + protected Interval interval = null; protected boolean init = false; @@ -174,16 +174,11 @@ } protected void setMetierSeasonInfoCombo() { - java.util.List<Item> items = new ArrayList<Item>(); java.util.List<MetierSeasonInfo> metierSeasonInfoList = getBean().getMetierSeasonInfo(); - items.add(new Item("null", " ", null, false)); - if (metierSeasonInfoList != null) { - for (MetierSeasonInfo m : metierSeasonInfoList) { - items.add(new Item(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, (m == getMetierSeasonInfo()))); - } - } - metierSeasonInfoCombo.setItems(items); + MetierSeasonInfoComboModel metierSeasonInfoModel = new MetierSeasonInfoComboModel(metierSeasonInfoList); + metierSeasonInfoCombo.setModel(metierSeasonInfoModel); } + protected void metierZonesChanged(){ Object[] selected = metierZones.getSelectedValues(); java.util.List<Zone> zones = new ArrayList<Zone>(); @@ -211,7 +206,8 @@ <JLabel text="isisfish.metierSeasonInfoZone.selectSeason" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="metierSeasonInfoCombo" onActionPerformed='seasonChanged()' enabled='{isActif()}'/> + <JComboBox id="metierSeasonInfoCombo" onActionPerformed='seasonChanged()' enabled='{isActif()}' + renderer="{new fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboRenderer()}" /> </cell> </row> <row>