Author: tchemit Date: 2013-02-04 01:40:32 +0100 (Mon, 04 Feb 2013) New Revision: 320 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/320 Log: use protocol in Species screen (for lengthClass + species) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-04 00:39:54 UTC (rev 319) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-04 00:40:32 UTC (rev 320) @@ -425,7 +425,8 @@ } else { // use all caracteristics - lengthCaracterics = Lists.newArrayList(persistenceService.getAllCaracteristic()); + lengthCaracterics = Lists.newArrayList( + persistenceService.getAllCaracteristic()); } List<Species> speciesList = persistenceService.getAllSpecies(protocol); @@ -450,46 +451,20 @@ List<Species> allSpecies; - TuttiProtocol protocol = null; + Multimap<Species, SampleCategoryType> speciesSampleCategories = + HashMultimap.create(); + if (context.isProtocolFilled()) { // get loaded protocol - protocol = TuttiUIUtil.getProtocol(ui); + TuttiProtocol protocol = TuttiUIUtil.getProtocol(ui); Preconditions.checkNotNull(protocol, "Could not find protocol in ui context"); - } - Multimap<Species, SampleCategoryType> speciesSampleCategories = - HashMultimap.create(); - - if (protocol == null) { - - // no protocol, use default values - - samplingOrder = Lists.newArrayList( - SampleCategoryType.sortedUnsorted, - SampleCategoryType.size, - SampleCategoryType.sex, - SampleCategoryType.maturity, - SampleCategoryType.age); - - allSpecies = Lists.newArrayList(speciesUniverse); - - // each species can use any category - for (Species species : allSpecies) { - speciesSampleCategories.put(species, SampleCategoryType.sortedUnsorted); - speciesSampleCategories.put(species, SampleCategoryType.size); - speciesSampleCategories.put(species, SampleCategoryType.sex); - speciesSampleCategories.put(species, SampleCategoryType.maturity); - speciesSampleCategories.put(species, SampleCategoryType.age); - } - } else { - // fill sampling order from protocol - samplingOrder = Lists.newArrayList( SampleCategoryType.sortedUnsorted, SampleCategoryType.size, @@ -512,6 +487,27 @@ speciesSampleCategories.put(species, SampleCategoryType.age); } } + } else { + + // no protocol, use default values + + samplingOrder = Lists.newArrayList( + SampleCategoryType.sortedUnsorted, + SampleCategoryType.size, + SampleCategoryType.sex, + SampleCategoryType.maturity, + SampleCategoryType.age); + + allSpecies = Lists.newArrayList(speciesUniverse); + + // each species can use any category + for (Species species : allSpecies) { + speciesSampleCategories.put(species, SampleCategoryType.sortedUnsorted); + speciesSampleCategories.put(species, SampleCategoryType.size); + speciesSampleCategories.put(species, SampleCategoryType.sex); + speciesSampleCategories.put(species, SampleCategoryType.maturity); + speciesSampleCategories.put(species, SampleCategoryType.age); + } } if (log.isInfoEnabled()) {