branch feature/7017 updated (97ed503 -> 4229b1f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git from 97ed503 utilisation des binders depuis le binserService pour le moèdle LL (refs #7017) new d284576 fix sur le service des binders (refs #7017) new 4229b1f amélioration du contrat pour enregistrer les collections + application sur le modèle ll (refs #7017) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4229b1f5ed7a309ac932b476dcbd7a26ca42064e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 29 15:44:32 2015 +0200 amélioration du contrat pour enregistrer les collections + application sur le modèle ll (refs #7017) commit d2845761ea6d4d62daece0b7ff4528c7cd0ebd58 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 29 15:43:59 2015 +0200 fix sur le service des binders (refs #7017) Summary of changes: .../main/java/fr/ird/observe/BinderService.java | 6 +- .../observe/services/AbstractObserveService.java | 36 ++++++++++-- .../data/longline/BaitsCompositionServiceImpl.java | 15 +++++ .../BranchlinesCompositionServiceImpl.java | 16 ++++++ .../data/longline/CatchLonglineServiceImpl.java | 15 +++++ .../data/longline/EncounterServiceImpl.java | 15 +++++ .../longline/FloatlinesCompositionServiceImpl.java | 15 +++++ .../GearUseFeaturesLonglineServiceImpl.java | 15 +++++ .../data/longline/HooksCompositionServiceImpl.java | 15 +++++ .../data/longline/SensorUsedServiceImpl.java | 15 +++++ .../services/data/longline/TdrServiceImpl.java | 17 +++++- .../seine/ObjectObservedSpeciesServiceImpl.java | 51 +++++++++-------- .../seine/ObjectSchoolEstimateServiceImpl.java | 51 +++++++++-------- .../data/seine/SchoolEstimateServiceImpl.java | 66 ++++++++++++---------- .../LonglineGlobalCompositionUIHandler.java | 9 +-- .../impl/longline/BaitsCompositionUIHandler.java | 19 +++++-- .../longline/BranchlinesCompositionUIHandler.java | 16 ++++-- .../impl/longline/CatchLonglineUIHandler.java | 14 +++++ .../table/impl/longline/EncounterUIHandler.java | 14 +++++ .../longline/FloatlinesCompositionUIHandler.java | 27 +++++---- .../longline/GearUseFeaturesLonglineUIHandler.java | 14 +++++ .../impl/longline/HooksCompositionUIHandler.java | 23 ++++---- .../table/impl/longline/SensorUsedUIHandler.java | 14 +++++ .../content/table/impl/longline/TdrUIHandler.java | 14 +++++ 24 files changed, 385 insertions(+), 127 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 d2845761ea6d4d62daece0b7ff4528c7cd0ebd58 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 29 15:43:59 2015 +0200 fix sur le service des binders (refs #7017) --- observe-business/src/main/java/fr/ird/observe/BinderService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/BinderService.java b/observe-business/src/main/java/fr/ird/observe/BinderService.java index 31c1fd5..4e72eda 100644 --- a/observe-business/src/main/java/fr/ird/observe/BinderService.java +++ b/observe-business/src/main/java/fr/ird/observe/BinderService.java @@ -37,7 +37,6 @@ import fr.ird.observe.entities.longline.SizeMeasure; import fr.ird.observe.entities.longline.Tdr; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.WeightMeasure; -import fr.ird.observe.entities.seine.TripSeine; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.topia.persistence.util.TopiaEntityHelper; @@ -422,9 +421,6 @@ public class BinderService { SetLongline.PROPERTY_HAULING_BREAKS); - // on ajoute la recopie de l'association route - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_ROUTE); - registerTopiaBinder(SetLongline.class, builder, EDIT); } @@ -491,6 +487,8 @@ public class BinderService { // species tab Tdr.PROPERTY_SPECIES); + builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, Tdr.PROPERTY_SPECIES); + registerTopiaBinder(Tdr.class, builder, EDIT); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 4229b1f5ed7a309ac932b476dcbd7a26ca42064e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 29 15:44:32 2015 +0200 amélioration du contrat pour enregistrer les collections + application sur le modèle ll (refs #7017) --- .../observe/services/AbstractObserveService.java | 36 ++++++++++-- .../data/longline/BaitsCompositionServiceImpl.java | 15 +++++ .../BranchlinesCompositionServiceImpl.java | 16 ++++++ .../data/longline/CatchLonglineServiceImpl.java | 15 +++++ .../data/longline/EncounterServiceImpl.java | 15 +++++ .../longline/FloatlinesCompositionServiceImpl.java | 15 +++++ .../GearUseFeaturesLonglineServiceImpl.java | 15 +++++ .../data/longline/HooksCompositionServiceImpl.java | 15 +++++ .../data/longline/SensorUsedServiceImpl.java | 15 +++++ .../services/data/longline/TdrServiceImpl.java | 17 +++++- .../seine/ObjectObservedSpeciesServiceImpl.java | 51 +++++++++-------- .../seine/ObjectSchoolEstimateServiceImpl.java | 51 +++++++++-------- .../data/seine/SchoolEstimateServiceImpl.java | 66 ++++++++++++---------- .../LonglineGlobalCompositionUIHandler.java | 9 +-- .../impl/longline/BaitsCompositionUIHandler.java | 19 +++++-- .../longline/BranchlinesCompositionUIHandler.java | 16 ++++-- .../impl/longline/CatchLonglineUIHandler.java | 14 +++++ .../table/impl/longline/EncounterUIHandler.java | 14 +++++ .../longline/FloatlinesCompositionUIHandler.java | 27 +++++---- .../longline/GearUseFeaturesLonglineUIHandler.java | 14 +++++ .../impl/longline/HooksCompositionUIHandler.java | 23 ++++---- .../table/impl/longline/SensorUsedUIHandler.java | 14 +++++ .../content/table/impl/longline/TdrUIHandler.java | 14 +++++ 23 files changed, 383 insertions(+), 123 deletions(-) diff --git a/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java b/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java index ed7492b..7ddc8a3 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java @@ -380,7 +380,7 @@ public abstract class AbstractObserveService implements ObserveService { } - protected abstract class SaveCollectionAction<P extends TopiaEntity, E extends TopiaEntity> { + protected class SaveCollectionAction<P extends TopiaEntity, E extends TopiaEntity> { protected final Class<P> parentClass; @@ -388,10 +388,17 @@ public abstract class AbstractObserveService implements ObserveService { protected final EntityListUpdator<P, E> listUpdator; - public SaveCollectionAction(Class<P> parentClass, Class<E> entityClass, EntityListUpdator<P, E> listUpdator) { + protected final TopiaEntityBinder<P> parentBinder; + + protected final TopiaEntityBinder<E> childBinder; + + public SaveCollectionAction(Class<P> parentClass, Class<E> entityClass, EntityListUpdator<P, E> listUpdator, + TopiaEntityBinder<P> parentBinder, TopiaEntityBinder<E> childBinder) { this.parentClass = parentClass; this.entityClass = entityClass; this.listUpdator = listUpdator; + this.parentBinder = parentBinder; + this.childBinder = childBinder; } public void prepareSave(P parent, Collection<E> toSaves) { @@ -402,11 +409,30 @@ public abstract class AbstractObserveService implements ObserveService { // par défaut, rien à faire } - public abstract P onUpdateParent(P parentToSave, P parentSaved); + public P onUpdateParent(P parentToSave, P parentSaved) { + + parentBinder.copyExcluding(parentToSave, parentSaved, listUpdator.getPropertyName()); + parentSaved = getDao(parentClass).update(parentSaved); + return parentSaved; + + } + + public E onCreateChild(E childToCreate) { - public abstract E onCreateChild(E childToSave); + E childCreated = getDao(entityClass).create(); + childBinder.load(childToCreate, childCreated, false); + return childCreated; + + } + + public E onUpdateChild(E childToSave, E childSaved) { + + childBinder.load(childToSave, childSaved, true); + childSaved = getDao(entityClass).update(childSaved); + return childSaved; + + } - public abstract E onUpdateChild(E childToSave, E childSaved); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/BaitsCompositionServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/BaitsCompositionServiceImpl.java index 12d8b37..4fc502e 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/BaitsCompositionServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/BaitsCompositionServiceImpl.java @@ -5,6 +5,7 @@ import fr.ird.observe.entities.longline.BaitsComposition; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.util.ArrayList; @@ -56,6 +57,20 @@ public class BaitsCompositionServiceImpl extends AbstractObserveService implemen @Override public void save(SetLongline setLongline) { + TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_BAITS_COMPOSITION); + TopiaEntityBinder<BaitsComposition> childBinder = getBinder(BaitsComposition.class, BinderService.EDIT); + + doSaveList(setLongline, new SaveCollectionAction<SetLongline, BaitsComposition>( + SetLongline.class, BaitsComposition.class, getListUpdator(), parentBinder, childBinder)); + + } + + protected EntityListUpdator<SetLongline, BaitsComposition> getListUpdator() { + EntityListUpdator<SetLongline, BaitsComposition> listUpdator = EntityListUpdator.newEntityListUpdator( + SetLongline.class, + BaitsComposition.class, + SetLongline.PROPERTY_BAITS_COMPOSITION); + return listUpdator; } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/BranchlinesCompositionServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/BranchlinesCompositionServiceImpl.java index 42197c6..4986d00 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/BranchlinesCompositionServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/BranchlinesCompositionServiceImpl.java @@ -5,6 +5,7 @@ import fr.ird.observe.entities.longline.BranchlinesComposition; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.util.ArrayList; @@ -51,6 +52,21 @@ public class BranchlinesCompositionServiceImpl extends AbstractObserveService im @Override public void save(SetLongline setLongline) { + TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_BRANCHLINES_COMPOSITION); + TopiaEntityBinder<BranchlinesComposition> childBinder = getBinder(BranchlinesComposition.class, BinderService.EDIT); + + doSaveList(setLongline, new SaveCollectionAction<SetLongline, BranchlinesComposition>( + SetLongline.class, BranchlinesComposition.class, getListUpdator(), parentBinder, childBinder)); + + + } + + protected EntityListUpdator<SetLongline, BranchlinesComposition> getListUpdator() { + EntityListUpdator<SetLongline, BranchlinesComposition> listUpdator = EntityListUpdator.newEntityListUpdator( + SetLongline.class, + BranchlinesComposition.class, + SetLongline.PROPERTY_BRANCHLINES_COMPOSITION); + return listUpdator; } } 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 0289a94..212ce50 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 @@ -12,6 +12,7 @@ import fr.ird.observe.entities.longline.WeightMeasure; import fr.ird.observe.entities.longline.WeightMeasureImpl; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.util.ArrayList; @@ -81,6 +82,12 @@ public class CatchLonglineServiceImpl extends AbstractObserveService implements @Override public void save(SetLongline setLongline) { + TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_CATCH_LONGLINE); + TopiaEntityBinder<CatchLongline> childBinder = getBinder(CatchLongline.class, BinderService.EDIT); + + doSaveList(setLongline, new SaveCollectionAction<SetLongline, CatchLongline>( + SetLongline.class, CatchLongline.class, getListUpdator(), parentBinder, childBinder)); + } @Override @@ -119,4 +126,12 @@ public class CatchLonglineServiceImpl extends AbstractObserveService implements protected CatchLonglineDAO getDao() { return (CatchLonglineDAO) getDao(CatchLongline.class); } + + protected EntityListUpdator<SetLongline, CatchLongline> getListUpdator() { + EntityListUpdator<SetLongline, CatchLongline> listUpdator = EntityListUpdator.newEntityListUpdator( + SetLongline.class, + CatchLongline.class, + SetLongline.PROPERTY_CATCH_LONGLINE); + return listUpdator; + } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/EncounterServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/EncounterServiceImpl.java index eff812e..ac74e05 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/EncounterServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/EncounterServiceImpl.java @@ -5,6 +5,7 @@ import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.Encounter; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.util.ArrayList; @@ -53,6 +54,20 @@ public class EncounterServiceImpl extends AbstractObserveService implements Enco @Override public void save(ActivityLongline activityLongline) { + TopiaEntityBinder<ActivityLongline> parentBinder = getBinder(ActivityLongline.class, BinderService.EDIT_ENCOUNTER); + TopiaEntityBinder<Encounter> childBinder = getBinder(Encounter.class, BinderService.EDIT); + + doSaveList(activityLongline, new SaveCollectionAction<ActivityLongline, Encounter>( + ActivityLongline.class, Encounter.class, getListUpdator(), parentBinder, childBinder)); + + } + + protected EntityListUpdator<ActivityLongline, Encounter> getListUpdator() { + EntityListUpdator<ActivityLongline, Encounter> listUpdator = EntityListUpdator.newEntityListUpdator( + ActivityLongline.class, + Encounter.class, + ActivityLongline.PROPERTY_ENCOUNTER); + return listUpdator; } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/FloatlinesCompositionServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/FloatlinesCompositionServiceImpl.java index c434059..44a444f 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/FloatlinesCompositionServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/FloatlinesCompositionServiceImpl.java @@ -5,6 +5,7 @@ import fr.ird.observe.entities.longline.FloatlinesComposition; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.util.ArrayList; @@ -52,6 +53,20 @@ public class FloatlinesCompositionServiceImpl extends AbstractObserveService imp @Override public void save(SetLongline setLongline) { + TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_FLOATLINES_COMPOSITION); + TopiaEntityBinder<FloatlinesComposition> childBinder = getBinder(FloatlinesComposition.class, BinderService.EDIT); + + doSaveList(setLongline, new SaveCollectionAction<SetLongline, FloatlinesComposition>( + SetLongline.class, FloatlinesComposition.class, getListUpdator(), parentBinder, childBinder)); + + } + + protected EntityListUpdator<SetLongline, FloatlinesComposition> getListUpdator() { + EntityListUpdator<SetLongline, FloatlinesComposition> listUpdator = EntityListUpdator.newEntityListUpdator( + SetLongline.class, + FloatlinesComposition.class, + SetLongline.PROPERTY_FLOATLINES_COMPOSITION); + return listUpdator; } } 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 d14f2d0..979c585 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 @@ -9,6 +9,7 @@ import fr.ird.observe.entities.referentiel.Gear; import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.util.ArrayList; @@ -97,10 +98,24 @@ public class GearUseFeaturesLonglineServiceImpl extends AbstractObserveService i @Override public void save(TripLongline tripLongline) { + TopiaEntityBinder<TripLongline> parentBinder = getBinder(TripLongline.class, BinderService.EDIT_GEAR_USE_FEATURES_LONGLINE); + TopiaEntityBinder<GearUseFeaturesLongline> childBinder = getBinder(GearUseFeaturesLongline.class, BinderService.EDIT); + + doSaveList(tripLongline, new SaveCollectionAction<TripLongline, GearUseFeaturesLongline>( + TripLongline.class, GearUseFeaturesLongline.class, getListUpdator(), parentBinder, childBinder)); + } protected GearUseFeaturesMeasurementLonglineDAO getDao() { return (GearUseFeaturesMeasurementLonglineDAO) getDao(GearUseFeaturesMeasurementLongline.class); } + protected EntityListUpdator<TripLongline, GearUseFeaturesLongline> getListUpdator() { + EntityListUpdator<TripLongline, GearUseFeaturesLongline> listUpdator = EntityListUpdator.newEntityListUpdator( + TripLongline.class, + GearUseFeaturesLongline.class, + TripLongline.PROPERTY_GEAR_USE_FEATURES_LONGLINE); + return listUpdator; + } + } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/HooksCompositionServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/HooksCompositionServiceImpl.java index b142407..0f8fc53 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/HooksCompositionServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/HooksCompositionServiceImpl.java @@ -5,6 +5,7 @@ import fr.ird.observe.entities.longline.HooksComposition; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.util.ArrayList; @@ -51,6 +52,20 @@ public class HooksCompositionServiceImpl extends AbstractObserveService implemen @Override public void save(SetLongline setLongline) { + TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_HOOKS_COMPOSITION); + TopiaEntityBinder<HooksComposition> childBinder = getBinder(HooksComposition.class, BinderService.EDIT); + + doSaveList(setLongline, new SaveCollectionAction<SetLongline, HooksComposition>( + SetLongline.class, HooksComposition.class, getListUpdator(), parentBinder, childBinder)); + + } + + protected EntityListUpdator<SetLongline, HooksComposition> getListUpdator() { + EntityListUpdator<SetLongline, HooksComposition> listUpdator = EntityListUpdator.newEntityListUpdator( + SetLongline.class, + HooksComposition.class, + SetLongline.PROPERTY_HOOKS_COMPOSITION); + return listUpdator; } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/SensorUsedServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/SensorUsedServiceImpl.java index dd74fbf..170fd5b 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/SensorUsedServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/SensorUsedServiceImpl.java @@ -8,6 +8,7 @@ import fr.ird.observe.entities.longline.TripLonglineDAO; import fr.ird.observe.entities.referentiel.longline.SensorType; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.text.SimpleDateFormat; @@ -88,6 +89,20 @@ public class SensorUsedServiceImpl extends AbstractObserveService implements Sen @Override public void save(ActivityLongline activityLongline) { + TopiaEntityBinder<ActivityLongline> parentBinder = getBinder(ActivityLongline.class, BinderService.EDIT_SENSOR_USED); + TopiaEntityBinder<SensorUsed> childBinder = getBinder(SensorUsed.class, BinderService.EDIT); + + doSaveList(activityLongline, new SaveCollectionAction<ActivityLongline, SensorUsed>( + ActivityLongline.class, SensorUsed.class, getListUpdator(), parentBinder, childBinder)); + + } + + protected EntityListUpdator<ActivityLongline, SensorUsed> getListUpdator() { + EntityListUpdator<ActivityLongline, SensorUsed> listUpdator = EntityListUpdator.newEntityListUpdator( + ActivityLongline.class, + SensorUsed.class, + ActivityLongline.PROPERTY_SENSOR_USED); + return listUpdator; } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TdrServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TdrServiceImpl.java index a00825a..b650614 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TdrServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TdrServiceImpl.java @@ -7,6 +7,7 @@ import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineDAO; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.text.SimpleDateFormat; @@ -80,12 +81,26 @@ public class TdrServiceImpl extends AbstractObserveService implements TdrService } return parentLoaded; - + } @Override public void save(SetLongline setLongline) { + TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_TDR); + TopiaEntityBinder<Tdr> childBinder = getBinder(Tdr.class, BinderService.EDIT); + + doSaveList(setLongline, new SaveCollectionAction<SetLongline, Tdr>( + SetLongline.class, Tdr.class, getListUpdator(), parentBinder, childBinder)); + + } + + protected EntityListUpdator<SetLongline, Tdr> getListUpdator() { + EntityListUpdator<SetLongline, Tdr> listUpdator = EntityListUpdator.newEntityListUpdator( + SetLongline.class, + Tdr.class, + SetLongline.PROPERTY_TDR); + return listUpdator; } } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ObjectObservedSpeciesServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ObjectObservedSpeciesServiceImpl.java index e7d37c2..0fddc44 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ObjectObservedSpeciesServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ObjectObservedSpeciesServiceImpl.java @@ -48,30 +48,35 @@ public class ObjectObservedSpeciesServiceImpl extends AbstractObserveService imp @Override public void save(FloatingObject floatingObject) { - doSaveList(floatingObject, new SaveCollectionAction<FloatingObject, ObjectObservedSpecies>(FloatingObject.class, ObjectObservedSpecies.class, getListUpdator()) { - @Override - public FloatingObject onUpdateParent(FloatingObject parentToSave, FloatingObject parentSaved) { - getBinderForFloatingObjectEdit().copyExcluding(parentToSave, parentSaved, FloatingObject.PROPERTY_OBJECT_OBSERVED_SPECIES); - getDao(FloatingObject.class).update(parentSaved); - return parentSaved; - } - - @Override - public ObjectObservedSpecies onCreateChild(ObjectObservedSpecies childToSave) { - ObjectObservedSpecies childSaved = getDao(ObjectObservedSpecies.class).newInstance(); - getBinderForObjectObservedSpeciesEdit().copy(childToSave, childSaved); - getDao(ObjectObservedSpecies.class).create(childSaved); - return childSaved; - } - - @Override - public ObjectObservedSpecies onUpdateChild(ObjectObservedSpecies childToSave, ObjectObservedSpecies childSaved) { - getBinderForObjectObservedSpeciesEdit().copy(childToSave, childSaved); - getDao(ObjectObservedSpecies.class).update(childSaved); - return childSaved; - } - }); + TopiaEntityBinder<FloatingObject> parentBinder = getBinderForFloatingObjectEdit(); + TopiaEntityBinder<ObjectObservedSpecies> childbinder = getBinderForObjectObservedSpeciesEdit(); + + doSaveList(floatingObject, new SaveCollectionAction<FloatingObject, ObjectObservedSpecies>( + FloatingObject.class, ObjectObservedSpecies.class, getListUpdator(), parentBinder, childbinder)); + +// @Override +// public FloatingObject onUpdateParent(FloatingObject parentToSave, FloatingObject parentSaved) { +// getBinderForFloatingObjectEdit().copyExcluding(parentToSave, parentSaved, FloatingObject.PROPERTY_OBJECT_OBSERVED_SPECIES); +// getDao(FloatingObject.class).update(parentSaved); +// return parentSaved; +// } +// +// @Override +// public ObjectObservedSpecies onCreateChild(ObjectObservedSpecies childToSave) { +// ObjectObservedSpecies childSaved = getDao(ObjectObservedSpecies.class).newInstance(); +// getBinderForObjectObservedSpeciesEdit().copy(childToSave, childSaved); +// getDao(ObjectObservedSpecies.class).create(childSaved); +// return childSaved; +// } +// +// @Override +// public ObjectObservedSpecies onUpdateChild(ObjectObservedSpecies childToSave, ObjectObservedSpecies childSaved) { +// getBinderForObjectObservedSpeciesEdit().copy(childToSave, childSaved); +// getDao(ObjectObservedSpecies.class).update(childSaved); +// return childSaved; +// } +// }); } 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 34b8409..b947c96 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 @@ -49,30 +49,35 @@ public class ObjectSchoolEstimateServiceImpl extends AbstractObserveService impl @Override public void save(FloatingObject floatingObject) { - doSaveList(floatingObject, new SaveCollectionAction<FloatingObject, ObjectSchoolEstimate>(FloatingObject.class, ObjectSchoolEstimate.class, getListUpdator()) { - @Override - public FloatingObject onUpdateParent(FloatingObject parentToSave, FloatingObject parentSaved) { - getBinderForFloatingObjectEdit().copyExcluding(parentToSave, parentSaved, FloatingObject.PROPERTY_OBJECT_SCHOOL_ESTIMATE); - getDao(FloatingObject.class).update(parentSaved); - return parentSaved; - } - - @Override - public ObjectSchoolEstimate onCreateChild(ObjectSchoolEstimate childToSave) { - ObjectSchoolEstimate childSaved = getDao(ObjectSchoolEstimate.class).newInstance(); - getBinderForObjectSchoolEstimateEdit().copy(childToSave, childSaved); - getDao(ObjectSchoolEstimate.class).create(childSaved); - return childSaved; - } - - @Override - public ObjectSchoolEstimate onUpdateChild(ObjectSchoolEstimate childToSave, ObjectSchoolEstimate childSaved) { - getBinderForObjectSchoolEstimateEdit().copy(childToSave, childSaved); - getDao(ObjectSchoolEstimate.class).update(childSaved); - return childSaved; - } - }); + TopiaEntityBinder<FloatingObject> parentBinder = getBinderForFloatingObjectEdit(); + TopiaEntityBinder<ObjectSchoolEstimate> childBinder = getBinderForObjectSchoolEstimateEdit(); + + doSaveList(floatingObject, new SaveCollectionAction<FloatingObject, ObjectSchoolEstimate>( + FloatingObject.class, ObjectSchoolEstimate.class, getListUpdator(), parentBinder, childBinder)); + +// @Override +// public FloatingObject onUpdateParent(FloatingObject parentToSave, FloatingObject parentSaved) { +// getBinderForFloatingObjectEdit().copyExcluding(parentToSave, parentSaved, FloatingObject.PROPERTY_OBJECT_SCHOOL_ESTIMATE); +// getDao(FloatingObject.class).update(parentSaved); +// return parentSaved; +// } +// +// @Override +// public ObjectSchoolEstimate onCreateChild(ObjectSchoolEstimate childToSave) { +// ObjectSchoolEstimate childSaved = getDao(ObjectSchoolEstimate.class).newInstance(); +// getBinderForObjectSchoolEstimateEdit().copy(childToSave, childSaved); +// getDao(ObjectSchoolEstimate.class).create(childSaved); +// return childSaved; +// } +// +// @Override +// public ObjectSchoolEstimate onUpdateChild(ObjectSchoolEstimate childToSave, ObjectSchoolEstimate childSaved) { +// getBinderForObjectSchoolEstimateEdit().copy(childToSave, childSaved); +// getDao(ObjectSchoolEstimate.class).update(childSaved); +// return childSaved; +// } +// }); } @Override 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 9509a8d..1959817 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 @@ -10,7 +10,6 @@ import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.BinderModelBuilder; import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** @@ -53,37 +52,42 @@ public class SchoolEstimateServiceImpl extends AbstractObserveService implements @Override public void save(SetSeine parent) { - doSaveList(parent, new SaveCollectionAction<SetSeine, SchoolEstimate>(SetSeine.class, SchoolEstimate.class, getListUpdator()) { - @Override - public void prepareSave(SetSeine parent, Collection<SchoolEstimate> toSaves) { - for (SchoolEstimate child : toSaves) { - child.setSetSeine(parent); - } - } - - @Override - public SetSeine onUpdateParent(SetSeine parentToSave, SetSeine parentSaved) { - getBinderForSetSeineEdit().copyExcluding(parentToSave, parentSaved, SetSeine.PROPERTY_SCHOOL_ESTIMATE); - getDao(SetSeine.class).update(parentSaved); - return parentSaved; - } - - @Override - public SchoolEstimate onCreateChild(SchoolEstimate childToSave) { - SchoolEstimate childSaved = getDao(SchoolEstimate.class).newInstance(); - getBinderForSchoolEstimateEdit().copy(childToSave, childSaved); - getDao(SchoolEstimate.class).create(childSaved); - return childSaved; - } - - @Override - public SchoolEstimate onUpdateChild(SchoolEstimate childToSave, SchoolEstimate childSaved) { - getBinderForSchoolEstimateEdit().copy(childToSave, childSaved); - getDao(SchoolEstimate.class).update(childSaved); - return childSaved; - } - }); + TopiaEntityBinder<SetSeine> parentBinder = getBinderForSetSeineEdit(); + TopiaEntityBinder<SchoolEstimate> childBinder = getBinderForSchoolEstimateEdit(); + + doSaveList(parent, new SaveCollectionAction<SetSeine, SchoolEstimate>( + SetSeine.class, SchoolEstimate.class, getListUpdator(), parentBinder, childBinder)); +// +// @Override +// public void prepareSave(SetSeine parent, Collection<SchoolEstimate> toSaves) { +// for (SchoolEstimate child : toSaves) { +// child.setSetSeine(parent); +// } +// } +// +// @Override +// public SetSeine onUpdateParent(SetSeine parentToSave, SetSeine parentSaved) { +// getBinderForSetSeineEdit().copyExcluding(parentToSave, parentSaved, SetSeine.PROPERTY_SCHOOL_ESTIMATE); +// getDao(SetSeine.class).update(parentSaved); +// return parentSaved; +// } +// +// @Override +// public SchoolEstimate onCreateChild(SchoolEstimate childToSave) { +// SchoolEstimate childSaved = getDao(SchoolEstimate.class).newInstance(); +// getBinderForSchoolEstimateEdit().copy(childToSave, childSaved); +// getDao(SchoolEstimate.class).create(childSaved); +// return childSaved; +// } +// +// @Override +// public SchoolEstimate onUpdateChild(SchoolEstimate childToSave, SchoolEstimate childSaved) { +// getBinderForSchoolEstimateEdit().copy(childToSave, childSaved); +// getDao(SchoolEstimate.class).update(childSaved); +// return childSaved; +// } +// }); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index d02be9e..d176a38 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -202,10 +202,11 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong beanToSave.clearMitigationType(); beanToSave.addAllMitigationType(getBean().getMitigationType()); - getUi().getFloatlinesCompositionUI().getHandler().onUpdate(tx, parentBean, beanToSave); - getUi().getBranchlinesCompositionUI().getHandler().onUpdate(tx, parentBean, beanToSave); - getUi().getHooksCompositionUI().getHandler().onUpdate(tx, parentBean, beanToSave); - getUi().getBaitsCompositionUI().getHandler().onUpdate(tx, parentBean, beanToSave); + //FIXME +// getUi().getFloatlinesCompositionUI().getHandler().onUpdate(tx, parentBean, beanToSave); +// getUi().getBranchlinesCompositionUI().getHandler().onUpdate(tx, parentBean, beanToSave); +// getUi().getHooksCompositionUI().getHandler().onUpdate(tx, parentBean, beanToSave); +// getUi().getBaitsCompositionUI().getHandler().onUpdate(tx, parentBean, beanToSave); return beanToSave; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java index a3640c5..42bdefa 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java @@ -34,8 +34,6 @@ import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -78,6 +76,14 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override + protected void doPersist(SetLongline editBean) { + + BaitsCompositionService service = getService(BaitsCompositionService.class); + service.save(editBean); + + } + + @Override protected void onSelectedRowChanged(int editingRow, BaitsComposition bean, boolean create) { if (getTableModel().isEditable()) { @@ -125,12 +131,13 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); + public void afterSave(boolean refresh) { + super.afterSave(refresh); } + //TODO Supprimer saveUI et mettre saveUI2 a la place @Override - public void afterSave(boolean refresh) { - super.afterSave(refresh); + public final void saveUI(boolean refresh) { + saveUI2(refresh); } } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index fa25f1f..cdfcc88 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -34,8 +34,6 @@ import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -122,13 +120,23 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo } @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); + protected void doPersist(SetLongline editBean) { + + BranchlinesCompositionService service = getService(BranchlinesCompositionService.class); + service.save(editBean); + } + @Override public void afterSave(boolean refresh) { super.afterSave(refresh); } + //TODO Supprimer saveUI et mettre saveUI2 a la place + @Override + public final void saveUI(boolean refresh) { + saveUI2(refresh); + } + } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index a6819aa..fdfc42c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -182,6 +182,14 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } @Override + protected void doPersist(SetLongline editBean) { + + CatchLonglineService service = getService(CatchLonglineService.class); + service.save(editBean); + + } + + @Override protected void onSelectedRowChanged(int editingRow, CatchLongline bean, boolean create) { if (log.isInfoEnabled()) { @@ -917,4 +925,10 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C return (CatchLonglineTableModel) super.getTableModel(); } + //TODO Supprimer saveUI et mettre saveUI2 a la place + @Override + public final void saveUI(boolean refresh) { + saveUI2(refresh); + } + } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java index 427695e..166b706 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java @@ -75,6 +75,14 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLongline, } @Override + protected void doPersist(ActivityLongline editBean) { + + EncounterService service = getService(EncounterService.class); + service.save(editBean); + + } + + @Override protected void onSelectedRowChanged(int editingRow, Encounter bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -115,4 +123,10 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLongline, super.initUI(); } + + //TODO Supprimer saveUI et mettre saveUI2 a la place + @Override + public final void saveUI(boolean refresh) { + saveUI2(refresh); + } } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java index 6b96f69..e27355b 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java @@ -23,9 +23,6 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.BinderService; -import fr.ird.observe.DataService; -import fr.ird.observe.db.DataContext; -import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.entities.longline.FloatlinesComposition; @@ -36,8 +33,6 @@ import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -80,6 +75,14 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon } @Override + protected void doPersist(SetLongline editBean) { + + FloatlinesCompositionService service = getService(FloatlinesCompositionService.class); + service.save(editBean); + + } + + @Override protected void onSelectedRowChanged(int editingRow, FloatlinesComposition bean, boolean create) { if (getTableModel().isEditable()) { @@ -122,17 +125,13 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon } @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } - - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); + public void afterSave(boolean refresh) { + super.afterSave(refresh); } + //TODO Supprimer saveUI et mettre saveUI2 a la place @Override - public void afterSave(boolean refresh) { - super.afterSave(refresh); + public final void saveUI(boolean refresh) { + saveUI2(refresh); } } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 9596458..12129ff 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -140,6 +140,14 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } @Override + protected void doPersist(TripLongline editBean) { + + GearUseFeaturesLonglineService service = getService(GearUseFeaturesLonglineService.class); + service.save(editBean); + + } + + @Override protected void onSelectedRowChanged(int editingRow, GearUseFeaturesLongline bean, boolean create) { if (log.isInfoEnabled()) { @@ -567,4 +575,10 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } } + + //TODO Supprimer saveUI et mettre saveUI2 a la place + @Override + public final void saveUI(boolean refresh) { + saveUI2(refresh); + } } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java index 6f9b457..40cc700 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java @@ -23,9 +23,6 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.BinderService; -import fr.ird.observe.DataService; -import fr.ird.observe.db.DataContext; -import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.entities.longline.HooksComposition; @@ -37,8 +34,6 @@ import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -81,6 +76,14 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override + protected void doPersist(SetLongline editBean) { + + HooksCompositionService service = getService(HooksCompositionService.class); + service.save(editBean); + + } + + @Override protected void onSelectedRowChanged(int editingRow, HooksComposition bean, boolean create) { if (getTableModel().isEditable()) { @@ -124,14 +127,10 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline } + //TODO Supprimer saveUI et mettre saveUI2 a la place @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } - - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); + public final void saveUI(boolean refresh) { + saveUI2(refresh); } @Override diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java index d7bb9d9..662960c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -93,6 +93,14 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, } @Override + protected void doPersist(ActivityLongline editBean) { + + SensorUsedService service = getService(SensorUsedService.class); + service.save(editBean); + + } + + @Override protected void onSelectedRowChanged(int editingRow, SensorUsed bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -235,4 +243,10 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, } + //TODO Supprimer saveUI et mettre saveUI2 a la place + @Override + public final void saveUI(boolean refresh) { + saveUI2(refresh); + } + } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index 68f8b37..f2fee7c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -142,6 +142,14 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } @Override + protected void doPersist(SetLongline editBean) { + + TdrService service = getService(TdrService.class); + service.save(editBean); + + } + + @Override protected void onSelectedRowChanged(int editingRow, Tdr bean, boolean create) { ContentTableModel<SetLongline, Tdr> model = getTableModel(); @@ -476,4 +484,10 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { bean.setFishingEnd(timestamp); } + + //TODO Supprimer saveUI et mettre saveUI2 a la place + @Override + public final void saveUI(boolean refresh) { + saveUI2(refresh); + } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm