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 0d4c133 Shade application swing (See #8483)" new c3bfc76 On peut minimiser le jar generer new 942fc4e Des updates de lib et encore des exclusions new 3623cf7 Rename module otherwise maven cries... + add new i18n generator for type and their plurals :) new fa50dd5 Fix typo new f8c65d8 Introduce ObserveI18nDecoratorHelper + use new type i18n keys generator new d5ffd61 Ne plus coupler services-model avec le plugin mavan new 82e08ad Ajout de nouveaux dto qui reflete ce qui est utilisé dans l'ui new b1e9505 update lib new 47744bd Use now observe.type instead of observe.common, clean up then decoration module new 23449e8 Use observe.type i18n instead of observe.tree, clean up a lots of code... + use new decorator api + refactor i18n (-400 trads \o/) new 37d9dc9 Improve show technical informations (make text selectable) new b6395ae Ajout des informations techniques sur tous les écrans de saisie new 46cb72c Fix content mapping + show technical informations The 13 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 46cb72cc3c805d3427bf4fb22e0bab864ac8f77b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 21:35:29 2016 +0200 Fix content mapping + show technical informations commit b6395aee0e6128251453fef4b6ba2d61d7e2df14 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 20:54:08 2016 +0200 Ajout des informations techniques sur tous les écrans de saisie commit 37d9dc98c353e6ac03a4d11f2fe22c694210baf6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 19:29:35 2016 +0200 Improve show technical informations (make text selectable) commit 23449e839f5d7f1238721c6c21325f6cde5cce65 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 19:10:00 2016 +0200 Use observe.type i18n instead of observe.tree, clean up a lots of code... + use new decorator api + refactor i18n (-400 trads \o/) commit 47744bdd24568698663f3b1df0682fa61541b8fb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 15:56:17 2016 +0200 Use now observe.type instead of observe.common, clean up then decoration module commit b1e95052f11eed229aa3bb887466295c5d33a3cc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 15:53:46 2016 +0200 update lib commit 82e08adb845a156960aefd7a00079c5943547028 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 15:53:25 2016 +0200 Ajout de nouveaux dto qui reflete ce qui est utilisé dans l'ui commit d5ffd61a517366af68aef2345cd8bfefe66c6207 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 08:13:34 2016 +0200 Ne plus coupler services-model avec le plugin mavan commit f8c65d8eaf9870585f006d9252dc94fd50e8c5e4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 20:33:09 2016 +0200 Introduce ObserveI18nDecoratorHelper + use new type i18n keys generator commit fa50dd507f48a93674d004ed1c5fbe4fdd5ae0a7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 20:30:30 2016 +0200 Fix typo commit 3623cf7374ddac0b2f41d373f3e9ed85dc705e91 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 20:30:25 2016 +0200 Rename module otherwise maven cries... + add new i18n generator for type and their plurals :) commit 942fc4e443268a96e06ea6f73fe3fb753d97d811 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 15:31:46 2016 +0200 Des updates de lib et encore des exclusions commit c3bfc76b54d009dcb9e18b9005ba3ac3ce703664 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 15:24:36 2016 +0200 On peut minimiser le jar generer Summary of changes: application-swing-decoration/pom.xml | 39 ++ .../swing/decoration/DecoratorService.java | 407 +++++++--------- .../decoration/ObserveI18nDecoratorHelper.java | 88 ++++ .../application-swing-decoration_en_GB.properties | 332 +++++++++---- .../application-swing-decoration_es_ES.properties | 330 +++++++++---- .../application-swing-decoration_fr_FR.properties | 330 +++++++++---- application-swing-validation/pom.xml | 2 +- .../application-swing-validation_en_GB.properties | 2 +- .../application-swing-validation_es_ES.properties | 2 +- .../application-swing-validation_fr_FR.properties | 2 +- application-swing/pom.xml | 23 +- .../application/swing/ui/ObserveMainUIHandler.java | 3 +- .../ird/observe/application/swing/ui/UIHelper.java | 31 +- .../shared/MoveActivityLonglinesUIAction.java | 13 +- .../actions/shared/MoveActivitySeinesUIAction.java | 13 +- .../ui/actions/shared/MoveRoutesUIAction.java | 13 +- ...soleteReferentialReferenceListCellRenderer.java | 3 +- .../referential/legacy/SynchronizeUIHandler.java | 4 +- .../ng/action/RegisterTasksActionSupport.java | 9 +- .../ng/task/ReferentialSynchronizeTaskSupport.java | 4 +- .../ReferentialSynchronizeTreeCellRenderer.java | 6 +- .../validate/ValidateEntityListCellRenderer.java | 3 +- .../swing/ui/admin/validate/ValidateUI.jaxx | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 35 +- .../application/swing/ui/content/ContentUI.jaxx | 3 + .../application/swing/ui/content/ContentUI.jcss | 9 + .../swing/ui/content/ContentUIHandler.java | 178 +++++-- .../swing/ui/content/ContentUIInitializer.java | 13 +- .../swing/ui/content/ContentUIManager.java | 271 +++++------ .../LonglineDetailCompositionUIHandler.java | 2 +- ...LonglineDetailCompositionValidationContext.java | 3 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../ActivitySeineObservedSystemUIHandler.java | 12 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 8 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../ui/content/open/ContentOpenableUIHandler.java | 42 +- .../impl/longline/ActivityLonglineUIHandler.java | 54 +-- .../open/impl/longline/TripLonglineUIHandler.java | 6 +- .../open/impl/seine/ActivitySeineUIHandler.java | 16 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 105 ++--- .../open/impl/seine/TripSeineUIHandler.java | 8 +- .../swing/ui/content/ref/ContentReferenceUI.jaxx | 30 +- .../swing/ui/content/ref/ContentReferenceUI.jcss | 4 - .../ui/content/ref/ContentReferenceUIHandler.java | 122 ++--- .../ui/content/ref/ContentReferenceUIModel.java | 47 +- .../swing/ui/content/ref/UniqueKeyTableModel.java | 3 +- .../swing/ui/content/ref/impl/CountryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 12 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 10 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 10 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 10 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 12 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 12 +- .../swing/ui/content/ref/impl/OceanUI.jaxx | 12 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 12 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 12 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SexUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 12 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 12 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 12 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 12 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 12 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 12 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 12 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 12 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 12 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 12 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 12 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 12 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 12 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 12 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 12 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 12 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 12 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 12 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 12 +- .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 12 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 12 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 12 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 12 +- .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 12 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 12 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 12 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 12 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 12 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 12 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 12 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 12 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 12 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 12 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 12 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 12 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 12 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 12 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 12 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 12 +- .../ui/content/table/ContentTableUIHandler.java | 14 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 6 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 6 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 35 +- .../swing/ui/tree/ObserveTreeBridge.java | 2 +- .../swing/ui/tree/ObserveTreeHelper.java | 132 +----- .../actions/ChangeActivityRouteActionListener.java | 9 +- .../actions/ChangeActivityTripActionListener.java | 9 +- .../actions/ChangeRouteTripActionListener.java | 9 +- .../loadors/AbstractDataReferenceChildLoador.java | 4 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 40 ++ .../loadors/ActivityLonglineNodeChildLoador.java | 61 +-- .../loadors/ActivityLonglinesNodeChildLoador.java | 18 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 48 +- .../loadors/ActivitySeinesNodeChildLoador.java | 14 +- .../loadors/FloatingObjectNodeChildLoador.java | 38 +- .../loadors/ProgramLonglineNodeChildLoador.java | 58 +-- .../tree/loadors/ProgramSeineNodeChildLoador.java | 49 +- .../loadors/ReferenceCommonNodeChildLoador.java | 94 ---- .../loadors/ReferenceLonglineNodeChildLoador.java | 100 ---- ...ldLoador.java => ReferenceNodeChildLoador.java} | 69 ++- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 66 +-- .../ui/tree/loadors/RoutesNodeChildLoador.java | 32 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 45 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 62 ++- .../swing/ui/usage/UsagesUIHandler.java | 4 +- .../ObserveValidationMessageTableRenderer.java | 62 +-- .../util/ObserveValidatorMessageTableRenderer.java | 48 +- .../i18n/application-swing_en_GB.properties | 522 +-------------------- .../i18n/application-swing_es_ES.properties | 522 +-------------------- .../i18n/application-swing_fr_FR.properties | 522 +-------------------- application-web/pom.xml | 2 +- pom.xml | 43 +- .../dto/seine/DiscardedTargetCatchDto.java | 10 + .../dto/seine/DiscardedTargetSampleDto.java | 10 + .../services/dto/seine/KeptTargetCatchDto.java | 10 + .../services/dto/seine/KeptTargetSampleDto.java | 10 + .../main/java/fr/ird/observe/util/ObserveUtil.java | 47 ++ services-topia-validation/pom.xml | 2 +- .../services-topia-validation_en_GB.properties | 2 +- .../services-topia-validation_es_ES.properties | 2 +- .../services-topia-validation_fr_FR.properties | 2 +- {maven-plugin => toolbox-maven-plugin}/LICENSE.txt | 0 {maven-plugin => toolbox-maven-plugin}/README.md | 0 {maven-plugin => toolbox-maven-plugin}/pom.xml | 15 +- .../src/license/THIRD-PARTY.properties | 0 .../maven/plugins/toolbox}/CheckApiMojo.java | 2 +- .../plugins/toolbox/GenerateI18nTypesMojo.java | 227 +++++++++ .../toolbox}/GenerateI18nValidatorFieldsMojo.java | 30 +- .../toolbox}/GenerateValidatorMojoSupport.java | 45 +- .../toolbox}/GenerateValidatorsDescriptorMojo.java | 10 +- .../MismatchMethodParameterNameException.java | 2 +- .../plugins/toolbox}/MissingClassException.java | 2 +- .../plugins/toolbox}/MissingMethodException.java | 2 +- .../maven/plugins/toolbox/ToolboxMojoSupport.java | 79 ++-- .../plugins/toolbox}/ValidatorCacheRequest.java | 2 +- .../maven/plugins/toolbox}/ValidatorsCache.java | 2 +- .../src/main/resources/log4j.properties | 0 167 files changed, 2441 insertions(+), 4167 deletions(-) create mode 100644 application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/{ReferenceSeineNodeChildLoador.java => ReferenceNodeChildLoador.java} (51%) create mode 100644 services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java create mode 100644 services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java create mode 100644 services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java create mode 100644 services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java rename {maven-plugin => toolbox-maven-plugin}/LICENSE.txt (100%) rename {maven-plugin => toolbox-maven-plugin}/README.md (100%) rename {maven-plugin => toolbox-maven-plugin}/pom.xml (90%) rename {maven-plugin => toolbox-maven-plugin}/src/license/THIRD-PARTY.properties (100%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/CheckApiMojo.java (99%) create mode 100644 toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nTypesMojo.java rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/GenerateI18nValidatorFieldsMojo.java (80%) copy {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/GenerateValidatorMojoSupport.java (65%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/GenerateValidatorsDescriptorMojo.java (95%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/MismatchMethodParameterNameException.java (98%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/MissingClassException.java (96%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/MissingMethodException.java (95%) rename maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/GenerateValidatorMojoSupport.java => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/ToolboxMojoSupport.java (62%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/ValidatorCacheRequest.java (96%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/ValidatorsCache.java (99%) rename {maven-plugin => toolbox-maven-plugin}/src/main/resources/log4j.properties (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.