Author: chatellier Date: 2009-07-02 16:36:23 +0000 (Thu, 02 Jul 2009) New Revision: 2462 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx Log: Creattino d'un nouveau model a chaque refresh(). L'utilisation du model existant marche pas (avec les selections , etc...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-02 16:26:57 UTC (rev 2461) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-02 16:36:23 UTC (rev 2462) @@ -62,15 +62,13 @@ setBean(null); setBean((SetOfVesselsImpl) setOfVessels); - EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); + EffortDescriptionListModel model = new EffortDescriptionListModel(); // getBean().getPossibleMetiers() can be null at region creation if (getBean() != null && getBean().getPossibleMetiers() != null) { java.util.List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); model.setEffortDescriptions(effortDescriptions); } - else { - model.setEffortDescriptions(null); - } + fieldEffortDescriptionEffortDescriptionList.setModel(model); } @Override @@ -107,7 +105,7 @@ <JScrollPane> <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" onValueChanged='effortDescriptionSelectionChanged()' - model='{new EffortDescriptionListModel()}' cellRenderer='{new EffortDescriptionListRenderer()}' + cellRenderer='{new EffortDescriptionListRenderer()}' enabled='{isActif()}' decorator='boxed' /> </JScrollPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-07-02 16:26:57 UTC (rev 2461) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-07-02 16:36:23 UTC (rev 2462) @@ -83,14 +83,12 @@ } protected void setEffortDescriptionEffortDescriptionList() { - EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); + EffortDescriptionListModel model = new EffortDescriptionListModel(); if (getBean() != null && getBean().getPossibleMetiers() != null) { java.util.List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); model.setEffortDescriptions(effortDescriptions); } - else { - model.setEffortDescriptions(null); - } + fieldEffortDescriptionEffortDescriptionList.setModel(model); } protected void addEffortDescriptions() { @@ -108,7 +106,6 @@ getInputAction().removeEffortDescription(getBean(), selectedEffortDescription); } setEffortDescriptionEffortDescriptionList(); - fieldEffortDescriptionEffortDescriptionList.clearSelection(); // bug selected index still exists } ]]> </script> @@ -136,7 +133,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - model='{new EffortDescriptionListModel()}' cellRenderer='{new EffortDescriptionListRenderer()}' + cellRenderer='{new EffortDescriptionListRenderer()}' onValueChanged='onFieldEffortDescriptionEffortDescriptionListValueChanged()' enabled='{isActif()}' decorator='boxed' /> </JScrollPane> </cell>