Author: kmorin Date: 2013-03-14 11:03:48 +0100 (Thu, 14 Mar 2013) New Revision: 615 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/615 Log: fixes #2125 [protocole] ajout d'une ligne sur un nouveau protocole ne marche pas, tourne en boucle Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-03-14 09:51:42 UTC (rev 614) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-03-14 10:03:48 UTC (rev 615) @@ -179,9 +179,7 @@ int rowIndex = tableModel.getRowCount() - 1; tableModel.fireTableRowsInserted(rowIndex, rowIndex); - keyCombo.getData().remove(selectedItem); -// selectFirstInCombo(keyCombo); - keyCombo.getHandler().reset(); + keyCombo.getHandler().removeItem(selectedItem); M model = getModel(); model.setModify(true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-03-14 09:51:42 UTC (rev 614) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-03-14 10:03:48 UTC (rev 615) @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; - import java.util.Collection; import static org.nuiton.i18n.I18n._; @@ -63,10 +62,7 @@ Collection<Species> allSynonyms = getModel().getAllSynonyms(taxonIdStr); getModel().getAllSynonyms().removeAll(allSynonyms); - ui.getSpeciesComboBox().getData().remove(species); - ui.getSpeciesComboBox().getHandler().sortData(); -// handler.selectFirstInCombo(ui.getSpeciesComboBox()); - ui.getSpeciesComboBox().getHandler().reset(); + ui.getSpeciesComboBox().getHandler().removeItem(species); // add new row to model (do it after combo stuff for ui best display) EditProtocolSpeciesRowModel protocol = tableModel.createNewRow(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-14 09:51:42 UTC (rev 614) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-14 10:03:48 UTC (rev 615) @@ -94,7 +94,6 @@ } #speciesComboBox { - showReset: false; enabled: {!speciesComboBox.isEmpty()}; toolTipText: "tuttihelp.editProtocol.field..tip"; _help: {"tuttihelp.editProtocol.field.species.help"}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-14 09:51:42 UTC (rev 614) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-14 10:03:48 UTC (rev 615) @@ -66,6 +66,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import static org.nuiton.i18n.I18n._; @@ -385,8 +386,8 @@ } public List<EditProtocolSpeciesRowModel> toRows(List<SpeciesProtocol> speciesProtocols) { - List<Species> speciesList = ui.getSpeciesComboBox().getData(); - Preconditions.checkNotNull(speciesList); + BeanFilterableComboBox<Species> speciesComboBox = ui.getSpeciesComboBox(); + Preconditions.checkNotNull(speciesComboBox.getData()); EditProtocolUIModel model = getModel(); @@ -406,7 +407,7 @@ // get species referent taxon Species species = allReferentSpeciesByTaxonId.get(taxonIdStr); // remove it from the combo box - speciesList.remove(species); + speciesComboBox.getHandler().removeItem(species); EditProtocolSpeciesRowModel row = getTableModel().createNewRow(); row.setSpecies(species); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-14 09:51:42 UTC (rev 614) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-14 10:03:48 UTC (rev 615) @@ -63,8 +63,7 @@ // re-add all synonym of this taxon to the species comobox Species species = selectedRow.getSpecies(); BeanFilterableComboBox<Species> combo = getUI().getSpeciesComboBox(); - combo.getData().add(species); - combo.getHandler().sortData(); + combo.getHandler().addItem(species); EditProtocolUIModel model = getModel(); Integer taxonId = species.getReferenceTaxonId();