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 e68915e Nettoyage code mort + amélioration fermeture (le focus doit sortir du formulaire) adds 178eb89 Revue du composant de commentaire (Closes #16) new a7b7729 Merge branch 'feature/16' into 'develop' 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 a7b77298c9acb0643f7ef7305bd354850ba601e4 Merge: e68915e 178eb89 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Dec 21 15:56:06 2016 +0100 Merge branch 'feature/16' into 'develop' Revue du composant de commentaire (Closes #16) See merge request !94 Summary of changes: .../application/swing/ui/content/Common.jcss | 10 ++------ .../swing/ui/content/ObserveFocusManager.java | 20 +++++++-------- .../ui/content/impl/longline/BranchlineUI.jaxx | 7 +++--- .../ui/content/impl/longline/BranchlineUI.jcss | 8 +----- .../content/impl/longline/BranchlineUIHandler.java | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 6 ++--- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 6 ++--- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 5 ++-- .../FloatingObjectTransmittingBuoyOperationUI.jcss | 8 ++---- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 6 ++--- .../ui/content/impl/seine/FloatingObjectUI.jcss | 7 +----- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 6 ++--- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 6 ++--- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 6 ++--- .../content/open/impl/longline/TripLonglineUI.jcss | 9 ------- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 ++--- .../content/open/impl/seine/ActivitySeineUI.jcss | 9 ------- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 8 +++--- .../swing/ui/content/open/impl/seine/RouteUI.jcss | 9 ------- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 9 ++++--- .../ui/content/open/impl/seine/TripSeineUI.jcss | 9 ------- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 8 +++--- .../content/ref/impl/LengthLengthParameterUI.jcss | 10 +++----- .../content/ref/impl/LengthWeightParameterUI.jaxx | 10 +++----- .../content/ref/impl/LengthWeightParameterUI.jcss | 10 ++------ .../swing/ui/content/ref/impl/ProgramUI.jaxx | 5 ++-- .../swing/ui/content/ref/impl/ProgramUI.jcss | 7 +----- .../swing/ui/content/table/CommonTable.jcss | 4 +++ .../table/impl/longline/CatchLonglineUI.jaxx | 6 ++--- .../table/impl/longline/CatchLonglineUI.jcss | 7 +----- .../content/table/impl/longline/EncounterUI.jaxx | 7 ++---- .../content/table/impl/longline/EncounterUI.jcss | 3 ++- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 6 ++--- .../impl/longline/GearUseFeaturesLonglineUI.jcss | 8 +----- .../content/table/impl/longline/SensorUsedUI.jaxx | 8 ++---- .../content/table/impl/longline/SensorUsedUI.jcss | 3 ++- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 6 ++--- .../table/impl/seine/GearUseFeaturesSeineUI.jcss | 8 +----- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 7 ++---- .../content/table/impl/seine/NonTargetCatchUI.jcss | 8 +----- .../table/impl/seine/NonTargetSampleUI.jaxx | 6 ++--- .../table/impl/seine/NonTargetSampleUI.jcss | 3 ++- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 6 ++--- .../table/impl/seine/ObjectObservedSpeciesUI.jcss | 10 +++----- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 6 ++--- .../table/impl/seine/ObjectSchoolEstimateUI.jcss | 7 ++---- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 8 ++---- .../content/table/impl/seine/SchoolEstimateUI.jcss | 10 +++----- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 8 ++---- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 7 +----- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 7 ++---- .../table/impl/seine/TargetDiscardCatchUI.jcss | 7 +----- .../content/table/impl/seine/TargetSampleUI.jaxx | 5 ++-- .../content/table/impl/seine/TargetSampleUI.jcss | 3 ++- .../application/swing/ui/util/JComment.jaxx | 22 +++++++++++++++++ .../application/swing/ui/util/JComment.jcss | 14 +++++++++++ .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../fr/ird/observe/services/dto/WithComment.java | 27 +++++++++++++++++++++ .../dto/referential/LengthLengthParameterDto.java | 13 ++++++++++ .../dto/referential/LengthWeightParameterDto.java | 13 ++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 49022 -> 51095 bytes 72 files changed, 214 insertions(+), 282 deletions(-) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/WithComment.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.