Author: tchemit Date: 2012-10-10 23:19:19 +0200 (Wed, 10 Oct 2012) New Revision: 624 Url: http://forge.codelutin.com/repositories/revision/sammoa/624 Log: fixes #1588: Interdir de passer sur l'?\195?\169cran onBoard si la r?\195?\169gion ne contient pas d'esp?\195?\168ce. Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2012-10-10 21:18:07 UTC (rev 623) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2012-10-10 21:19:19 UTC (rev 624) @@ -35,11 +35,13 @@ import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Flights; import fr.ulr.sammoa.persistence.HasTopiaIdPredicate; +import fr.ulr.sammoa.persistence.Species; import fr.ulr.sammoa.ui.swing.SammoaScreen; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -278,6 +280,21 @@ // Save the campaignId in the config for next loading Campaign campaign = getModel().getCampaign(); Preconditions.checkNotNull(campaign); + + // check before that the region used has some species + // see http://forge.codelutin.com/issues/1588 + List<Species> allSpecies = + referentialService.getAllSpecies(campaign); + if (CollectionUtils.isEmpty(allSpecies)) { + + // can not authorize to go to this screen + SammoaUtil.showErrorMessage( + ui, _("sammoa.validator.no.species.in.region")); + return; + } + + // ok can continue + getConfig().setCampaignId(campaign.getTopiaId()); getConfig().save(); Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-10-10 21:18:07 UTC (rev 623) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-10-10 21:19:19 UTC (rev 624) @@ -283,6 +283,7 @@ sammoa.validator.campaign.endDate.required=The end date must be defined sammoa.validator.campaign.region.required=The region must be set sammoa.validator.campaign.uniqueKey=The campaign code '%1$s' already exists for the region '%2$s' +sammoa.validator.no.species.in.region=No species found for the campaign's region, please import then before. sammoa.validator.observation.age.unkownValue=The age must be \: J for "juvenile", I for "immature", A for "adult" and M for mixed groups sammoa.validator.observation.behaviour.unkownValue=The behaviour must be one of this value \: SW (normal), MI (milling), BR (breaching), LO (logging), FE (feeding), FA (feeding aggregation), SB (following boat), OT (other) sammoa.validator.observation.cue.unkownValue=The cue must be between 2 and 9 or U for underwater and A for surface