Author: tchemit Date: 2014-02-21 11:36:09 +0100 (Fri, 21 Feb 2014) New Revision: 1611 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1611 Log: fixes #4525: [PROTOCOLE] erreur si on saisi une esp?\195?\168ce qui n'existe pas dans la liste d?\195?\169roulante et que l'on clique sur le bouton + 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/EditProtocolUIHandler.java 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 2014-02-20 13:30:34 UTC (rev 1610) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2014-02-21 10:36:09 UTC (rev 1611) @@ -167,7 +167,7 @@ toolTipText: "tutti.editProtocol.action.addSpeciesProtocol.tip"; i18nMnemonic: "tutti.editProtocol.action.addSpeciesProtocol.mnemonic"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.AddSpeciesProtocolAction.class}; - enabled: {speciesComboBox.getSelectedItem() != null}; + enabled: {handler.isSpeciesSelected(speciesComboBox.getSelectedItem())}; _help: {"tutti.editProtocol.action.addSpeciesProtocol.help"}; } @@ -221,7 +221,7 @@ toolTipText: "tutti.editProtocol.action.addBenthosProtocol.tip"; i18nMnemonic: "tutti.editProtocol.action.addBenthosProtocol.mnemonic"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.AddBenthosProtocolAction.class}; - enabled: {benthosComboBox.getSelectedItem() != null}; + enabled: {handler.isSpeciesSelected(benthosComboBox.getSelectedItem())}; _help: {"tutti.editProtocol.action.addBenthosProtocol.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 2014-02-20 13:30:34 UTC (rev 1610) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-02-21 10:36:09 UTC (rev 1611) @@ -29,7 +29,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; @@ -61,6 +60,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -128,6 +128,10 @@ return (EditProtocolSpeciesTableModel) getBenthosTable().getModel(); } + public boolean isSpeciesSelected(Object selectedItem) { + return selectedItem != null && selectedItem instanceof Species; + } + //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @@ -508,7 +512,7 @@ Species species = allReferentSpeciesByTaxonId.get(taxonIdStr); // make sure it exists - Preconditions.checkNotNull(species, "Espèce inconnue : "+taxonIdStr); + Preconditions.checkNotNull(species, "Espèce inconnue : " + taxonIdStr); speciesSet.add(species); EditProtocolSpeciesRowModel row = EditProtocolSpeciesTableModel.newRow(sampleCategoryModel);