This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit dbc9837fdd28940619f5d5dfb509102e2033992b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 16:36:32 2015 +0200 Suppression de la méthode createOpeningBinder dans les modèles d'ui --- .../fr/ird/observe/ui/content/ContentUIModel.java | 4 -- .../content/impl/longline/BranchlineUIModel.java | 37 ------------ .../longline/LonglineDetailCompositionUIModel.java | 27 --------- .../longline/LonglineGlobalCompositionUIModel.java | 17 ------ .../content/impl/longline/SetLonglineUIModel.java | 68 ---------------------- .../seine/ActivitySeineObservedSystemUIModel.java | 14 ----- ...tingObjectTransmittingBuoyOperationUIModel.java | 15 ----- .../content/impl/seine/FloatingObjectUIModel.java | 18 ------ .../ui/content/impl/seine/SetSeineUIModel.java | 30 ---------- .../impl/longline/ActivityLonglinesUIModel.java | 25 -------- .../list/impl/longline/TripLonglinesUIModel.java | 19 ------ .../list/impl/seine/ActivitySeinesUIModel.java | 32 ---------- .../ui/content/list/impl/seine/RoutesUIModel.java | 19 ------ .../content/list/impl/seine/TripSeinesUIModel.java | 19 ------ .../impl/longline/ActivityLonglineUIModel.java | 31 ---------- .../open/impl/longline/TripLonglineUIModel.java | 31 ---------- .../open/impl/seine/ActivitySeineUIModel.java | 35 ----------- .../ui/content/open/impl/seine/RouteUIModel.java | 21 ------- .../content/open/impl/seine/TripSeineUIModel.java | 31 ---------- .../ui/content/ref/ContentReferenceUIModel.java | 18 ------ .../ui/content/ref/ReferenceHomeUIModel.java | 7 --- .../ui/content/table/ContentTableUIModel.java | 17 +----- 22 files changed, 2 insertions(+), 533 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index bcb218f..5259b99 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -21,14 +21,12 @@ */ package fr.ird.observe.ui.content; -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; -import org.nuiton.util.beans.BinderModelBuilder; /** * Le modèle d'un écran d'édition @@ -120,8 +118,6 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab } - protected abstract BinderModelBuilder<E, E> createOpeningBinder(ObserveSwingBinderService binderService, String binderName); - public E getBean() { return bean; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java index 9f8cdb6..438e68f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java @@ -23,11 +23,9 @@ package fr.ird.observe.ui.content.impl.longline; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.DateUtil; -import org.nuiton.util.beans.BinderModelBuilder; import java.util.Date; import java.util.Set; @@ -84,41 +82,6 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { super(BranchlineDto.class); } - @Override - protected BinderModelBuilder<BranchlineDto, BranchlineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<BranchlineDto, BranchlineDto> builder = binderService.newBinderBuilder( - BranchlineDto.class, - BranchlineDto.PROPERTY_COMMENT, - - // general tab - BranchlineDto.PROPERTY_TOP_TYPE, - BranchlineDto.PROPERTY_TRACELINE_TYPE, - BranchlineDto.PROPERTY_DEPTH_RECORDER, - BranchlineDto.PROPERTY_HOOK_LOST, - BranchlineDto.PROPERTY_TRACE_CUT_OFF, - BranchlineDto.PROPERTY_WEIGHTED_SWIVEL, - BranchlineDto.PROPERTY_SWIVEL_WEIGHT, - BranchlineDto.PROPERTY_WEIGHTED_SNAP, - BranchlineDto.PROPERTY_SNAP_WEIGHT, - BranchlineDto.PROPERTY_BAIT_TYPE, - BranchlineDto.PROPERTY_TIMER, - BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, - BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD, - - // hook and bait tab - BranchlineDto.PROPERTY_HOOK_TYPE, - BranchlineDto.PROPERTY_HOOK_SIZE, - BranchlineDto.PROPERTY_HOOK_OFFSET, - BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, - BranchlineDto.PROPERTY_BAIT_HAULING_STATUS - - ); - - return builder; - - } - public BranchlineDto getBranchline() { return branchlineDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java index cd247f4..26e71d7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java @@ -22,10 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 12/5/14. @@ -230,29 +228,4 @@ public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLongline // return sectionBinder; // } - @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - // SetLongline binder - - BinderModelBuilder<SetLonglineDto, SetLonglineDto> builderSetLongline = binderService.newBinderBuilder( - SetLonglineDto.class, - //FIXME -// SetLonglineDto.PROPERTY_SECTION, - SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, - SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, - SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, - SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, - SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - SetLonglineDto.PROPERTY_HAULING_BREAKS, - SetLonglineDto.PROPERTY_MONITORED, - SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT - ); - //FIXME -// builderSetLongline.addCollectionBinder(getSectionBinder(), SetLongline.PROPERTY_SECTION); - return builderSetLongline; - - } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java index 2a61224..83418a5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java @@ -22,10 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 12/5/14. @@ -41,19 +39,4 @@ public class LonglineGlobalCompositionUIModel extends ContentUIModel<SetLongline super(SetLonglineDto.class); } - @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<SetLonglineDto, SetLonglineDto> builder = binderService.newBinderBuilder( - SetLonglineDto.class, - //FIXME -// SetLonglineDto.PROPERTY_MITIGATION_TYPE, - SetLonglineDto.PROPERTY_COMMENT); - - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, SetLonglineDto.PROPERTY_MITIGATION_TYPE); - - return builder; - - } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java index 5e56f09..9a9bc26 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java @@ -23,11 +23,9 @@ package fr.ird.observe.ui.content.impl.longline; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.DateUtil; -import org.nuiton.util.beans.BinderModelBuilder; import java.util.Date; import java.util.Set; @@ -135,72 +133,6 @@ public class SetLonglineUIModel extends ContentUIModel<SetLonglineDto> { super(SetLonglineDto.class); } - @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<SetLonglineDto, SetLonglineDto> builder = binderService.newBinderBuilder( - SetLonglineDto.class, - SetLonglineDto.PROPERTY_COMMENT, - - // setting tab - SetLonglineDto.PROPERTY_HOME_ID, - SetLonglineDto.PROPERTY_NUMBER, - - SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, - //FIXME -// SetLonglineDto.PROPERTY_SETTING_START_QUADRANT, - SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, - SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, - - SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, - //FIXME -// SetLonglineDto.PROPERTY_SETTING_END_QUADRANT, - SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, - SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE, - - // setting caracteristics tab - SetLonglineDto.PROPERTY_SETTING_SHAPE, - SetLonglineDto.PROPERTY_LINE_TYPE, - SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, - SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, - SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, - SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, - SetLonglineDto.PROPERTY_SHOOTER_USED, - SetLonglineDto.PROPERTY_SHOOTER_SPEED, - SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, - SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, - SetLonglineDto.PROPERTY_WEIGHTED_SNAP, - SetLonglineDto.PROPERTY_SNAP_WEIGHT, - SetLonglineDto.PROPERTY_MONITORED, - SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, - SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, - SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, - SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, - SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT, - - // hauling tab - SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - - //FIXME -// SetLonglineDto.PROPERTY_HAULING_START_QUADRANT, - SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, - SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, - SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, - - //FIXME -// SetLonglineDto.PROPERTY_HAULING_END_QUADRANT, - SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, - SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, - SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, - - SetLonglineDto.PROPERTY_HAULING_BREAKS); - - return builder; - - } - public boolean isHaulingTabValid() { return haulingTabValid; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java index 4d14298..1cf900c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java @@ -41,18 +41,4 @@ public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivityS super(ActivitySeineObservedSystemDto.class); } - @Override - protected BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> builder = binderService.newBinderBuilder( - ActivitySeineObservedSystemDto.class, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, - ActivitySeineObservedSystemDto.PROPERTY_COMMENT, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE - ); - - return builder; - - } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java index c9c2817..7c3fc2a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java @@ -22,10 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/28/14. @@ -41,17 +39,4 @@ public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIMod super(FloatingObjectTransmittingBuoyDto.class); } - @Override - protected BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> builder = binderService.newBinderBuilder( - FloatingObjectTransmittingBuoyDto.class, - FloatingObjectTransmittingBuoyDto.PROPERTY_COMMENT, - FloatingObjectTransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY - ); - - return builder; - - } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java index 41cb271..594a484 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java @@ -22,10 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/28/14. @@ -41,20 +39,4 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { super(FloatingObjectDto.class); } - @Override - protected BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> builder = binderService.newBinderBuilder( - FloatingObjectDto.class, - FloatingObjectDto.PROPERTY_OBJECT_TYPE, - FloatingObjectDto.PROPERTY_OBJECT_FATE, - FloatingObjectDto.PROPERTY_OBJECT_OPERATION, - FloatingObjectDto.PROPERTY_COMMENT, - FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME, - FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT); - - return builder; - - } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java index 8686d19..efa026a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java @@ -23,10 +23,8 @@ package fr.ird.observe.ui.content.impl.seine; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.util.beans.BinderModelBuilder; import java.util.Set; @@ -93,32 +91,4 @@ public class SetSeineUIModel extends ContentUIModel<SetSeineDto> { firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); } - @Override - protected BinderModelBuilder<SetSeineDto, SetSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<SetSeineDto, SetSeineDto> builder = binderService.newBinderBuilder( - SetSeineDto.class, - SetSeineDto.PROPERTY_COMMENT, - SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME, - SetSeineDto.PROPERTY_START_TIME, - SetSeineDto.PROPERTY_END_SET_TIME_STAMP, - SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP, - SetSeineDto.PROPERTY_CURRENT_DIRECTION, - SetSeineDto.PROPERTY_CURRENT_SPEED, - SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, - SetSeineDto.PROPERTY_SCHOOL_THICKNESS, - SetSeineDto.PROPERTY_MAX_GEAR_DEPTH, - SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH, - SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH, - SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, - SetSeineDto.PROPERTY_TARGET_DISCARDED, - SetSeineDto.PROPERTY_NON_TARGET_DISCARDED, - SetSeineDto.PROPERTY_SCHOOL_TYPE, - SetSeineDto.PROPERTY_SONAR_USED - ); - - return builder; - - } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java index be6ec15..bc0966d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java @@ -42,29 +42,4 @@ public class ActivityLonglinesUIModel extends ContentListUIModel<TripLonglineDto super(TripLonglineDto.class, ActivityLonglineDto.class); } - @Override - protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<TripLonglineDto, TripLonglineDto> builder = binderService.newBinderBuilder( - TripLonglineDto.class, - TripLonglineDto.PROPERTY_OPEN - //FIXME -// TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE - ); - - BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> builder2 = binderService.newBinderBuilder( - ActivityLonglineDto.class, - ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_TIME_STAMP, - ActivityLonglineDto.PROPERTY_OPEN); - - //FIXME -// TopiaEntityBinder<ActivityLongline> binder = -// binderService.registerTopiaBinder(ActivityLongline.class, builder2, binderName); -// -// builder.addCollectionBinder(binder, TripLongline.PROPERTY_ACTIVITY_LONGLINE); - - return builder; - - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java index eca55c5..c704361 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java @@ -22,11 +22,9 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.list.ContentListUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,21 +40,4 @@ public class TripLonglinesUIModel extends ContentListUIModel<ProgramDto, TripLon super(ProgramDto.class, TripLonglineDto.class); } - @Override - protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ProgramDto, ProgramDto> builder = binderService.newBinderBuilder( - ProgramDto.class, - ProgramDto.PROPERTY_LABEL1, - ProgramDto.PROPERTY_LABEL2, - ProgramDto.PROPERTY_LABEL3, - ProgramDto.PROPERTY_LABEL4, - ProgramDto.PROPERTY_LABEL5, - ProgramDto.PROPERTY_LABEL6, - ProgramDto.PROPERTY_LABEL7, - ProgramDto.PROPERTY_LABEL8); - - return builder; - - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java index 0dab03d..5ed9d2e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java @@ -22,11 +22,9 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.list.ContentListUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,34 +40,4 @@ public class ActivitySeinesUIModel extends ContentListUIModel<RouteDto, Activity super(RouteDto.class, ActivitySeineDto.class); } - @Override - protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<RouteDto, RouteDto> builder = binderService.newBinderBuilder( - RouteDto.class, - RouteDto.PROPERTY_OPEN - //FIXME -// RouteDto.PROPERTY_ACTIVITY_SEINE - ); - -// // on ajoute la recopie de l'association route -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, -// Route.PROPERTY_ACTIVITY_SEINE -// ); - - BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder2 = binderService.newBinderBuilder( - ActivitySeineDto.class, - ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_TIME, - ActivitySeineDto.PROPERTY_OPEN); - - //FIXME -// TopiaEntityBinder<ActivitySeineDto> binder = -// binderService.registerTopiaBinder(ActivitySeineDto.class, builder2, binderName); -// -// builder.addCollectionBinder(binder, RouteDto.PROPERTY_ACTIVITY_SEINE); - - return builder; - - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java index dfb515e..c56922e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java @@ -22,11 +22,9 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.list.ContentListUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,21 +40,4 @@ public class RoutesUIModel extends ContentListUIModel<TripSeineDto, RouteDto> { super(TripSeineDto.class, RouteDto.class); } - @Override - protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<TripSeineDto, TripSeineDto> builder = binderService.newBinderBuilder( - TripSeineDto.class, - TripSeineDto.PROPERTY_OPEN - //FIXME -// TripSeineDto.PROPERTY_ROUTE - ); - - // on ajoute la recopie de l'association route - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeineDto.PROPERTY_ROUTE); - - return builder; - - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java index 2a5502b..f28ed51 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java @@ -22,11 +22,9 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.list.ContentListUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,21 +40,4 @@ public class TripSeinesUIModel extends ContentListUIModel<ProgramDto, TripSeineD super(ProgramDto.class, TripSeineDto.class); } - @Override - protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ProgramDto, ProgramDto> builder = binderService.newBinderBuilder( - ProgramDto.class, - ProgramDto.PROPERTY_LABEL1, - ProgramDto.PROPERTY_LABEL2, - ProgramDto.PROPERTY_LABEL3, - ProgramDto.PROPERTY_LABEL4, - ProgramDto.PROPERTY_LABEL5, - ProgramDto.PROPERTY_LABEL6, - ProgramDto.PROPERTY_LABEL7, - ProgramDto.PROPERTY_LABEL8); - - return builder; - - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java index 4fad78a..b32227c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java @@ -53,37 +53,6 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong super(ActivityLonglineDto.class); } - @Override - protected BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> builder = binderService.newBinderBuilder( - ActivityLonglineDto.class, - //FIXME -// ActivityLonglineDto.PROPERTY_QUADRANT, - ActivityLonglineDto.PROPERTY_LATITUDE, - ActivityLonglineDto.PROPERTY_LONGITUDE, - ActivityLonglineDto.PROPERTY_TIME_STAMP, - ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivityLonglineDto.PROPERTY_COMMENT, - //FIXME -// ActivityLonglineDto.PROPERTY_SET_LONGLINE, - ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_FPA_ZONE, - ActivityLonglineDto.PROPERTY_OPEN - //FIXME -// ActivityLonglineDto.PROPERTY_ENCOUNTER, -// ActivityLonglineDto.PROPERTY_SENSOR_USED - ); - - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivityLonglineDto.PROPERTY_ENCOUNTER); - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivityLonglineDto.PROPERTY_SENSOR_USED); - - return builder; - - } - public boolean isSetOperation() { ReferentialReferenceDto<VesselActivityLonglineDto> vesselActivityLongline = bean.getVesselActivityLongline(); return vesselActivityLongline != null diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java index 58f2eaf..aaceab0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,32 +39,4 @@ public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto> super(TripLonglineDto.class); } - @Override - protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<TripLonglineDto, TripLonglineDto> builder = binderService.newBinderBuilder( - TripLonglineDto.class, - TripLonglineDto.PROPERTY_START_DATE, - TripLonglineDto.PROPERTY_END_DATE, - TripLonglineDto.PROPERTY_TRIP_TYPE, - TripLonglineDto.PROPERTY_HOME_ID, - TripLonglineDto.PROPERTY_COMMENT, - TripLonglineDto.PROPERTY_VESSEL, - TripLonglineDto.PROPERTY_OBSERVER, - TripLonglineDto.PROPERTY_CAPTAIN, - TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, - TripLonglineDto.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER, - TripLonglineDto.PROPERTY_OCEAN, - TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, - TripLonglineDto.PROPERTY_LANDING_HARBOUR, - TripLonglineDto.PROPERTY_PROGRAM, - TripLonglineDto.PROPERTY_OPEN, - TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE); - - // on ajoute la recopie de l'association route - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE); - - return builder; - - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java index da79d96..d006be5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -101,39 +101,4 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt return false; } - @Override - protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder = binderService.newBinderBuilder( - ActivitySeineDto.class, - ActivitySeineDto.PROPERTY_LATITUDE, - ActivitySeineDto.PROPERTY_LONGITUDE, - ActivitySeineDto.PROPERTY_ERS_ID, - ActivitySeineDto.PROPERTY_TIME, - ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, - ActivitySeineDto.PROPERTY_COMMENT, - ActivitySeineDto.PROPERTY_VESSEL_SPEED, - //FIXME -// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, -// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, - ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, - ActivitySeineDto.PROPERTY_WIND, - ActivitySeineDto.PROPERTY_DETECTION_MODE, - //FIXME -// ActivitySeineDto.PROPERTY_SET_SEINE, -// ActivitySeineDto.PROPERTY_FLOATING_OBJECT, - ActivitySeineDto.PROPERTY_OPEN, - ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, - ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, - ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE); - - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM); - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivitySeineDto.PROPERTY_FLOATING_OBJECT); - - return builder; - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java index a172e58..750f249 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.content.open.impl.seine; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,22 +39,4 @@ public class RouteUIModel extends ContentOpenableUIModel<RouteDto> { super(RouteDto.class); } - @Override - protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<RouteDto, RouteDto> builder = binderService.newBinderBuilder( - RouteDto.class, - RouteDto.PROPERTY_DATE, - RouteDto.PROPERTY_START_LOG_VALUE, - RouteDto.PROPERTY_END_LOG_VALUE, - RouteDto.PROPERTY_CHECK_LEVEL, - RouteDto.PROPERTY_ACTIVITY_SEINE, - RouteDto.PROPERTY_OPEN, - RouteDto.PROPERTY_COMMENT); - - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, RouteDto.PROPERTY_ACTIVITY_SEINE); - - return builder; - - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java index 57bd360..1636b6c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.content.open.impl.seine; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,32 +39,4 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeineDto> { super(TripSeineDto.class); } - @Override - protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<TripSeineDto, TripSeineDto> builder = binderService.newBinderBuilder( - TripSeineDto.class, - TripSeineDto.PROPERTY_START_DATE, - TripSeineDto.PROPERTY_END_DATE, - TripSeineDto.PROPERTY_FORMS_URL, - TripSeineDto.PROPERTY_REPORTS_URL, - TripSeineDto.PROPERTY_COMMENT, - TripSeineDto.PROPERTY_VESSEL, - TripSeineDto.PROPERTY_OBSERVER, - TripSeineDto.PROPERTY_CAPTAIN, - TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, - TripSeineDto.PROPERTY_OCEAN, - TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, - TripSeineDto.PROPERTY_LANDING_HARBOUR, - TripSeineDto.PROPERTY_ERS_ID, - TripSeineDto.PROPERTY_OPEN, - TripSeineDto.PROPERTY_ROUTE); - - // on ajoute la recopie de l'association route - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeineDto.PROPERTY_ROUTE); - - return builder; - - } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java index bee21bf..2a585b8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java @@ -21,14 +21,12 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.BinderModelBuilder; import java.util.ArrayList; import java.util.Arrays; @@ -194,22 +192,6 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends firePropertyChange(PROPERTY_SELECTED_BEAN, oldvalue, selectedBean); } - @Override - protected BinderModelBuilder<E, E> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<E, E> builder = binderService.newBinderBuilder(beanType, properties); - - if (log.isDebugEnabled()) { - log.debug("new binder [" + getClass().getName() + "#" + - beanType.getName() + "] : " + - Arrays.toString(properties) - ); - } - - return builder; - } - - /** * construction de la liste des propriétés a binder pour une entite. * diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java index defa89d..1233147 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java @@ -22,10 +22,8 @@ package fr.ird.observe.ui.content.ref; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/28/14. @@ -41,9 +39,4 @@ public class ReferenceHomeUIModel extends ContentUIModel<ProgramDto> { super(ProgramDto.class); } - @Override - protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - return null; - } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java index f2c5d44..c49fa26 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java @@ -28,10 +28,10 @@ import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; -import javax.swing.*; +import javax.swing.DefaultListSelectionModel; +import javax.swing.ListSelectionModel; import java.util.List; /** @@ -112,19 +112,6 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte } - @Override - protected BinderModelBuilder<E, E> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - String[] properties = getParentProperties(); - - BinderModelBuilder<E, E> builder = binderService.newBinderBuilder(getBeanType(), properties); - - // la première propriete est l'association - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, properties[0]); - - return builder; - } - public void initModel(ObserveContentTableUI<E, D> ui, List<ContentTableMeta<D>> metas) { this.tableModel = createTableModel(ui, metas); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.