This is an automated email from the git hooks/post-receive script. New commit to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit ed69714cb4bb6e2de356215e199724961d60777d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 07:55:23 2015 +0200 reformat code + improve TransmittingBuoyOperation api (refs #7017) --- .../seine/TypeTransmittingBuoyOperation.java | 33 +++++++++--------- .../seine/TransmittingBuoyOperations.java | 39 ++++++++++++++++++++++ .../main/java/fr/ird/observe/services/Commit.java | 1 + .../fr/ird/observe/services/NoTransaction.java | 1 + .../fr/ird/observe/services/ObserveService.java | 4 +-- .../observe/services/ObserveServiceContext.java | 4 +-- .../observe/services/ObserveServiceFactory.java | 3 +- .../ird/observe/services/ReplicationService.java | 2 +- .../data/longline/CatchLonglineServiceImpl.java | 34 +++++++++---------- .../GearUseFeaturesLonglineServiceImpl.java | 6 ++-- .../longline/LonglineGlobalCompositionService.java | 2 +- .../data/longline/TripLonglineServiceImpl.java | 1 - .../data/seine/ActivitySeineServiceImpl.java | 2 +- .../services/data/seine/FloatingObjectService.java | 4 +-- .../data/seine/FloatingObjectServiceImpl.java | 36 ++++++++++---------- .../seine/GearUseFeaturesSeineServiceImpl.java | 8 ++--- .../data/seine/NonTargetCatchServiceImpl.java | 4 +-- .../data/seine/NonTargetSampleServiceImpl.java | 3 +- .../seine/ObjectSchoolEstimateServiceImpl.java | 6 ++-- .../services/data/seine/RouteServiceImpl.java | 2 +- .../data/seine/SchoolEstimateServiceImpl.java | 1 - .../services/data/seine/SetSeineServiceImpl.java | 11 +++--- .../data/seine/TargetSampleServiceImpl.java | 3 +- .../services/data/seine/TripSeineServiceImpl.java | 1 - .../services/operation/ComputeDataService.java | 2 +- .../services/operation/GpsImportService.java | 2 +- .../referential/ReferentialServiceImpl.java | 1 - .../FloatingObjectTransmittingBuoyOperationUI.css | 4 +-- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 1 + ...ngObjectTransmittingBuoyOperationUIHandler.java | 39 ++++++---------------- .../ird/observe/ui/storage/StorageUIHandler.java | 33 +++++++++--------- 31 files changed, 158 insertions(+), 135 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java index 7f5732f..5bcfb49 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java @@ -21,35 +21,38 @@ */ package fr.ird.observe.entities.constants.seine; +import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperations; + import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @author Tony Chemit - chemit@codelutin.com */ public enum TypeTransmittingBuoyOperation { + // pas de balise lue pasDeBalise(n("observe.common.balise.objectOperation.no.balise")), // une balise lue - visite(n("observe.common.balise.objectOperation.visite"), "1"), - recuperation(n("observe.common.balise.objectOperation.recupere"), "2"), - pose(n("observe.common.balise.objectOperation.pose"), "3"), + visite(n("observe.common.balise.objectOperation.visite"), TransmittingBuoyOperations.VISITE_ID), + recuperation(n("observe.common.balise.objectOperation.recupere"), TransmittingBuoyOperations.RECUPERATION_ID), + pose(n("observe.common.balise.objectOperation.pose"), TransmittingBuoyOperations.POSE_ID), // deux balises lues - recuperationEtRemplacement(n("observe.common.balise.objectOperation.recupere.et.change"), "2", "3"); + recuperationEtRemplacement(n("observe.common.balise.objectOperation.recupere.et.change"), TransmittingBuoyOperations.RECUPERATION_ID, TransmittingBuoyOperations.POSE_ID); /** clef i18n du type d'opération sur balise */ private String i18nKey; /** les codes des opérations sur balise */ - private String[] codeOperation; + private String[] operationIds; /** le count de balises lues */ private int nbBalises; - TypeTransmittingBuoyOperation(String i18nKey, String... codeOperation) { + TypeTransmittingBuoyOperation(String i18nKey, String... operationIds) { this.i18nKey = i18nKey; - this.codeOperation = codeOperation; - nbBalises = codeOperation.length; + this.operationIds = operationIds; + this.nbBalises = operationIds.length; } public String getI18nKey() { @@ -60,8 +63,8 @@ public enum TypeTransmittingBuoyOperation { return nbBalises; } - public String[] getCodeOperation() { - return codeOperation; + public String[] getOperationIds() { + return operationIds; } @Override @@ -69,16 +72,14 @@ public enum TypeTransmittingBuoyOperation { return t(i18nKey); } - public static TypeTransmittingBuoyOperation valueOf(int ordinal) - throws IllegalArgumentException { + public static TypeTransmittingBuoyOperation valueOf(int ordinal) throws IllegalArgumentException { + for (TypeTransmittingBuoyOperation o : values()) { if (o.ordinal() == ordinal) { return o; } } - throw new IllegalArgumentException( - "could not find a " + - TypeTransmittingBuoyOperation.class.getSimpleName() + - " value for ordinal " + ordinal); + throw new IllegalArgumentException("could not find a " + TypeTransmittingBuoyOperation.class.getSimpleName() + " value for ordinal " + ordinal); + } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperations.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperations.java new file mode 100644 index 0000000..e351025 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperations.java @@ -0,0 +1,39 @@ +package fr.ird.observe.entities.referentiel.seine; + +import java.util.List; + +/** + * Created on 5/4/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0 + */ +public class TransmittingBuoyOperations { + + public static final String VISITE_ID = "fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation#1239832686237#0.4947461794167761"; + + public static final String RECUPERATION_ID = "fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation#1239832686238#0.38090479793636556"; + + public static final String POSE_ID = "fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation#1239832686238#0.4755624782839416"; + + public static boolean isBalisePose(TransmittingBuoyOperation operation) { + return operation != null && POSE_ID.equals(operation.getTopiaId()); + } + + public static TransmittingBuoyOperation getObjectOperation(List<TransmittingBuoyOperation> objectOperations, String operationId) { + + TransmittingBuoyOperation objectOperation = null; + for (TransmittingBuoyOperation op : objectOperations) { + if (operationId.equals(op.getTopiaId())) { + objectOperation = op; + break; + } + } + if (objectOperation == null) { + throw new IllegalArgumentException("could not find a " + TransmittingBuoyOperation.class + " with code " + operationId); + } + return objectOperation; + + } + +} diff --git a/observe-services/src/main/java/fr/ird/observe/services/Commit.java b/observe-services/src/main/java/fr/ird/observe/services/Commit.java index f99b536..0e52dc6 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/Commit.java +++ b/observe-services/src/main/java/fr/ird/observe/services/Commit.java @@ -16,4 +16,5 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface Commit { + } diff --git a/observe-services/src/main/java/fr/ird/observe/services/NoTransaction.java b/observe-services/src/main/java/fr/ird/observe/services/NoTransaction.java index fc34b8e..6839d32 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/NoTransaction.java +++ b/observe-services/src/main/java/fr/ird/observe/services/NoTransaction.java @@ -16,4 +16,5 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface NoTransaction { + } diff --git a/observe-services/src/main/java/fr/ird/observe/services/ObserveService.java b/observe-services/src/main/java/fr/ird/observe/services/ObserveService.java index 27e9ac4..a214822 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/ObserveService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/ObserveService.java @@ -18,9 +18,9 @@ public interface ObserveService extends Closeable { <E extends TopiaEntity> EntityMap findAllUsages(E entity); - <E extends TopiaEntity> List<E> getList(Class<E> klass) ; + <E extends TopiaEntity> List<E> getList(Class<E> klass); - <E extends TopiaEntity> List<E> getList(Class<E> klass, Predicate<E> predicate) ; + <E extends TopiaEntity> List<E> getList(Class<E> klass, Predicate<E> predicate); void setServiceContext(ObserveServiceContext serviceContext); diff --git a/observe-services/src/main/java/fr/ird/observe/services/ObserveServiceContext.java b/observe-services/src/main/java/fr/ird/observe/services/ObserveServiceContext.java index cba9e5d..320d53e 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/ObserveServiceContext.java +++ b/observe-services/src/main/java/fr/ird/observe/services/ObserveServiceContext.java @@ -43,7 +43,7 @@ public class ObserveServiceContext { protected ObserveApplicationContext applicationContext; public ObserveServiceContext(ObserveApplicationContext applicationContext, DataSource dataSource) { - this.applicationContext=applicationContext; + this.applicationContext = applicationContext; this.config = applicationContext.getConfig(); this.dataSource = dataSource; this.decoratorService = applicationContext.getDecoratorService(); @@ -59,7 +59,7 @@ public class ObserveServiceContext { } public ReferenceLocale getReferentielLocale() { - return applicationContext.getDecoratorService().getReferentielLocale(); + return decoratorService.getReferentielLocale(); } public Date now() { diff --git a/observe-services/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java b/observe-services/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java index 3e6af98..c48e040 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java +++ b/observe-services/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java @@ -52,6 +52,7 @@ public class ObserveServiceFactory implements Closeable { protected ObserveServiceFactory(ObserveApplicationContext applicationContext) { this.applicationContext = applicationContext; this.services = CacheBuilder.newBuilder().build(new CacheLoader<Class<? extends ObserveService>, ObserveService>() { + @Override public ObserveService load(Class<? extends ObserveService> key) throws Exception { Preconditions.checkNotNull(key, "service key can't be null"); @@ -111,7 +112,7 @@ public class ObserveServiceFactory implements Closeable { ObserveServiceContext serviceContext = new ObserveServiceContext(applicationContext, dataSource); S service = newProxyService(serviceType, serviceContext); - return service ; + return service; } diff --git a/observe-services/src/main/java/fr/ird/observe/services/ReplicationService.java b/observe-services/src/main/java/fr/ird/observe/services/ReplicationService.java index 1a4d3cf..d87328e 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/ReplicationService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/ReplicationService.java @@ -13,7 +13,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public interface ReplicationService extends ObserveService{ +public interface ReplicationService extends ObserveService { @Commit void replicateObsoletesEntities(List<TopiaEntity> obsoleteEntities, DataSource source, SendMessageAble messanger) throws DataSourceException; diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/CatchLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/CatchLonglineServiceImpl.java index 361700e..4703ac7 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/CatchLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/CatchLonglineServiceImpl.java @@ -95,8 +95,8 @@ public class CatchLonglineServiceImpl extends AbstractObserveService implements public CatchLongline onCreateChild(CatchLongline childToCreate) { CatchLongline childCreated = super.onCreateChild(childToCreate); - saveSizeMeasures(childToCreate.getSizeMeasure(), childCreated); - saveWeightMeasures(childToCreate.getWeightMeasure(), childCreated); + saveSizeMeasures(childCreated, childToCreate.getSizeMeasure()); + saveWeightMeasures(childCreated, childToCreate.getWeightMeasure()); return childCreated; } @@ -104,23 +104,23 @@ public class CatchLonglineServiceImpl extends AbstractObserveService implements @Override public CatchLongline onUpdateChild(CatchLongline childToUpdate) { - CatchLongline childUpdated = super.onUpdateChild(childToUpdate); - saveSizeMeasures(childToUpdate.getSizeMeasure(), childUpdated); - saveWeightMeasures(childToUpdate.getWeightMeasure(), childUpdated); + CatchLongline childUpdated = super.onUpdateChild(childToUpdate); + saveSizeMeasures(childUpdated, childToUpdate.getSizeMeasure()); + saveWeightMeasures(childUpdated, childToUpdate.getWeightMeasure()); return childUpdated; } - protected void saveSizeMeasures(Collection<SizeMeasure> sizeMeasurementsToSave, CatchLongline childSaved) { + protected void saveSizeMeasures(CatchLongline childSaved, Collection<SizeMeasure> sizeMeasuresToSave) { - List<SizeMeasure> sizeMeasuresToSave = Lists.newArrayList(); + List<SizeMeasure> sizeMeasuresSaveds = Lists.newArrayList(); - if (CollectionUtils.isNotEmpty(sizeMeasurementsToSave)) { + if (CollectionUtils.isNotEmpty(sizeMeasuresToSave)) { TopiaDAO<SizeMeasure> dao = getDao(SizeMeasure.class); TopiaEntityBinder<SizeMeasure> binder = getBinder(SizeMeasure.class, BinderService.EDIT); - for (SizeMeasure sizeMeasureToSave : sizeMeasurementsToSave) { + for (SizeMeasure sizeMeasureToSave : sizeMeasuresToSave) { SizeMeasure sizeMeasureSaved; @@ -136,27 +136,27 @@ public class CatchLonglineServiceImpl extends AbstractObserveService implements } - sizeMeasuresToSave.add(sizeMeasureSaved); + sizeMeasuresSaveds.add(sizeMeasureSaved); } } childSaved.clearSizeMeasure(); - childSaved.addAllSizeMeasure(sizeMeasuresToSave); + childSaved.addAllSizeMeasure(sizeMeasuresSaveds); } - protected void saveWeightMeasures(Collection<WeightMeasure> weightMeasurementsTosave, CatchLongline childSaved) { + protected void saveWeightMeasures(CatchLongline childSaved, Collection<WeightMeasure> weightMeasuresToSave) { - List<WeightMeasure> weightMeasuresToSave = Lists.newArrayList(); + List<WeightMeasure> weightMeasuresSaved = Lists.newArrayList(); - if (CollectionUtils.isNotEmpty(weightMeasurementsTosave)) { + if (CollectionUtils.isNotEmpty(weightMeasuresToSave)) { TopiaDAO<WeightMeasure> dao = getDao(WeightMeasure.class); TopiaEntityBinder<WeightMeasure> binder = getBinder(WeightMeasure.class, BinderService.EDIT); - for (WeightMeasure weightMeasureToSave : weightMeasurementsTosave) { + for (WeightMeasure weightMeasureToSave : weightMeasuresToSave) { WeightMeasure weightMeasureSaved; @@ -172,14 +172,14 @@ public class CatchLonglineServiceImpl extends AbstractObserveService implements } - weightMeasuresToSave.add(weightMeasureSaved); + weightMeasuresSaved.add(weightMeasureSaved); } } childSaved.clearWeightMeasure(); - childSaved.addAllWeightMeasure(weightMeasuresToSave); + childSaved.addAllWeightMeasure(weightMeasuresSaved); } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java index 9013750..e15cd70 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java @@ -147,7 +147,7 @@ public class GearUseFeaturesLonglineServiceImpl extends AbstractObserveService i GearUseFeaturesLongline.PROPERTY_NUMBER, childToCreate.getNumber() ); childBinder.load(childToCreate, childCreated, false); - saveMeasurement(childToCreate.getGearUseFeaturesMeasurement(), childCreated); + saveMeasurement(childCreated, childToCreate.getGearUseFeaturesMeasurement()); return childCreated; } @@ -155,11 +155,11 @@ public class GearUseFeaturesLonglineServiceImpl extends AbstractObserveService i @Override public GearUseFeaturesLongline onUpdateChild(GearUseFeaturesLongline childToUpdate) { GearUseFeaturesLongline childUpdated = super.onUpdateChild(childToUpdate); - saveMeasurement(childToUpdate.getGearUseFeaturesMeasurement(), childUpdated); + saveMeasurement(childUpdated, childToUpdate.getGearUseFeaturesMeasurement()); return childUpdated; } - protected void saveMeasurement(List<GearUseFeaturesMeasurementLongline> measurementsToSave, GearUseFeaturesLongline childSaved) { + protected void saveMeasurement(GearUseFeaturesLongline childSaved, List<GearUseFeaturesMeasurementLongline> measurementsToSave) { List<GearUseFeaturesMeasurementLongline> measurementsSaved = Lists.newArrayList(); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/LonglineGlobalCompositionService.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/LonglineGlobalCompositionService.java index 9c245c2..97baf3e 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/LonglineGlobalCompositionService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/LonglineGlobalCompositionService.java @@ -7,7 +7,7 @@ import fr.ird.observe.services.ObserveService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public interface LonglineGlobalCompositionService extends ObserveService{ +public interface LonglineGlobalCompositionService extends ObserveService { SetLongline loadForEdit(String setLonglineId); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java index 0ee1ac1..0d522b6 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java @@ -2,7 +2,6 @@ package fr.ird.observe.services.data.longline; import fr.ird.observe.BinderService; import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.ActivityLonglines; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineDAO; diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java index 75a2b9e..c83dad2 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java @@ -3,7 +3,6 @@ package fr.ird.observe.services.data.seine; import fr.ird.observe.BinderService; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.constants.seine.SchoolType; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeineDAO; @@ -182,6 +181,7 @@ public class ActivitySeineServiceImpl extends AbstractObserveService implements @Override public void delete(String routeId, String activitySeineId) { doDelete(routeId, activitySeineId, new DeleteAction<Route, ActivitySeine>(Route.class, ActivitySeine.class) { + @Override public void onDelete(Route parent, ActivitySeine toDelete) { super.onDelete(parent, toDelete); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java index c4c6ba2..20b1aaf 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java @@ -20,7 +20,7 @@ public interface FloatingObjectService extends ObserveService { FloatingObject loadForEdit(String floatingObjectId); - FloatingObject loadForEditTransmittingBuoyOperation(String floatingObjectId); + FloatingObject loadForTransmittingBuoyOperation(String floatingObjectId); FloatingObject preCreate(String activitySeineId); @@ -28,7 +28,7 @@ public interface FloatingObjectService extends ObserveService { String save(String activitySeineId, FloatingObject toSave); @Commit - FloatingObject updateTransmittingBuoyOperation(FloatingObject toUpdate); + void saveForTransmittingBuoyOperation(FloatingObject toUpdate); @Commit void delete(String activitySeineId, String floatingObjectId); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java index 2d4a927..6a1df52 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java @@ -3,7 +3,6 @@ package fr.ird.observe.services.data.seine; import fr.ird.observe.BinderService; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; @@ -60,7 +59,7 @@ public class FloatingObjectServiceImpl extends AbstractObserveService implements } @Override - public FloatingObject loadForEditTransmittingBuoyOperation(String floatingObjectId) { + public FloatingObject loadForTransmittingBuoyOperation(String floatingObjectId) { FloatingObjectDAO dao = getDao(); @@ -136,42 +135,45 @@ public class FloatingObjectServiceImpl extends AbstractObserveService implements } @Override - public FloatingObject updateTransmittingBuoyOperation(FloatingObject toUpdate) { + public void saveForTransmittingBuoyOperation(FloatingObject toSave) { - FloatingObject updated = getDao().findByTopiaId(toUpdate.getTopiaId()); - updated.setComment(toUpdate.getComment()); - updated.clearTransmittingBuoy(); + FloatingObject saved = getDao().findByTopiaId(toSave.getTopiaId()); + saved.setComment(toSave.getComment()); + saved.clearTransmittingBuoy(); - if (!toUpdate.isTransmittingBuoyEmpty()) { + if (!toSave.isTransmittingBuoyEmpty()) { TopiaEntityBinder<TransmittingBuoy> binder = getBinder(TransmittingBuoy.class, BinderService.EDIT); TopiaDAO<TransmittingBuoy> transmittingBuoyDAO = getDao(TransmittingBuoy.class); - for (TransmittingBuoy transmittingBuoy : toUpdate.getTransmittingBuoy()) { + List<TransmittingBuoy> transmittingBuoys = new ArrayList<TransmittingBuoy>(); + + for (TransmittingBuoy transmittingBuoyToSave : toSave.getTransmittingBuoy()) { - TransmittingBuoy newTransmittingBuoy; + TransmittingBuoy transmittingBuoySaved; - if (Entities.isNew(transmittingBuoy)) { + if (Entities.isNew(transmittingBuoyToSave)) { // creation de la balise - Map<String, Object> map = binder.obtainProperties(transmittingBuoy); - newTransmittingBuoy = transmittingBuoyDAO.create(map); + Map<String, Object> map = binder.obtainProperties(transmittingBuoyToSave); + transmittingBuoySaved = transmittingBuoyDAO.create(map); } else { // mise a jour de la balise - newTransmittingBuoy = transmittingBuoyDAO.findByTopiaId(transmittingBuoy.getTopiaId()); - binder.load(transmittingBuoy, newTransmittingBuoy, true); + transmittingBuoySaved = transmittingBuoyDAO.findByTopiaId(transmittingBuoyToSave.getTopiaId()); + binder.load(transmittingBuoyToSave, transmittingBuoySaved, true); } - updated.addTransmittingBuoy(newTransmittingBuoy); + transmittingBuoys.add(transmittingBuoySaved); } - } - return updated; + saved.addAllTransmittingBuoy(transmittingBuoys); + + } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java index 6118209..3c2b147 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java @@ -146,8 +146,8 @@ public class GearUseFeaturesSeineServiceImpl extends AbstractObserveService impl GearUseFeaturesSeine childCreated = getDao(entityClass).create( GearUseFeaturesSeine.PROPERTY_GEAR, childToCreate.getGear(), GearUseFeaturesSeine.PROPERTY_NUMBER, childToCreate.getNumber()); - childBinder.load(childToCreate, childCreated, false); - saveMeasurement(childToCreate.getGearUseFeaturesMeasurement(), childCreated); + this.childBinder.load(childToCreate, childCreated, false); + saveMeasurement(childCreated, childToCreate.getGearUseFeaturesMeasurement()); return childCreated; } @@ -156,12 +156,12 @@ public class GearUseFeaturesSeineServiceImpl extends AbstractObserveService impl public GearUseFeaturesSeine onUpdateChild(GearUseFeaturesSeine childToUpdate) { GearUseFeaturesSeine childUpdated = super.onUpdateChild(childToUpdate); - saveMeasurement(childToUpdate.getGearUseFeaturesMeasurement(), childUpdated); + saveMeasurement(childUpdated, childToUpdate.getGearUseFeaturesMeasurement()); return childUpdated; } - protected void saveMeasurement(List<GearUseFeaturesMeasurementSeine> measurementsToSave, GearUseFeaturesSeine childSaved) { + protected void saveMeasurement(GearUseFeaturesSeine childSaved, List<GearUseFeaturesMeasurementSeine> measurementsToSave) { List<GearUseFeaturesMeasurementSeine> measurementsSaved = Lists.newArrayList(); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java index b77ea2f..af19eee 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java @@ -65,12 +65,12 @@ public class NonTargetCatchServiceImpl extends AbstractObserveService implements SetSeine.class, NonTargetCatch.class, getListUpdator(), parentBinder, childbinder) { @Override - public void prepareSave(SetSeine parentToSave, Collection<NonTargetCatch> toSaves) { + public void prepareSave(SetSeine parentToSave, Collection<NonTargetCatch> nonTargetCatchesToSave) { // mise a jour de la propriete nonTargetDiscarded boolean hasRejet = false; - for (NonTargetCatch c : toSaves) { + for (NonTargetCatch c : nonTargetCatchesToSave) { if (c.getReasonForDiscard() != null) { // on a trouve un rejet de faune hasRejet = true; diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/NonTargetSampleServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/NonTargetSampleServiceImpl.java index 48808fd..90189f1 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/NonTargetSampleServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/NonTargetSampleServiceImpl.java @@ -3,7 +3,6 @@ package fr.ird.observe.services.data.seine; import com.google.common.collect.Lists; import fr.ird.observe.BinderService; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.NonTargetLength; @@ -152,6 +151,7 @@ public class NonTargetSampleServiceImpl extends AbstractObserveService implement public String save(String setSeineId, NonTargetSample nonTargetSampleToSave) { String savedId = doSave(setSeineId, nonTargetSampleToSave, new SaveAction<SetSeine, NonTargetSample>(SetSeine.class, NonTargetSample.class) { + @Override public NonTargetSample onCreate(SetSeine parent, NonTargetSample toCreate) { @@ -228,6 +228,7 @@ public class NonTargetSampleServiceImpl extends AbstractObserveService implement public void delete(String setSeineId, NonTargetSample nonTargetSampleToDelete) { doDelete(setSeineId, nonTargetSampleToDelete.getTopiaId(), new DeleteAction<SetSeine, NonTargetSample>(SetSeine.class, NonTargetSample.class) { + @Override public void onDelete(SetSeine parent, NonTargetSample toDelete) { diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ObjectSchoolEstimateServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ObjectSchoolEstimateServiceImpl.java index 10913c3..a5c55b6 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ObjectSchoolEstimateServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ObjectSchoolEstimateServiceImpl.java @@ -15,14 +15,14 @@ import java.util.List; * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class ObjectSchoolEstimateServiceImpl extends AbstractObserveService implements ObjectSchoolEstimateService { - + @Override public FloatingObject loadForEdit(String floatingObjectId) { - + FloatingObject parentToLoad = findByTopiaId(FloatingObject.class, floatingObjectId); FloatingObject parentLoaded = getDao(FloatingObject.class).newInstance(); - + copy(FloatingObject.class, BinderService.EDIT_OBJECT_SCHOOL_ESTIMATE, parentToLoad, parentLoaded); if (!parentToLoad.isObjectSchoolEstimateEmpty()) { diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java index 20de28b..83425be 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java @@ -1,7 +1,6 @@ package fr.ird.observe.services.data.seine; import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.seine.ActivitySeines; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.RouteDAO; @@ -141,6 +140,7 @@ public class RouteServiceImpl extends AbstractObserveService implements RouteSer @Override public void delete(String tripSeineId, String routeId) { doDelete(tripSeineId, routeId, new DeleteAction<TripSeine, Route>(TripSeine.class, Route.class) { + @Override public void onDelete(TripSeine parent, Route toDelete) { super.onDelete(parent, toDelete); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SchoolEstimateServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SchoolEstimateServiceImpl.java index 045a27d..8661272 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SchoolEstimateServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SchoolEstimateServiceImpl.java @@ -69,5 +69,4 @@ public class SchoolEstimateServiceImpl extends AbstractObserveService implements } - } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java index 3d6dd56..d988099 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java @@ -2,7 +2,6 @@ package fr.ird.observe.services.data.seine; import fr.ird.observe.BinderService; import fr.ird.observe.entities.constants.seine.SchoolType; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.entities.seine.Route; @@ -114,11 +113,11 @@ public class SetSeineServiceImpl extends AbstractObserveService implements SetSe SetSeine updated = super.onUpdate(parent, toUpdate); copyExcluding(SetSeine.class, - BinderService.EDIT, - toUpdate, - updated, - SetSeine.PROPERTY_TARGET_SAMPLE, - SetSeine.PROPERTY_NON_TARGET_SAMPLE); + BinderService.EDIT, + toUpdate, + updated, + SetSeine.PROPERTY_TARGET_SAMPLE, + SetSeine.PROPERTY_NON_TARGET_SAMPLE); return updated; } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/TargetSampleServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/TargetSampleServiceImpl.java index fc4682b..976a4cf 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/TargetSampleServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/TargetSampleServiceImpl.java @@ -3,7 +3,6 @@ package fr.ird.observe.services.data.seine; import com.google.common.collect.Lists; import fr.ird.observe.BinderService; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TargetCatch; @@ -171,6 +170,7 @@ public class TargetSampleServiceImpl extends AbstractObserveService implements T public String save(String setSeineId, TargetSample toSave) { String savedId = doSave(setSeineId, toSave, new SaveAction<SetSeine, TargetSample>(SetSeine.class, TargetSample.class) { + @Override public TargetSample onCreate(SetSeine parent, TargetSample toCreate) { @@ -246,6 +246,7 @@ public class TargetSampleServiceImpl extends AbstractObserveService implements T public void delete(String setSeineId, TargetSample bean) { doDelete(setSeineId, bean.getTopiaId(), new DeleteAction<SetSeine, TargetSample>(SetSeine.class, TargetSample.class) { + @Override public void onDelete(SetSeine parent, TargetSample toDelete) { diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java index 8109c1e..8d75881 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java @@ -2,7 +2,6 @@ package fr.ird.observe.services.data.seine; import fr.ird.observe.BinderService; import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.Routes; import fr.ird.observe.entities.seine.TripSeine; diff --git a/observe-services/src/main/java/fr/ird/observe/services/operation/ComputeDataService.java b/observe-services/src/main/java/fr/ird/observe/services/operation/ComputeDataService.java index 9b58b2e..898f8c3 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/operation/ComputeDataService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/operation/ComputeDataService.java @@ -11,7 +11,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public interface ComputeDataService extends ObserveService{ +public interface ComputeDataService extends ObserveService { void consolidateTrips(SendMessageAble messager, Set<String> tripIds); diff --git a/observe-services/src/main/java/fr/ird/observe/services/operation/GpsImportService.java b/observe-services/src/main/java/fr/ird/observe/services/operation/GpsImportService.java index 1bf168b..d5c73be 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/operation/GpsImportService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/operation/GpsImportService.java @@ -15,7 +15,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public interface GpsImportService extends ObserveService { +public interface GpsImportService extends ObserveService { TripSeine getOpenTrip(); diff --git a/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java index 66eb904..232fada 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java @@ -7,7 +7,6 @@ import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.constants.ReferenceStatus; -import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.LengthWeightParameterDAO; import fr.ird.observe.entities.referentiel.LengthWeightParemeterHelper; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css index eb9d468..5601483 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css @@ -85,7 +85,7 @@ #ownership1 { selectedItem:{transmittingBuoy1.getOwnership()}; - enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} + enabled: {!TransmittingBuoyOperations.isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} } #country1Label { @@ -150,7 +150,7 @@ #ownership2 { selectedItem:{transmittingBuoy2.getOwnership()}; - enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} + enabled: {!TransmittingBuoyOperations.isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} } #country2Label { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx index 4d8b676..67ec1ce 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx @@ -31,6 +31,7 @@ fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation fr.ird.observe.entities.referentiel.Country fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation + fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperations fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType fr.ird.observe.ui.actions.shared.ResetEditUIAction fr.ird.observe.ui.actions.shared.SaveEditUIAction diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 186d458..b030899 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -28,6 +28,7 @@ import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.entities.constants.seine.Ownership; import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; +import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperations; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.TransmittingBuoy; @@ -115,7 +116,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH getModel().setEditing(false); FloatingObjectService service = getService(FloatingObjectService.class); - FloatingObject loaded = service.loadForEditTransmittingBuoyOperation(floatingObjectId); + FloatingObject loaded = service.loadForTransmittingBuoyOperation(floatingObjectId); copy(FloatingObject.class, BinderService.EDIT_OBJECT_OPERATION_TRANSMITTING_BUOY, loaded, bean); getUi().processDataBinding(FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM); @@ -177,17 +178,11 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH getModel().setModified(false); } - public boolean isBalisePose(TransmittingBuoyOperation operation) { - return operation != null && "3".equals(operation.getCode()); - } - @Override protected boolean doSave(FloatingObject bean) { - //FIXME On ne doit pas retourner l'objet... FloatingObjectService service = getService(FloatingObjectService.class); - FloatingObject saved = service.updateTransmittingBuoyOperation(bean); - copy(FloatingObject.class, BinderService.EDIT_OBJECT_OPERATION_TRANSMITTING_BUOY, saved, bean); + service.saveForTransmittingBuoyOperation(bean); //FIXME, il faut declancher un evenement dans le cache du storage pour pouvoir redessiner le noeud return true; @@ -228,7 +223,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH JPanel editorPanel = ui.getTransmittingBuoys(); editorPanel.removeAll(); - String[] codeOperations = typeOperation.getCodeOperation(); + String[] operationIds = typeOperation.getOperationIds(); List<TransmittingBuoyOperation> operations = ui.getTransmittingBuoyOperation1().getData(); TransmittingBuoy transmittingBuoy; @@ -248,7 +243,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH transmittingBuoy = reset ? null : objets.get(0); - objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; + objectOperation = reset ? TransmittingBuoyOperations.getObjectOperation(operations, operationIds[0]) : null; bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); editorPanel.setLayout(new GridLayout(1, 0)); @@ -261,11 +256,11 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH case 2: transmittingBuoy = reset ? null : objets.get(0); - objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; + objectOperation = reset ? TransmittingBuoyOperations.getObjectOperation(operations, operationIds[0]) : null; bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); transmittingBuoy = reset ? null : objets.get(1); - objectOperation = reset ? getObjectOperation(operations, codeOperations[1]) : null; + objectOperation = reset ? TransmittingBuoyOperations.getObjectOperation(operations, operationIds[1]) : null; bindEditBalise(ui.getTransmittingBuoy2(), objectOperation, transmittingBuoy); editorPanel.setLayout(new GridLayout(2, 0)); @@ -279,9 +274,11 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { + //FIXME la disposition n'est pas bien recalculée // recalcul de la disposition getUi().revalidate(); } @@ -304,7 +301,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH transmittingBuoyOperation.getLabel1()); } - if (isBalisePose(transmittingBuoyOperation)) { + if (TransmittingBuoyOperations.isBalisePose(transmittingBuoyOperation)) { // objectOperation de pose // toujours appartient au navire @@ -318,23 +315,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH bean.setTransmittingBuoy(new ArrayList<TransmittingBuoy>()); } bean.getTransmittingBuoy().add(editBean); - } - protected TransmittingBuoyOperation getObjectOperation(List<TransmittingBuoyOperation> objectOperations, - String codeOperation) { - TransmittingBuoyOperation objectOperation = null; - for (TransmittingBuoyOperation op : objectOperations) { - if (codeOperation.equals(op.getCode())) { - objectOperation = op; - break; - } - } - if (objectOperation == null) { - throw new IllegalArgumentException( - "could not find a " + - TransmittingBuoyOperation.class + " with code " + codeOperation); - } - return objectOperation; } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index a90ebf8..5a158d1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -45,6 +45,7 @@ import fr.ird.observe.db.util.SecurityModel; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceFactory; +import fr.ird.observe.services.ReplicationService; import fr.ird.observe.services.model.DataSelectionModel; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; @@ -634,7 +635,7 @@ public class StorageUIHandler { try { - fr.ird.observe.services.ReplicationService replicationService = serviceFactory.getService(fr.ird.observe.services.ReplicationService.class); + ReplicationService replicationService = serviceFactory.getService(ReplicationService.class); replicationService.replicateReferentiel(service); replicationService.replicateAllData(service); @@ -677,38 +678,36 @@ public class StorageUIHandler { * * @param service le service locale qui encapsule la base locale * @param dst le fichier de sauvegarde - * @param marees les marees a exporter (si {@code null} on exporte tout) + * @param trips les marees a exporter (si {@code null} on exporte tout) */ - public void backupLocalDatabase(DataSource service, - File dst, - Set<String> marees) { - if (marees == null) { + public void backupLocalDatabase(DataSource service, File dst, Set<String> trips) { + + if (trips == null) { if (log.isInfoEnabled()) { log.info("will export all datas."); } backupLocalDatabase(service, dst); return; } + if (dst == null) { - throw new IllegalArgumentException( - "file where to backup can not be null"); + throw new IllegalArgumentException("file where to backup can not be null"); } if (log.isInfoEnabled()) { - log.info("will export " + marees.size() + " marees to " + dst); + log.info("will export " + trips.size() + " marees to " + dst); } if (log.isDebugEnabled()) { - log.debug(marees); + log.debug(trips); } - // on doit dumper la base distante dans une base h2 et en faire - // la sauvegarde + // on doit dumper la base distante dans une base h2 et en faire la sauvegarde ObserveConfig config = ObserveContext.get().getConfig(); - String[] mareeIds = new String[marees.size()]; + String[] tripIds = new String[trips.size()]; int index = 0; - for (String m : marees) { - mareeIds[index++] = m; + for (String m : trips) { + tripIds[index++] = m; } DataSource tempStorage = null; @@ -724,9 +723,9 @@ public class StorageUIHandler { try { - fr.ird.observe.services.ReplicationService replicationService = serviceFactory.getService(fr.ird.observe.services.ReplicationService.class); + ReplicationService replicationService = serviceFactory.getService(ReplicationService.class); replicationService.replicateReferentiel(service); - replicationService.replicateData(service, mareeIds); + replicationService.replicateData(service, tripIds); } finally { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.