Author: tchemit Date: 2013-11-26 18:32:10 +0100 (Tue, 26 Nov 2013) New Revision: 1399 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1399 Log: fixes #3867: [CAPTURE] erreur si aucune valeur dans la liste des cat?\195?\169gorie au moment de la saise d'une esp?\195?\168ce Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-11-26 17:01:24 UTC (rev 1398) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-11-26 17:32:10 UTC (rev 1399) @@ -302,10 +302,12 @@ // by default use the first one List<SampleCategoryModelEntry> categories = getUI().getCategoryComboBox().getData(); - selectedCategory = categories.get(0); + if (!categories.isEmpty()) { + selectedCategory = categories.get(0); - if (log.isInfoEnabled()) { - log.info("Use default first category: " + selectedCategory); + if (log.isInfoEnabled()) { + log.info("Use default first category: " + selectedCategory); + } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-11-26 17:01:24 UTC (rev 1398) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-11-26 17:32:10 UTC (rev 1399) @@ -27,6 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import fr.ifremer.shared.application.swing.util.Cancelable; +import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; @@ -41,10 +43,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchTableModel; -import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; @@ -97,7 +97,7 @@ */ protected final WeightUnit weightUnit; - public CreateSpeciesBatchUIHandler(TuttiUI<?,?> parentUi, + public CreateSpeciesBatchUIHandler(TuttiUI<?, ?> parentUi, CreateSpeciesBatchUI ui) { super(parentUi.getHandler().getContext(), ui, SplitSpeciesBatchRowModel.PROPERTY_SELECTED, @@ -311,10 +311,13 @@ // by default use the first one List<SampleCategoryModelEntry> categories = getUI().getCategoryComboBox().getData(); - selectedCategory = categories.get(0); - if (log.isInfoEnabled()) { - log.info("Use default first category: " + selectedCategory); + if (!categories.isEmpty()) { + selectedCategory = categories.get(0); + + if (log.isInfoEnabled()) { + log.info("Use default first category: " + selectedCategory); + } } }