Author: tchemit Date: 2013-01-14 23:19:32 +0100 (Mon, 14 Jan 2013) New Revision: 198 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/198 Log: refs #1805: [Onglet Poisson] Assistance ?\195?\160 la saisie des lots de poissons Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo 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/split/CreateSpeciesBatchUIModel.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) 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-01-14 21:43:11 UTC (rev 197) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-14 22:19:32 UTC (rev 198) @@ -145,7 +145,7 @@ SpeciesBatchUIModel model = getModel(); - Multimap<CaracteristicQualitativeValue, Species> availableSpecies = + Multimap<CaracteristicQualitativeValue, Species> speciesUsed = ArrayListMultimap.create(); List<SpeciesBatchRowModel> rows; @@ -162,8 +162,6 @@ if (!TuttiEntities.isNew(bean)) { - Set<Species> speciesUsed = Sets.newHashSet(); - // get all batch species root (says the one with only a species sample category) List<SpeciesBatch> catches = persistenceService.getAllRootSpeciesBatch(bean.getId()); @@ -173,18 +171,17 @@ // root batch sample categroy is species Preconditions.checkState( aBatch.getSampleCategoryType() == SampleCategoryEnum.sortedUnsorted, - "Root species batch must be a species sample " + + "Root species batch must be a sortedUnsorted sample " + "category but was:" + aBatch.getSampleCategoryType()); SpeciesBatchRowModel rootRow = loadSpeciesBatch(aBatch, null, rows); - speciesUsed.add(rootRow.getSpecies()); + speciesUsed.put(rootRow.getSortedUnsortedCategoryValue(), rootRow.getSpecies()); } - availableSpecies.removeAll(speciesUsed); } } - model.setSpeciesUsed(availableSpecies); + model.setSpeciesUsed(speciesUsed); model.setRows(rows); recomputeBatchActionEnable(); } @@ -604,7 +601,6 @@ // update species used map getModel().getSpeciesUsed().put(sortedUnsortedCategory, species); - } // reset create ui @@ -759,8 +755,6 @@ table.getCellEditor().stopCellEditing(); } } - - } public void removeSpeciesSubBatch() { @@ -867,6 +861,7 @@ FishingOperation fishingOperation = getModel().getFishingOperation(); Preconditions.checkNotNull(fishingOperation); + Preconditions.checkNotNull(row.getSpecies()); SampleCategory<?> sampleCategory = row.getSampleCategory(); Preconditions.checkNotNull(sampleCategory); Preconditions.checkNotNull(sampleCategory.getCategoryType()); @@ -1090,6 +1085,7 @@ // copy back parent data (mainly other sample categories) + newRow.setSpecies(parentRow.getSpecies()); newRow.setSpeciesToConfirm(parentRow.getSpeciesToConfirm()); newRow.setBatchParent(parentRow); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java 2013-01-14 21:43:11 UTC (rev 197) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java 2013-01-14 22:19:32 UTC (rev 198) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import java.util.List; -import java.util.Set; /** * Model of {@link CreateSpeciesBatchUI}. @@ -146,24 +145,6 @@ public boolean isSpeciesAndCategoryAvailable(Species species, CaracteristicQualitativeValue sortedUnsortedCategory) { boolean result = !speciesUsed.containsEntry(sortedUnsortedCategory, species); - - if (result) { - - // species - category still no used - - Set<CaracteristicQualitativeValue> categories = speciesUsed.keySet(); - result = categories.isEmpty(); - for (CaracteristicQualitativeValue category : categories) { - - if (!speciesUsed.containsEntry(category, species)) { - - // ok found a category available - result = true; - break; - } - } - - } return result; } } \ No newline at end of file