Author: kmorin Date: 2013-05-16 17:40:07 +0200 (Thu, 16 May 2013) New Revision: 953 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/953 Log: add progression on validation loading Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-16 15:38:53 UTC (rev 952) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-16 15:40:07 UTC (rev 953) @@ -29,6 +29,7 @@ import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.InvalidBatchModelException; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -48,6 +49,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.decorator.Decorator; import org.nuiton.validator.NuitonValidatorResult; import org.nuiton.validator.NuitonValidatorScope; @@ -90,17 +92,22 @@ * * @return a map containing the operations and the validation results */ - public Map<FishingOperation, NuitonValidatorResult> validateCruiseOperations() { + public Map<FishingOperation, NuitonValidatorResult> validateCruiseOperations(ProgressionModel progressionModel) { Map<FishingOperation, NuitonValidatorResult> result = Maps.newHashMap(); TuttiDataContext dataContext = context.getDataContext(); List<FishingOperation> operations = persistenceService.getAllFishingOperation(dataContext.getCruiseId()); + progressionModel.setTotal(operations.size()); + + Decorator<FishingOperation> decorator = decoratorService.getDecoratorByType(FishingOperation.class); for (FishingOperation operation : operations) { operation = persistenceService.getFishingOperation(operation.getId()); + progressionModel.setMessage(_("tutti.service.validateCruise.operations.progress", decorator.toString(operation))); NuitonValidatorResult validator = validationService.validateFishingOperation(operation, ValidationService.VALIDATION_CONTEXT_VALIDATE); checkOperation(operation, validator); result.put(operation, validator); + progressionModel.increments(1); } return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-05-16 15:38:53 UTC (rev 952) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-05-16 15:40:07 UTC (rev 953) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; @@ -34,6 +35,7 @@ import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUIModel; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -85,7 +87,11 @@ ValidateCruiseUIModel model = new ValidateCruiseUIModel(); - model.setValidator(validationService.validateCruiseOperations()); + ProgressionModel progressionModel = new ProgressionModel(); + TuttiActionUIModel actionUIModel = context.getActionUI().getModel(); + actionUIModel.setProgressionModel(progressionModel); + model.setValidator(validationService.validateCruiseOperations(progressionModel)); + actionUIModel.setProgressionModel(null); model.addPropertyChangeListener(ValidateCruiseUIModel.PROPERTY_SELECTED_FISHING_OPERATION, new RemoveablePropertyChangeListener() {