This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 796e690 Merge branch 'feature/25' into 'develop' new 2dbee55 [iso] use jaxx 3.0-alpha-2 The 1 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 2dbee550324f764d4d36e90e6fd9a8f4f3f3e9ba Author: Tony CHEMIT <dev@tchemit.fr> Date: Sat Dec 31 18:47:35 2016 +0100 [iso] use jaxx 3.0-alpha-2 Summary of changes: application-swing/pom.xml | 34 ++--- .../src/main/filters/observe-ui.properties | 5 + .../ObserveSwingApplicationDataSourcesManager.java | 2 +- .../application/swing/ObserveTextGenerator.java | 3 +- .../application/swing/ui/ObserveCommon.jcss | 36 +++++- .../application/swing/ui/ObserveMainUI.jaxx | 2 +- .../swing/ui/ObserveMainUIInitializer.java | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 26 +++- .../ui/actions/menu/config/ShowConfigAction.java | 12 +- .../menu/storage/StartServerModeAction.java | 2 +- .../swing/ui/admin/report/ReportUIHandler.java | 2 +- .../referential/legacy/SynchronizeUIHandler.java | 2 +- .../referential/ng/ReferentialReplaceUI.jaxx | 2 +- .../ng/ReferentialReplaceUIHandler.java | 2 +- .../swing/ui/content/ContentUIBlockingLayerUI.java | 10 +- .../swing/ui/content/ContentUIHandler.java | 15 ++- .../swing/ui/content/ContentUIInitializer.java | 130 +++++-------------- .../ui/content/DataReferenceListCellRenderer.java | 54 ++++++++ .../swing/ui/content/ObserveFocusManager.java | 4 +- .../ReferentialReferenceListCellRenderer.java | 70 ++++++++++ .../ui/content/impl/longline/BranchlineUI.jaxx | 10 +- .../ui/content/impl/longline/BranchlineUI.jcss | 9 +- .../content/impl/longline/BranchlineUIHandler.java | 6 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 32 ++--- .../ui/content/impl/longline/SetLonglineUI.jcss | 44 ++----- .../impl/longline/SetLonglineUIHandler.java | 34 ++--- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 2 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 6 +- .../ui/content/impl/seine/FloatingObjectUI.jcss | 5 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 18 +-- .../swing/ui/content/impl/seine/SetSeineUI.jcss | 22 +--- .../ui/content/impl/seine/SetSeineUIHandler.java | 16 +-- .../swing/ui/content/list/ContentListUI.jaxx | 2 +- .../ui/content/list/ContentListUIHandler.java | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 6 +- .../open/impl/longline/ActivityLonglineUI.jcss | 4 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 6 +- .../content/open/impl/longline/TripLonglineUI.jcss | 10 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 10 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 12 +- .../open/impl/seine/ActivitySeineUIHandler.java | 4 +- .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 6 +- .../swing/ui/content/open/impl/seine/RouteUI.jcss | 6 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 4 +- .../swing/ui/content/ref/ContentReferenceUI.jaxx | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 2 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 4 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 4 +- .../content/ref/impl/LengthWeightParameterUI.jcss | 4 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 2 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 2 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 2 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 2 +- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 2 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 4 +- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 8 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 12 +- .../swing/ui/content/ref/impl/VesselUI.jcss | 14 +- .../swing/ui/content/ref/impl/VesselUIModel.java | 14 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 2 +- .../ui/content/ref/usage/UsageForDeleteUI.jaxx | 2 +- .../content/ref/usage/UsageForDeleteUIHandler.java | 2 +- .../content/ref/usage/UsageForDesactivateUI.jaxx | 2 +- .../ref/usage/UsageForDesactivateUIHandler.java | 2 +- .../ref/usage/UsageForDisplayUIHandler.java | 2 +- .../content/ref/usage/UsageUIHandlerSupport.java | 2 +- .../content/table/ContentTableUIInitializer.java | 14 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 10 +- .../table/impl/longline/BaitsCompositionUI.jcss | 9 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 10 +- .../impl/longline/BranchlinesCompositionUI.jcss | 9 +- .../CatchLonglineContentTableUIInitializer.java | 4 +- .../table/impl/longline/CatchLonglineUI.jaxx | 12 +- .../table/impl/longline/CatchLonglineUI.jcss | 12 +- .../content/table/impl/longline/EncounterUI.jaxx | 8 +- .../content/table/impl/longline/EncounterUI.jcss | 6 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 8 +- .../impl/longline/FloatlinesCompositionUI.jcss | 6 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 6 +- .../impl/longline/GearUseFeaturesLonglineUI.jcss | 3 +- .../table/impl/longline/HooksCompositionUI.jaxx | 8 +- .../table/impl/longline/HooksCompositionUI.jcss | 6 +- .../impl/longline/LonglinePositionHelper.java | 2 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 8 +- .../ui/content/table/impl/longline/TdrUI.jcss | 22 ++-- .../content/table/impl/longline/TdrUIHandler.java | 4 +- .../content/table/impl/seine/AbstractSampleUI.jcss | 7 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 6 +- .../table/impl/seine/GearUseFeaturesSeineUI.jcss | 3 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 12 +- .../content/table/impl/seine/NonTargetCatchUI.jcss | 13 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 10 +- .../table/impl/seine/NonTargetSampleUI.jcss | 3 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 6 +- .../table/impl/seine/ObjectObservedSpeciesUI.jcss | 3 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 6 +- .../table/impl/seine/ObjectSchoolEstimateUI.jcss | 3 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 8 +- .../content/table/impl/seine/SchoolEstimateUI.jcss | 6 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 6 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 4 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 6 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 4 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 10 +- .../content/table/impl/seine/TargetSampleUI.jcss | 3 +- .../swing/ui/storage/presets/RemotePresetsUI.jaxx | 2 +- .../ui/storage/presets/RemotePresetsUIHandler.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 2 +- .../swing/validation/ObserveSwingValidator.java | 2 +- pom.xml | 32 +++-- services/pom.xml | 6 - .../observe/services/dto/AbstractObserveDto.java | 4 +- .../dto/referential/ReferentialMultimap.java | 141 ++++++++++----------- .../fr/ird/observe/services/gson/ClassAdapter.java | 4 +- 124 files changed, 656 insertions(+), 628 deletions(-) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/DataReferenceListCellRenderer.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ReferentialReferenceListCellRenderer.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.