branch feature/fix_validation created (now 6d847e4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/fix_validation in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 6d847e4 Introduce observe application swing validation module and reintroduce his detection test This branch includes the following new commits: new a9ebba3 Extraction d'un module avec les validateurs communs new a972eb7 On déplace dans le module service-model des choses qui n'ont rien à faire au niveau de l'application swing (et surtout pas dans un paquetage entité...) new 48016c9 Extraction d'un module avec l'api de décoration (de l'application swing) new 6d847e4 Introduce observe application swing validation module and reintroduce his detection test The 4 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 6d847e4e87b6978b59c345131bcab54d15b23b1e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 17:29:16 2016 +0200 Introduce observe application swing validation module and reintroduce his detection test commit 48016c9f6fdb9d05596177bce56094379399b8e9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 17:29:11 2016 +0200 Extraction d'un module avec l'api de décoration (de l'application swing) commit a972eb72d9fb9baf7fc78b4b0fac4bf2b8bc3761 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 16:52:14 2016 +0200 On déplace dans le module service-model des choses qui n'ont rien à faire au niveau de l'application swing (et surtout pas dans un paquetage entité...) commit a9ebba390b195d927aa78bcb2ef334a570e1a3e8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 16:50:33 2016 +0200 Extraction d'un module avec les validateurs communs -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/fix_validation in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit a9ebba390b195d927aa78bcb2ef334a570e1a3e8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 16:50:33 2016 +0200 Extraction d'un module avec les validateurs communs --- .../src/main/resources/validators.xml | 6 +- .../src/main/resources/validators.xml | 6 +- observe-entities/pom.xml | 5 + observe-entities/src/test/resources/validators.xml | 6 +- .../src/test/resources/validators.xml | 6 +- observe-validation-shared/LICENSE.txt | 674 +++++++++++++++++++++ observe-validation-shared/README.md | 0 .../pom.xml | 17 +- .../src/license/THIRD-PARTY.properties | 33 + .../CollectionFieldExpressionValidator2.java | 2 +- .../validators}/CollectionUniqueKeyValidator2.java | 2 +- .../ObserveCollectionUniqueKeyValidator.java | 2 +- 12 files changed, 730 insertions(+), 29 deletions(-) diff --git a/observe-application-swing/src/main/resources/validators.xml b/observe-application-swing/src/main/resources/validators.xml index 5856328..1484ddd 100644 --- a/observe-application-swing/src/main/resources/validators.xml +++ b/observe-application-swing/src/main/resources/validators.xml @@ -53,9 +53,9 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- les validateurs spécifiques à ObServe --> - <validator name="collectionFieldExpression" class="fr.ird.observe.validation.validator.CollectionFieldExpressionValidator2"/> - <validator name="collectionUniqueKey" class="fr.ird.observe.validation.validator.CollectionUniqueKeyValidator2"/> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.validator.ObserveCollectionUniqueKeyValidator"/> + <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> <!--<validator name="openableEntity" class="fr.ird.observe.business.validation.field.OpenableFieldValidator"/>--> diff --git a/observe-application-web/src/main/resources/validators.xml b/observe-application-web/src/main/resources/validators.xml index c75ce35..44415e9 100644 --- a/observe-application-web/src/main/resources/validators.xml +++ b/observe-application-web/src/main/resources/validators.xml @@ -53,9 +53,9 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- les validateurs spécifiques à ObServe --> - <validator name="collectionFieldExpression" class="fr.ird.observe.validation.validator.CollectionFieldExpressionValidator2"/> - <validator name="collectionUniqueKey" class="fr.ird.observe.validation.validator.CollectionUniqueKeyValidator2"/> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.validator.ObserveCollectionUniqueKeyValidator"/> + <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> <!--<validator name="openableEntity" class="fr.ird.observe.business.validation.field.OpenableFieldValidator"/>--> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 86ff797..26410c1 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -49,6 +49,11 @@ <artifactId>observe-topia-extension</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-validation-shared</artifactId> + <version>${project.version}</version> + </dependency> <!-- Nuiton --> <dependency> diff --git a/observe-entities/src/test/resources/validators.xml b/observe-entities/src/test/resources/validators.xml index c75ce35..44415e9 100644 --- a/observe-entities/src/test/resources/validators.xml +++ b/observe-entities/src/test/resources/validators.xml @@ -53,9 +53,9 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- les validateurs spécifiques à ObServe --> - <validator name="collectionFieldExpression" class="fr.ird.observe.validation.validator.CollectionFieldExpressionValidator2"/> - <validator name="collectionUniqueKey" class="fr.ird.observe.validation.validator.CollectionUniqueKeyValidator2"/> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.validator.ObserveCollectionUniqueKeyValidator"/> + <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> <!--<validator name="openableEntity" class="fr.ird.observe.business.validation.field.OpenableFieldValidator"/>--> diff --git a/observe-services-topia/src/test/resources/validators.xml b/observe-services-topia/src/test/resources/validators.xml index c75ce35..44415e9 100644 --- a/observe-services-topia/src/test/resources/validators.xml +++ b/observe-services-topia/src/test/resources/validators.xml @@ -53,9 +53,9 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- les validateurs spécifiques à ObServe --> - <validator name="collectionFieldExpression" class="fr.ird.observe.validation.validator.CollectionFieldExpressionValidator2"/> - <validator name="collectionUniqueKey" class="fr.ird.observe.validation.validator.CollectionUniqueKeyValidator2"/> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.validator.ObserveCollectionUniqueKeyValidator"/> + <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> <!--<validator name="openableEntity" class="fr.ird.observe.business.validation.field.OpenableFieldValidator"/>--> diff --git a/observe-validation-shared/LICENSE.txt b/observe-validation-shared/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/observe-validation-shared/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/observe-validation-shared/README.md b/observe-validation-shared/README.md new file mode 100644 index 0000000..e69de29 diff --git a/observe-entities/pom.xml b/observe-validation-shared/pom.xml similarity index 94% copy from observe-entities/pom.xml copy to observe-validation-shared/pom.xml index 86ff797..9147149 100644 --- a/observe-entities/pom.xml +++ b/observe-validation-shared/pom.xml @@ -31,24 +31,13 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>observe-entities</artifactId> + <artifactId>observe-validation-shared</artifactId> - <name>ObServe :: Entities</name> - <description>ObServe entities module</description> + <name>ObServe :: Validation shared</name> + <description>ObServe validation shared module</description> <dependencies> - <!-- sibling dependencies --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-test-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-topia-extension</artifactId> - <version>${project.version}</version> - </dependency> <!-- Nuiton --> <dependency> diff --git a/observe-validation-shared/src/license/THIRD-PARTY.properties b/observe-validation-shared/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..e7f6efe --- /dev/null +++ b/observe-validation-shared/src/license/THIRD-PARTY.properties @@ -0,0 +1,33 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 +# - Apache Software License, version 1.1 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Library or Lesser General Public License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Aug 26 01:19:49 CEST 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License diff --git a/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java b/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionFieldExpressionValidator2.java similarity index 98% rename from observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java rename to observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionFieldExpressionValidator2.java index f4bc0a5..b9ff7a8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java +++ b/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionFieldExpressionValidator2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator; +package fr.ird.observe.validation.shared.validators; /* * #%L diff --git a/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionUniqueKeyValidator2.java b/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java similarity index 96% rename from observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionUniqueKeyValidator2.java rename to observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java index de3fd78..ae1d60f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionUniqueKeyValidator2.java +++ b/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator; +package fr.ird.observe.validation.shared.validators; /* * #%L diff --git a/observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java b/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java rename to observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java index b12f1d3..29edc3b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java +++ b/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator; +package fr.ird.observe.validation.shared.validators; /* * #%L -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/fix_validation in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit a972eb72d9fb9baf7fc78b4b0fac4bf2b8bc3761 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 16:52:14 2016 +0200 On déplace dans le module service-model des choses qui n'ont rien à faire au niveau de l'application swing (et surtout pas dans un paquetage entité...) --- .../java/fr/ird/observe/services/dto}/longline/SectionTemplate.java | 3 +-- .../fr/ird/observe/services/dto}/longline/SectionWithTemplate.java | 3 ++- .../fr/ird/observe/services/dto}/longline/SectionWithTemplates.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java index ec1ed81..2ad0685 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.longline; +package fr.ird.observe.services.dto.longline; /* * #%L @@ -24,7 +24,6 @@ package fr.ird.observe.entities.longline; import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import fr.ird.observe.services.dto.longline.BasketDto; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java index ac36c83..42a3390 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.longline; +package fr.ird.observe.services.dto.longline; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.entities.longline; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SectionTemplate; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java similarity index 95% rename from observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java index 565bd78..56ccf82 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.longline; +package fr.ird.observe.services.dto.longline; /* * #%L @@ -25,7 +25,6 @@ package fr.ird.observe.entities.longline; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import fr.ird.observe.services.dto.longline.SectionDto; import java.util.ArrayList; import java.util.Collection; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/fix_validation in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 48016c9f6fdb9d05596177bce56094379399b8e9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 17:29:11 2016 +0200 Extraction d'un module avec l'api de décoration (de l'application swing) --- observe-application-swing-decoration/LICENSE.txt | 674 +++++++++++++++++++++ observe-application-swing-decoration/README.md | 2 + observe-application-swing-decoration/changelog.txt | 2 + observe-application-swing-decoration/pom.xml | 113 ++++ .../src/license/THIRD-PARTY.properties | 80 +++ .../swing/decoration}/DecoratorService.java | 26 +- .../decorators}/DataReferenceDecorator.java | 2 +- .../LengthWeightParameterDecorator.java | 2 +- .../decorators}/NonTargetCatchDecorator.java | 2 +- .../decorators}/NonTargetLengthDecorator.java | 2 +- .../ObjectObservedSpeciesDecorator.java | 2 +- .../decoration/decorators}/ObserveDecorator.java | 2 +- .../decorators}/ReferentialReferenceDecorator.java | 2 +- .../decoration/decorators}/SpeciesDecorator.java | 2 +- .../decorators}/TargetCatchDecorator.java | 2 +- .../decorators}/TripLonglineDecorator.java | 2 +- .../decoration/decorators}/TripSeineDecorator.java | 2 +- ...e-application-swing-decoration_en_GB.properties | 143 +++++ ...e-application-swing-decoration_es_ES.properties | 143 +++++ ...e-application-swing-decoration_fr_FR.properties | 143 +++++ .../observe/ObserveSwingApplicationContext.java | 2 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 1 + .../src/main/java/fr/ird/observe/ui/UIHelper.java | 1 + .../observe/ui/actions/ReloadResourcesAction.java | 2 +- .../ird/observe/ui/actions/ShowConfigAction.java | 2 +- .../shared/MoveActivityLonglinesUIAction.java | 4 +- .../actions/shared/MoveActivitySeinesUIAction.java | 4 +- .../ui/actions/shared/MoveRoutesUIAction.java | 4 +- .../ui/actions/shared/MoveTripsUIAction.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 2 +- .../ird/observe/ui/admin/export/ExportModel.java | 4 +- .../observe/ui/admin/export/ExportUIHandler.java | 6 +- ...soleteReferentialReferenceListCellRenderer.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 2 +- .../validate/ValidateEntityListCellRenderer.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../ird/observe/ui/content/ContentUIHandler.java | 6 +- .../observe/ui/content/ContentUIInitializer.java | 9 +- .../content/impl/longline/BasketsTableModel.java | 2 +- .../LonglineDetailCompositionUIHandler.java | 6 +- .../LonglineDetailCompositionUIInitializer.java | 4 +- ...onglineDetailCompositionUIValidationHelper.java | 4 +- .../impl/longline/SectionTemplatesTableModel.java | 2 +- .../content/impl/longline/SectionsTableModel.java | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ui/content/ref/UniqueKeyTableModel.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 4 +- .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../MoveActivityLonglineNodeMenuPopulator.java | 4 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 4 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 4 +- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 2 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 2 +- .../ObserveValidationMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../ird/observe/validation/ValidationContext.java | 5 + ...glineDetailCompositionValidatorServiceTest.java | 2 +- 65 files changed, 1394 insertions(+), 90 deletions(-) diff --git a/observe-application-swing-decoration/LICENSE.txt b/observe-application-swing-decoration/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/observe-application-swing-decoration/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/observe-application-swing-decoration/README.md b/observe-application-swing-decoration/README.md new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/observe-application-swing-decoration/README.md @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/observe-application-swing-decoration/changelog.txt b/observe-application-swing-decoration/changelog.txt new file mode 100644 index 0000000..60d39cb --- /dev/null +++ b/observe-application-swing-decoration/changelog.txt @@ -0,0 +1,2 @@ +0.1 chemit 200812?? + - first release \ No newline at end of file diff --git a/observe-application-swing-decoration/pom.xml b/observe-application-swing-decoration/pom.xml new file mode 100644 index 0000000..85f011e --- /dev/null +++ b/observe-application-swing-decoration/pom.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <version>5.0-SNAPSHOT</version> + </parent> + + <artifactId>observe-application-swing-decoration</artifactId> + + <name>ObServe :: Application Swing Decoration</name> + <description>ObServe Application Swing Decoration</description> + + <dependencies> + + <!-- sibling dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-model</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- commons dependencies --> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <!-- Nuiton --> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> + + <!-- test dependencies --> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>scan-sources</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/observe-application-swing-decoration/src/license/THIRD-PARTY.properties b/observe-application-swing-decoration/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..e8bb5de --- /dev/null +++ b/observe-application-swing-decoration/src/license/THIRD-PARTY.properties @@ -0,0 +1,80 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Apache 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 +# - Apache Software License, version 1.1 +# - BSD License +# - BSD License for HSQL +# - Common Development and Distribution License +# - EPSG database distribution license +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 +# - Eclipse Public License, Version 1.0 +# - GNU General Public License - Version 2 with the class path exception +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License +# - GNU Lesser General Public License, Version 2.1 +# - GNU Library or Lesser General Public License +# - General Public License (GPL) +# - HSQLDB License, a BSD open source license +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - JDL (Java Distribution License) +# - LGPL 2.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - OGC copyright +# - Public Domain +# - Similar to Apache License but with the acknowledgment clause removed +# - Simplified BSD +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - The MIT License(MIT) +# - The PostgreSQL License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jul 11 12:20:32 CEST 2016 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +it.geosolutions.jaiext.affine--jt-affine--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.algebra--jt-algebra--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandcombine--jt-bandcombine--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandmerge--jt-bandmerge--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandselect--jt-bandselect--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.binarize--jt-binarize--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.border--jt-border--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.buffer--jt-buffer--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.classifier--jt-classifier--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.colorconvert--jt-colorconvert--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.colorindexer--jt-colorindexer--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.crop--jt-crop--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.errordiffusion--jt-errordiffusion--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.format--jt-format--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.imagefunction--jt-imagefunction--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.iterators--jt-iterators--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.lookup--jt-lookup--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.mosaic--jt-mosaic--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.nullop--jt-nullop--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.orderdither--jt-orderdither--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.piecewise--jt-piecewise--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.rescale--jt-rescale--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.rlookup--jt-rlookup--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.scale--jt-scale--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.stats--jt-stats--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.translate--jt-translate--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.utilities--jt-utilities--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.vectorbin--jt-vectorbin--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.warp--jt-warp--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.zonal--jt-zonal--1.0.9=The Apache Software License, Version 2.0 +javax.media--jai_codec--1.1.3=JDL (Java Distribution License) +javax.media--jai_core--1.1.3=JDL (Java Distribution License) +javax.media--jai_imageio--1.1=JDL (Java Distribution License) +jgridshift--jgridshift--1.0=GNU Library or Lesser General Public License diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 7467f9f..0e4c0a6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -19,10 +19,20 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui; +package fr.ird.observe.application.swing.decoration; import com.google.common.collect.Lists; -import fr.ird.observe.entities.longline.SectionTemplate; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.LengthWeightParameterDecorator; +import fr.ird.observe.application.swing.decoration.decorators.NonTargetCatchDecorator; +import fr.ird.observe.application.swing.decoration.decorators.NonTargetLengthDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ObjectObservedSpeciesDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ObserveDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.SpeciesDecorator; +import fr.ird.observe.application.swing.decoration.decorators.TargetCatchDecorator; +import fr.ird.observe.application.swing.decoration.decorators.TripLonglineDecorator; +import fr.ird.observe.application.swing.decoration.decorators.TripSeineDecorator; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; @@ -34,6 +44,7 @@ import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SectionTemplate; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -110,17 +121,6 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; -import fr.ird.observe.ui.util.decorator.LengthWeightParameterDecorator; -import fr.ird.observe.ui.util.decorator.NonTargetCatchDecorator; -import fr.ird.observe.ui.util.decorator.NonTargetLengthDecorator; -import fr.ird.observe.ui.util.decorator.ObjectObservedSpeciesDecorator; -import fr.ird.observe.ui.util.decorator.ObserveDecorator; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; -import fr.ird.observe.ui.util.decorator.SpeciesDecorator; -import fr.ird.observe.ui.util.decorator.TargetCatchDecorator; -import fr.ird.observe.ui.util.decorator.TripLonglineDecorator; -import fr.ird.observe.ui.util.decorator.TripSeineDecorator; import fr.ird.observe.util.gps.GPSPoint; import fr.ird.observe.util.gps.GPSPointInterval; import org.apache.commons.lang3.StringUtils; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/DataReferenceDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java similarity index 96% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/DataReferenceDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java index d21fe05..ce19254 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/DataReferenceDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; /*- * #%L diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/LengthWeightParameterDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/LengthWeightParameterDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java index 08a5fcf..e55f424 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/LengthWeightParameterDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import org.apache.commons.jxpath.JXPathContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/NonTargetCatchDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java similarity index 96% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/NonTargetCatchDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java index 0fde90a..5209d80 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/NonTargetCatchDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import org.apache.commons.jxpath.JXPathContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/NonTargetLengthDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java similarity index 96% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/NonTargetLengthDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java index 140b737..fe9e680 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/NonTargetLengthDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import org.apache.commons.jxpath.JXPathContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ObjectObservedSpeciesDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java similarity index 96% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ObjectObservedSpeciesDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java index 0122e9f..dff5856 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ObjectObservedSpeciesDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import org.apache.commons.jxpath.JXPathContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ObserveDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ObserveDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java index 423e527..487b012 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ObserveDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.AbstractReference; import org.apache.commons.jxpath.JXPathContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferentialReferenceDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferentialReferenceDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java index b736688..99a7a3f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferentialReferenceDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; /*- * #%L diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/SpeciesDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java similarity index 96% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/SpeciesDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java index 6b7716a..2c754a6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/SpeciesDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.referential.SpeciesDto; import org.apache.commons.jxpath.JXPathContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TargetCatchDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java similarity index 96% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TargetCatchDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java index 3a3ee5c..8b7219d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TargetCatchDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.seine.TargetCatchDto; import org.apache.commons.jxpath.JXPathContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TripLonglineDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java similarity index 95% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TripLonglineDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java index 8a31565..5de59bd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TripLonglineDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.longline.TripLonglineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TripSeineDecorator.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java similarity index 95% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TripSeineDecorator.java rename to observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java index 5b61153..b4078e7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/TripSeineDecorator.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.util.decorator; +package fr.ird.observe.application.swing.decoration.decorators; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties new file mode 100644 index 0000000..fde85d3 --- /dev/null +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties @@ -0,0 +1,143 @@ +observe.common.activityLongline= +observe.common.activitySeine= +observe.common.baitHaulingStatus= +observe.common.baitSettingStatus= +observe.common.baitType= +observe.common.baitsComposition= +observe.common.basket= +observe.common.branchline= +observe.common.branchlineLength= +observe.common.branchlinesComposition= +observe.common.catchFateLongline= +observe.common.catchLongline= +observe.common.country= +observe.common.detectionMode= +observe.common.encounter= +observe.common.encounterType= +observe.common.faoCode= +observe.common.floatingObject= +observe.common.floatline1Length= +observe.common.floatline2Length= +observe.common.floatlineLengths= +observe.common.floatlinesComposition= +observe.common.fpaZone= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= +observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesMeasurementSeine= +observe.common.gearUseFeaturesSeine= +observe.common.gender= +observe.common.gps.activity= +observe.common.gps.gpsPoint= +observe.common.gps.gpsPointInterval= +observe.common.harbour= +observe.common.haulingIdentifier= +observe.common.healthness= +observe.common.homeId= +observe.common.hookPosition= +observe.common.hookSize= +observe.common.hookType= +observe.common.hooksComposition= +observe.common.id= +observe.common.inconnu= +observe.common.itemHorizontalPosition= +observe.common.itemVerticalPosition= +observe.common.lengthWeightFormula= +observe.common.lengthWeightParameter= +observe.common.lightsticksColor= +observe.common.lightsticksType= +observe.common.lineType= +observe.common.locode= +observe.common.maturityStatus= +observe.common.mitigationType= +observe.common.name= +observe.common.nocode= +observe.common.nonTargetCatch= +observe.common.nonTargetLength= +observe.common.nonTargetSample= +observe.common.none= +observe.common.objectFate= +observe.common.objectObservedSpecies= +observe.common.objectOperation= +observe.common.objectSchoolEstimate= +observe.common.objectType= +observe.common.observedSystem=Observed system +observe.common.observerLabel= +observe.common.ocean=Ocean +observe.common.ocean/label1= +observe.common.ocean/label2= +observe.common.ocean/label3= +observe.common.ocean/label4= +observe.common.ocean/label5= +observe.common.ocean/label6= +observe.common.ocean/label7= +observe.common.ocean/label8= +observe.common.organism= +observe.common.person= +observe.common.program= +observe.common.reasonForDiscard= +observe.common.reasonForNoFishing= +observe.common.reasonForNullSet= +observe.common.route= +observe.common.schoolEstimate= +observe.common.scientificLabel= +observe.common.section= +observe.common.sensorBrand= +observe.common.sensorDataFormat= +observe.common.sensorPosition= +observe.common.sensorType= +observe.common.sensorUsed= +observe.common.setLongline= +observe.common.setSeine= +observe.common.settingIdentifier= +observe.common.settingShape= +observe.common.sex= +observe.common.sizeMeasure= +observe.common.sizeMeasureType= +observe.common.species=Species +observe.common.species/scientificLabel= +observe.common.speciesFate= +observe.common.speciesGroup= +observe.common.speciesList= +observe.common.speciesStatus= +observe.common.stomacFullness= +observe.common.surroundingActivity= +observe.common.targetCatch= +observe.common.targetLength= +observe.common.targetSample= +observe.common.tdr= +observe.common.tdrRecord= +observe.common.time= +observe.common.tracelineLength= +observe.common.transmittingBuoy= +observe.common.transmittingBuoyOperation= +observe.common.transmittingBuoyType= +observe.common.tripLongline= +observe.common.tripSeine= +observe.common.tripType= +observe.common.vessel=Boat +observe.common.vessel/label1= +observe.common.vessel/label2= +observe.common.vessel/label3= +observe.common.vessel/label4= +observe.common.vessel/label5= +observe.common.vessel/label6= +observe.common.vessel/label7= +observe.common.vessel/label8= +observe.common.vesselActivityLongline= +observe.common.vesselActivitySeine=Boat Activity +observe.common.vesselActivitySeine/label1= +observe.common.vesselActivitySeine/label2= +observe.common.vesselActivitySeine/label3= +observe.common.vesselActivitySeine/label4= +observe.common.vesselActivitySeine/label5= +observe.common.vesselActivitySeine/label6= +observe.common.vesselActivitySeine/label7= +observe.common.vesselActivitySeine/label8= +observe.common.vesselSizeCategory= +observe.common.vesselType= +observe.common.weightCategory= +observe.common.weightMeasure= +observe.common.weightMeasureType= +observe.common.wind= diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties new file mode 100644 index 0000000..ac323d7 --- /dev/null +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties @@ -0,0 +1,143 @@ +observe.common.activityLongline= +observe.common.activitySeine= +observe.common.baitHaulingStatus= +observe.common.baitSettingStatus= +observe.common.baitType= +observe.common.baitsComposition= +observe.common.basket= +observe.common.branchline= +observe.common.branchlineLength= +observe.common.branchlinesComposition= +observe.common.catchFateLongline= +observe.common.catchLongline= +observe.common.country=País +observe.common.detectionMode=Modo de detección +observe.common.encounter= +observe.common.encounterType= +observe.common.faoCode= +observe.common.floatingObject= +observe.common.floatline1Length= +observe.common.floatline2Length= +observe.common.floatlineLengths= +observe.common.floatlinesComposition= +observe.common.fpaZone= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= +observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesMeasurementSeine= +observe.common.gearUseFeaturesSeine= +observe.common.gender= +observe.common.gps.activity= +observe.common.gps.gpsPoint= +observe.common.gps.gpsPointInterval= +observe.common.harbour= +observe.common.haulingIdentifier= +observe.common.healthness= +observe.common.homeId= +observe.common.hookPosition= +observe.common.hookSize= +observe.common.hookType= +observe.common.hooksComposition= +observe.common.id= +observe.common.inconnu= +observe.common.itemHorizontalPosition= +observe.common.itemVerticalPosition= +observe.common.lengthWeightFormula=Relación de peso +observe.common.lengthWeightParameter= +observe.common.lightsticksColor= +observe.common.lightsticksType= +observe.common.lineType= +observe.common.locode= +observe.common.maturityStatus= +observe.common.mitigationType= +observe.common.name= +observe.common.nocode= +observe.common.nonTargetCatch=Fauna asociada conservada o descartada +observe.common.nonTargetLength= +observe.common.nonTargetSample=Muestreo fauna asociada +observe.common.none= +observe.common.objectFate=Devenir de objeto +observe.common.objectObservedSpecies= +observe.common.objectOperation=Operación sobre la baliza +observe.common.objectSchoolEstimate= +observe.common.objectType=Tipo de objeto +observe.common.observedSystem=Sistema observado +observe.common.observerLabel= +observe.common.ocean=Océano +observe.common.ocean/label1= +observe.common.ocean/label2= +observe.common.ocean/label3= +observe.common.ocean/label4= +observe.common.ocean/label5= +observe.common.ocean/label6= +observe.common.ocean/label7= +observe.common.ocean/label8= +observe.common.organism=Organismo +observe.common.person= +observe.common.program= +observe.common.reasonForDiscard=Razon de descarte +observe.common.reasonForNoFishing= +observe.common.reasonForNullSet= +observe.common.route= +observe.common.schoolEstimate=Estimación del banco +observe.common.scientificLabel=Texto científico +observe.common.section= +observe.common.sensorBrand= +observe.common.sensorDataFormat= +observe.common.sensorPosition= +observe.common.sensorType= +observe.common.sensorUsed= +observe.common.setLongline= +observe.common.setSeine= +observe.common.settingIdentifier= +observe.common.settingShape= +observe.common.sex=Sexo +observe.common.sizeMeasure= +observe.common.sizeMeasureType= +observe.common.species=Especie +observe.common.species/scientificLabel= +observe.common.speciesFate=Devenir de fauna +observe.common.speciesGroup=Grupo de especie de fauna +observe.common.speciesList= +observe.common.speciesStatus=Estado de especie +observe.common.stomacFullness= +observe.common.surroundingActivity=Actividad circundante +observe.common.targetCatch=Captura de atún +observe.common.targetLength= +observe.common.targetSample=Muestreo atún descartado +observe.common.tdr= +observe.common.tdrRecord= +observe.common.time= +observe.common.tracelineLength= +observe.common.transmittingBuoy= +observe.common.transmittingBuoyOperation= +observe.common.transmittingBuoyType= +observe.common.tripLongline= +observe.common.tripSeine= +observe.common.tripType= +observe.common.vessel=Barco +observe.common.vessel/label1= +observe.common.vessel/label2= +observe.common.vessel/label3= +observe.common.vessel/label4= +observe.common.vessel/label5= +observe.common.vessel/label6= +observe.common.vessel/label7= +observe.common.vessel/label8= +observe.common.vesselActivityLongline= +observe.common.vesselActivitySeine=Actividad del barco +observe.common.vesselActivitySeine/label1= +observe.common.vesselActivitySeine/label2= +observe.common.vesselActivitySeine/label3= +observe.common.vesselActivitySeine/label4= +observe.common.vesselActivitySeine/label5= +observe.common.vesselActivitySeine/label6= +observe.common.vesselActivitySeine/label7= +observe.common.vesselActivitySeine/label8= +observe.common.vesselSizeCategory=Capacidad +observe.common.vesselType=Pesquería +observe.common.weightCategory=Categoría de peso +observe.common.weightMeasure= +observe.common.weightMeasureType= +observe.common.wind=Fuerza del viento diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties new file mode 100644 index 0000000..224770a --- /dev/null +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties @@ -0,0 +1,143 @@ +observe.common.activityLongline=Activité +observe.common.activitySeine=Activité +observe.common.baitHaulingStatus=Statut de l'appât au virage +observe.common.baitSettingStatus=Statut de l'appât au filage +observe.common.baitType=Type d'appât +observe.common.baitsComposition=Composition des appâts +observe.common.basket=Basket +observe.common.branchline=Avançon +observe.common.branchlineLength=Avançon (m) +observe.common.branchlinesComposition=Composition des avançons +observe.common.catchFateLongline=Devenir capture +observe.common.catchLongline=Capture +observe.common.country=Pays +observe.common.detectionMode=Mode détection +observe.common.encounter=Rencontre +observe.common.encounterType=Type de rencontre +observe.common.faoCode=Code FAO +observe.common.floatingObject=Objet flottant +observe.common.floatline1Length=Orin 1 (m) +observe.common.floatline2Length=Orin 2 (m) +observe.common.floatlineLengths=Template +observe.common.floatlinesComposition=Composition des orins +observe.common.fpaZone=Zone FPA +observe.common.gear=Équipement +observe.common.gearCaracteristic=Caractéristique d'un équipement +observe.common.gearCaracteristicType=Type de caractéristique d'équipement +observe.common.gearUseFeaturesLongline=Équipement +observe.common.gearUseFeaturesMeasurementSeine= +observe.common.gearUseFeaturesSeine=Équipement +observe.common.gender=Sexe +observe.common.gps.activity=Activité +observe.common.gps.gpsPoint=Point GPS +observe.common.gps.gpsPointInterval=Intervalle de points +observe.common.harbour=Port +observe.common.haulingIdentifier=Virage +observe.common.healthness=État de santé +observe.common.homeId=Identifiant +observe.common.hookPosition=Position du hameçon +observe.common.hookSize=Taille +observe.common.hookType=Type d'hameçon +observe.common.hooksComposition=Composition des hameçons +observe.common.id=Identifiant +observe.common.inconnu=inconnu +observe.common.itemHorizontalPosition=Localisation de l'élément sur la ligne mère +observe.common.itemVerticalPosition=Localisation de l'élément sur l'avançon +observe.common.lengthWeightFormula=Relation Poids +observe.common.lengthWeightParameter=Relation Taille-Poids +observe.common.lightsticksColor=Couleur de baton lumineux +observe.common.lightsticksType=Type de baton lumineux +observe.common.lineType=Type de ligne +observe.common.locode=Locode +observe.common.maturityStatus=Maturité +observe.common.mitigationType=Type de mesure d'atténuation +observe.common.name=Nom +observe.common.nocode=code absent +observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée +observe.common.nonTargetLength=Longueur (cm inf.) +observe.common.nonTargetSample=Echantillon faune accessoire +observe.common.none=Aucun +observe.common.objectFate=Devenir de l'objet +observe.common.objectObservedSpecies=Faune observée +observe.common.objectOperation=Opération sur l'objet +observe.common.objectSchoolEstimate=Estimation banc objet +observe.common.objectType=Type d'objet +observe.common.observedSystem=Système observé +observe.common.observerLabel=Observateur +observe.common.ocean=Océan +observe.common.ocean/label1=Océan +observe.common.ocean/label2=Océan +observe.common.ocean/label3=Océan +observe.common.ocean/label4=Océan +observe.common.ocean/label5=Océan +observe.common.ocean/label6=Océan +observe.common.ocean/label7=Océan +observe.common.ocean/label8=Océan +observe.common.organism=Organisme +observe.common.person=Personne +observe.common.program=Programme +observe.common.reasonForDiscard=Raison rejet +observe.common.reasonForNoFishing=Raison de non coup de Senne +observe.common.reasonForNullSet=Cause coup nul +observe.common.route=Route +observe.common.schoolEstimate=Estimation banc +observe.common.scientificLabel=Libellé scientifique +observe.common.section=Section +observe.common.sensorBrand=Marque de capteur +observe.common.sensorDataFormat=Format de données de capteur +observe.common.sensorPosition=Position de capteur +observe.common.sensorType=Type de capteur +observe.common.sensorUsed=Capteur utilisé +observe.common.setLongline=Opération de pêche +observe.common.setSeine=Calée +observe.common.settingIdentifier=Filage +observe.common.settingShape=Forme au filage +observe.common.sex=Sexe +observe.common.sizeMeasure=Mesure de taille +observe.common.sizeMeasureType=Type de mesure de taille +observe.common.species=Espèce +observe.common.species/scientificLabel=Espèce +observe.common.speciesFate=Devenir espèce +observe.common.speciesGroup=Groupe espèce +observe.common.speciesList=Liste d'espèces +observe.common.speciesStatus=Statut faune observée +observe.common.stomacFullness=Niveau de remplissage de l'estomac +observe.common.surroundingActivity=Activité environnante +observe.common.targetCatch=Capture cible +observe.common.targetLength=Taille Thon +observe.common.targetSample=Echantillon thon rejeté +observe.common.tdr=Enregistreur de profondeur +observe.common.tdrRecord=Enregistrement de profondeur +observe.common.time=Heure +observe.common.tracelineLength=Partie basse (m) +observe.common.transmittingBuoy=Balise lue +observe.common.transmittingBuoyOperation=Opération balise +observe.common.transmittingBuoyType=Type de balise +observe.common.tripLongline=Marée +observe.common.tripSeine=Marée +observe.common.tripType=Type de marée +observe.common.vessel=Bateau +observe.common.vessel/label1=Bateau +observe.common.vessel/label2=Bateau +observe.common.vessel/label3=Bateau +observe.common.vessel/label4=Bateau +observe.common.vessel/label5=Bateau +observe.common.vessel/label6=Bateau +observe.common.vessel/label7=Bateau +observe.common.vessel/label8=Bateau +observe.common.vesselActivityLongline=Activité bateau +observe.common.vesselActivitySeine=Activité bateau +observe.common.vesselActivitySeine/label1=Activité bateau +observe.common.vesselActivitySeine/label2=Activité bateau +observe.common.vesselActivitySeine/label3=Activité bateau +observe.common.vesselActivitySeine/label4=Activité bateau +observe.common.vesselActivitySeine/label5=Activité bateau +observe.common.vesselActivitySeine/label6=Activité bateau +observe.common.vesselActivitySeine/label7=Activité bateau +observe.common.vesselActivitySeine/label8=Activité bateau +observe.common.vesselSizeCategory=Catégorie de bateau +observe.common.vesselType=Type de pêcherie +observe.common.weightCategory=Catégorie de poids +observe.common.weightMeasure=Mesure de poids +observe.common.weightMeasureType=Type de mesure de poids +observe.common.wind=Vent Beaufort diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 3ecc245..38157a5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -55,7 +55,7 @@ import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.ObserveUIMode; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 4bdcd19..e7e4215 100755 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui; import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.db.DataContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java index 8ad6ab7..4469d90 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveSwingTechnicalException; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.IdDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java index 9a10144..aec9a67 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.actions; * #L% */ -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveRunner; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java index 356bca6..f5ae63e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java @@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.ObserveUICallback; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.config.ConfigUIHelper; import jaxx.runtime.swing.config.model.ConfigUIModelBuilder; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java index ab3614e..35c42cc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.list.impl.longline.ActivityLonglinesUI; @@ -36,7 +36,7 @@ import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripLonglineNode; import fr.ird.observe.ui.util.DecoratedNodeEntity; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java index 4d9f92e..7879784 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.list.impl.seine.ActivitySeinesUI; @@ -37,7 +37,7 @@ import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.RouteSeineNode; import fr.ird.observe.ui.util.DecoratedNodeEntity; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java index ec2f97b..550af9c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.RouteService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.list.impl.seine.RoutesUI; @@ -36,7 +36,7 @@ import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripSeineNode; import fr.ird.observe.ui.util.DecoratedNodeEntity; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java index b314d72..9cc6e93 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java @@ -35,7 +35,7 @@ import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.menu.MoveTripNodeMenuPopulator; import fr.ird.observe.ui.util.DecoratedNodeEntity; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index b367945..8e1e171 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -27,7 +27,7 @@ import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.admin.config.SelectDataUI; import fr.ird.observe.ui.admin.resume.ShowResumeUI; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java index b545560..7023bac 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java @@ -33,8 +33,8 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import java.util.ArrayList; import java.util.List; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java index 605a4de..ad9afb8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.service.actions.export.ReplicateTripService; import fr.ird.observe.services.service.actions.export.ReplicateTripsExportRequest; import fr.ird.observe.services.service.actions.export.ReplicateTripsExportResult; import fr.ird.observe.services.service.actions.export.ReplicateTripsImportResult; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; @@ -45,8 +45,8 @@ import fr.ird.observe.ui.admin.AdminUI; import fr.ird.observe.ui.admin.AdminUIModel; import fr.ird.observe.ui.admin.config.SelectDataUI; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.collections.CollectionUtils; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java index 6b1b349..275fdf7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.admin.synchronize; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import org.nuiton.decorator.Decorator; import javax.swing.DefaultListCellRenderer; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java index 93b0a6f..8ba07a2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java @@ -33,7 +33,7 @@ import fr.ird.observe.services.service.actions.synchro.UnidirectionalReferential import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUIHandler; import fr.ird.observe.ui.admin.AdminUI; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.swing.model.JaxxDefaultListModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java index abc1777..ef137f5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java @@ -26,7 +26,7 @@ import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; import fr.ird.observe.services.service.actions.validate.ValidateResultForDtos; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index d51fe50..48bdea7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -42,7 +42,7 @@ import fr.ird.observe.services.service.actions.validate.ValidateResultForDtos; import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.actions.validate.ValidationMessage; import fr.ird.observe.services.service.actions.validate.ValidatorDto; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index 08db6d7..4084704 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -42,15 +42,15 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialReferences; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.ui.tree.AbstractObserveTreeCellRenderer; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.validation.ValidationContext; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.JAXXButtonGroup; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 04806b7..55f23bc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -33,11 +33,11 @@ import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.util.I18nEnumUtil; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.util.BooleanEditor; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.ui.util.tripMap.ObserveMapPane; import fr.ird.observe.validation.ObserveSwingValidator; import jaxx.runtime.JAXXValidator; @@ -87,12 +87,9 @@ import javax.swing.table.TableCellEditor; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.util.ArrayList; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java index 36a8779..bff777c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SectionTemplate; import fr.ird.observe.services.dto.longline.BasketDto; /** diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index b76bee7..c03c0f8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -28,9 +28,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.SectionTemplate; -import fr.ird.observe.entities.longline.SectionWithTemplate; -import fr.ird.observe.entities.longline.SectionWithTemplates; +import fr.ird.observe.services.dto.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SectionWithTemplate; +import fr.ird.observe.services.dto.longline.SectionWithTemplates; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java index e1a991b..92d185e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java @@ -22,9 +22,9 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SectionTemplate; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.util.table.AutotSelectRowAndShowPopupActionSupport; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java index eafdb7c..6a4e926 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java @@ -25,11 +25,11 @@ package fr.ird.observe.ui.content.impl.longline; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.longline.SectionWithTemplate; +import fr.ird.observe.services.dto.longline.SectionWithTemplate; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.util.ObserveSwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java index 2fdeb5f..ca2fd65 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SectionTemplate; import fr.ird.observe.ui.util.table.EditableTableModelSupport; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java index 5c191bf..4b416e7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.SectionTemplate; -import fr.ird.observe.entities.longline.SectionWithTemplate; +import fr.ird.observe.services.dto.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SectionWithTemplate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 4281e80..c4b8264 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -38,14 +38,14 @@ import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.usage.UsagesUI; import fr.ird.observe.ui.util.SpringUtilities; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.validation.ValidationContext; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.CardLayout2Ext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java index 37101e9..adfa54d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ObserveSwingApplicationContext; import javax.swing.table.AbstractTableModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 20434bb..37e1932 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -48,14 +48,14 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.BranchlineService; import fr.ird.observe.services.service.longline.SetLonglineCatchService; import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.content.ContentUIModel; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index c84af4d..855be39 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -47,7 +47,7 @@ import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import fr.ird.observe.ui.content.table.impl.seine.GearUseFeatureMeasurementCellEditor; import fr.ird.observe.ui.content.table.impl.seine.GearUseFeatureMeasurementCellRenderer; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index e9ff9fb..0949118 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -45,7 +45,7 @@ import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 9cb5098..06dae5f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -44,7 +44,7 @@ import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 7107f0f..4f3a4f2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -45,7 +45,7 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.service.SqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index 9e028a8..e525aaa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -34,7 +34,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.content.impl.seine.FloatingObjectUI; import fr.ird.observe.ui.content.impl.seine.SetSeineUI; import fr.ird.observe.ui.content.open.impl.longline.ActivityLonglineUI; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index ef3a305..e0b5e52 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -40,7 +40,7 @@ import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; @@ -52,7 +52,7 @@ import fr.ird.observe.ui.tree.loadors.ProgramLonglineNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ProgramSeineNodeChildLoador; import fr.ird.observe.ui.tree.loadors.RootNodeChildLoador; import fr.ird.observe.ui.tree.loadors.RoutesNodeChildLoador; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeHelper; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java index 75c13eb..a50591c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java index 57f0341..572ac21 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java index e7f8e1c..67b6742 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.RouteService; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java index e598b9e..8c01d2a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java @@ -25,14 +25,14 @@ package fr.ird.observe.ui.tree.menu; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripLonglineNode; import fr.ird.observe.ui.tree.actions.ChangeActivityTripActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.ui.util.DecoratedNodeEntity; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import java.util.ArrayList; import java.util.List; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java index bb67a81..b4f032f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java @@ -25,14 +25,14 @@ package fr.ird.observe.ui.tree.menu; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.RouteSeineNode; import fr.ird.observe.ui.tree.actions.ChangeActivityRouteActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.ui.util.DecoratedNodeEntity; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import java.util.ArrayList; import java.util.List; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java index d4c614b..b224084 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java @@ -25,14 +25,14 @@ package fr.ird.observe.ui.tree.menu; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripSeineNode; import fr.ird.observe.ui.tree.actions.ChangeRouteTripActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.ui.util.DecoratedNodeEntity; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import java.util.ArrayList; import java.util.List; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java index 0a93f01..f6d9180 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java @@ -34,7 +34,7 @@ import fr.ird.observe.ui.tree.ProgramSeineNode; import fr.ird.observe.ui.tree.actions.ChangeTripProgramActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.ui.util.DecoratedNodeEntity; -import fr.ird.observe.ui.util.decorator.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import java.util.ArrayList; import java.util.List; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java index 73f4536..13f282f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceMap; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidationMessageTableRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidationMessageTableRenderer.java index 3151623..79b2885 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidationMessageTableRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidationMessageTableRenderer.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.util; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.service.actions.validate.ValidationMessage; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.admin.validate.ValidationMessageTableModel; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.nuiton.validator.NuitonValidatorScope; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java index b6d8d27..1eed2f2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.util; * #L% */ -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ObserveSwingApplicationContext; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java index 3bbd490..8271bfd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java @@ -43,6 +43,7 @@ import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -181,6 +182,10 @@ public class ValidationContext { close(); } + public DecoratorService getDecoratorService() { + return ObserveSwingApplicationContext.get().getDecoratorService(); + } + public DataContext getDataContext() { return dataContext; } diff --git a/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java index cb2e360..f84dbf2 100644 --- a/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java +++ b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.service.actions.validate.ObserveValidator; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.application.swing.decoration.DecoratorService; import jaxx.runtime.validator.swing.SwingValidatorMessage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/fix_validation in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6d847e4e87b6978b59c345131bcab54d15b23b1e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 17:29:16 2016 +0200 Introduce observe application swing validation module and reintroduce his detection test --- observe-application-swing-validation/LICENSE.txt | 674 +++++++++++++++++++++ observe-application-swing-validation/README.md | 2 + observe-application-swing-validation/changelog.txt | 2 + observe-application-swing-validation/pom.xml | 162 +++++ .../src/license/THIRD-PARTY.properties | 80 +++ .../AbstractSpeciesFieldDtoValidator.java | 45 +- .../ActivityFinDeVeilleExistsDtoValidator.java | 17 +- .../ActivitySimpleSpeedDtoValidator.java | 24 +- .../validators}/ActivitySpeedDtoValidator.java | 31 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 16 +- .../SetLonglineUniqueNumberDtoValidator.java | 18 +- .../SpeciesLengthFieldDtoValidator.java | 4 +- .../SpeciesWeightFieldDtoValidator.java | 4 +- ...ivityLonglineDto-n1-create-error-validation.xml | 0 ...ityLonglineDto-n1-create-warning-validation.xml | 0 ...ivityLonglineDto-n1-update-error-validation.xml | 0 ...ityLonglineDto-n1-update-warning-validation.xml | 0 ...lineEncounterDto-n1-update-error-validation.xml | 0 ...ineSensorUsedDto-n1-update-error-validation.xml | 0 ...tsCompositionDto-n1-update-error-validation.xml | 0 .../BasketDto-n1-update-table-error-validation.xml | 0 ...to-n1-update-catchLongline-error-validation.xml | 0 .../BranchlineDto-n1-update-error-validation.xml | 0 ...nchlineDto-n1-update-table-error-validation.xml | 0 .../BranchlineDto-n1-update-warning-validation.xml | 0 ...esCompositionDto-n1-update-error-validation.xml | 0 ...CatchLonglineDto-n1-update-error-validation.xml | 0 ...tchLonglineDto-n1-update-warning-validation.xml | 0 .../EncounterDto-n1-update-error-validation.xml | 0 .../EncounterDto-n1-update-warning-validation.xml | 0 ...esCompositionDto-n1-update-error-validation.xml | 0 ...turesLonglineDto-n1-update-error-validation.xml | 0 ...ksCompositionDto-n1-update-error-validation.xml | 0 ...SectionDto-n1-update-table-error-validation.xml | 0 .../SensorUsedDto-n1-update-error-validation.xml | 0 .../SensorUsedDto-n1-update-warning-validation.xml | 0 .../SetLonglineDto-n1-create-error-validation.xml | 0 ...SetLonglineDto-n1-create-warning-validation.xml | 0 .../SetLonglineDto-n1-update-error-validation.xml | 0 ...SetLonglineDto-n1-update-warning-validation.xml | 0 ...n1-update-baitsComposition-error-validation.xml | 0 ...ate-branchlinesComposition-error-validation.xml | 0 ...date-floatlinesComposition-error-validation.xml | 0 ...1-update-globalComposition-error-validation.xml | 0 ...n1-update-hooksComposition-error-validation.xml | 0 .../longline/TdrDto-n1-update-error-validation.xml | 0 .../TdrDto-n1-update-warning-validation.xml | 0 .../TripLonglineDto-n1-create-error-validation.xml | 0 ...ripLonglineDto-n1-create-warning-validation.xml | 0 .../TripLonglineDto-n1-update-error-validation.xml | 0 ...ripLonglineDto-n1-update-warning-validation.xml | 0 ...lineGearUseDto-n1-update-warning-validation.xml | 0 .../CountryDto-n1-create-error-validation.xml | 0 .../CountryDto-n1-create-warning-validation.xml | 0 .../CountryDto-n1-update-error-validation.xml | 0 .../CountryDto-n1-update-warning-validation.xml | 0 .../FpaZoneDto-n1-create-error-validation.xml | 0 .../FpaZoneDto-n1-create-warning-validation.xml | 0 .../FpaZoneDto-n1-update-error-validation.xml | 0 .../FpaZoneDto-n1-update-warning-validation.xml | 0 ...CaracteristicDto-n1-create-error-validation.xml | 0 ...racteristicDto-n1-create-warning-validation.xml | 0 ...CaracteristicDto-n1-update-error-validation.xml | 0 ...racteristicDto-n1-update-warning-validation.xml | 0 ...cteristicTypeDto-n1-create-error-validation.xml | 0 ...eristicTypeDto-n1-create-warning-validation.xml | 0 ...cteristicTypeDto-n1-update-error-validation.xml | 0 ...eristicTypeDto-n1-update-warning-validation.xml | 0 .../GearDto-n1-create-error-validation.xml | 0 .../GearDto-n1-create-warning-validation.xml | 0 .../GearDto-n1-update-error-validation.xml | 0 .../GearDto-n1-update-warning-validation.xml | 0 .../HarbourDto-n1-create-error-validation.xml | 0 .../HarbourDto-n1-create-warning-validation.xml | 0 .../HarbourDto-n1-update-error-validation.xml | 0 .../HarbourDto-n1-update-warning-validation.xml | 0 ...ightParameterDto-n1-create-error-validation.xml | 0 ...htParameterDto-n1-create-warning-validation.xml | 0 ...ightParameterDto-n1-update-error-validation.xml | 0 ...htParameterDto-n1-update-warning-validation.xml | 0 .../OceanDto-n1-create-error-validation.xml | 0 .../OceanDto-n1-create-warning-validation.xml | 0 .../OceanDto-n1-update-error-validation.xml | 0 .../OceanDto-n1-update-warning-validation.xml | 0 .../OrganismDto-n1-create-error-validation.xml | 0 .../OrganismDto-n1-create-warning-validation.xml | 0 .../OrganismDto-n1-update-error-validation.xml | 0 .../OrganismDto-n1-update-warning-validation.xml | 0 .../PersonDto-n1-create-error-validation.xml | 0 .../PersonDto-n1-create-warning-validation.xml | 0 .../PersonDto-n1-update-error-validation.xml | 0 .../PersonDto-n1-update-warning-validation.xml | 0 .../ProgramDto-n1-create-error-validation.xml | 0 .../ProgramDto-n1-create-warning-validation.xml | 0 .../ProgramDto-n1-update-error-validation.xml | 0 .../ProgramDto-n1-update-warning-validation.xml | 0 .../SexDto-n1-create-error-validation.xml | 0 .../SexDto-n1-create-warning-validation.xml | 0 .../SexDto-n1-update-error-validation.xml | 0 .../SexDto-n1-update-warning-validation.xml | 0 .../SpeciesDto-n1-create-error-validation.xml | 0 .../SpeciesDto-n1-create-warning-validation.xml | 0 .../SpeciesDto-n1-update-error-validation.xml | 0 .../SpeciesDto-n1-update-warning-validation.xml | 0 .../SpeciesGroupDto-n1-create-error-validation.xml | 0 ...peciesGroupDto-n1-create-warning-validation.xml | 0 .../SpeciesGroupDto-n1-update-error-validation.xml | 0 ...peciesGroupDto-n1-update-warning-validation.xml | 0 .../SpeciesListDto-n1-create-error-validation.xml | 0 ...SpeciesListDto-n1-create-warning-validation.xml | 0 .../SpeciesListDto-n1-update-error-validation.xml | 0 ...SpeciesListDto-n1-update-warning-validation.xml | 0 .../VesselDto-n1-create-error-validation.xml | 0 .../VesselDto-n1-create-warning-validation.xml | 0 .../VesselDto-n1-update-error-validation.xml | 0 .../VesselDto-n1-update-warning-validation.xml | 0 ...lSizeCategoryDto-n1-create-error-validation.xml | 0 ...izeCategoryDto-n1-create-warning-validation.xml | 0 ...lSizeCategoryDto-n1-update-error-validation.xml | 0 ...izeCategoryDto-n1-update-warning-validation.xml | 0 .../VesselTypeDto-n1-create-error-validation.xml | 0 .../VesselTypeDto-n1-create-warning-validation.xml | 0 .../VesselTypeDto-n1-update-error-validation.xml | 0 .../VesselTypeDto-n1-update-warning-validation.xml | 0 ...HaulingStatusDto-n1-create-error-validation.xml | 0 ...ulingStatusDto-n1-create-warning-validation.xml | 0 ...HaulingStatusDto-n1-update-error-validation.xml | 0 ...ulingStatusDto-n1-update-warning-validation.xml | 0 ...SettingStatusDto-n1-create-error-validation.xml | 0 ...ttingStatusDto-n1-create-warning-validation.xml | 0 ...SettingStatusDto-n1-update-error-validation.xml | 0 ...ttingStatusDto-n1-update-warning-validation.xml | 0 .../BaitTypeDto-n1-create-error-validation.xml | 0 .../BaitTypeDto-n1-create-warning-validation.xml | 0 .../BaitTypeDto-n1-update-error-validation.xml | 0 .../BaitTypeDto-n1-update-warning-validation.xml | 0 ...hFateLonglineDto-n1-create-error-validation.xml | 0 ...ateLonglineDto-n1-create-warning-validation.xml | 0 ...hFateLonglineDto-n1-update-error-validation.xml | 0 ...ateLonglineDto-n1-update-warning-validation.xml | 0 ...EncounterTypeDto-n1-create-error-validation.xml | 0 ...counterTypeDto-n1-create-warning-validation.xml | 0 ...EncounterTypeDto-n1-update-error-validation.xml | 0 ...counterTypeDto-n1-update-warning-validation.xml | 0 .../HealthnessDto-n1-create-error-validation.xml | 0 .../HealthnessDto-n1-create-warning-validation.xml | 0 .../HealthnessDto-n1-update-error-validation.xml | 0 .../HealthnessDto-n1-update-warning-validation.xml | 0 .../HookPositionDto-n1-create-error-validation.xml | 0 ...ookPositionDto-n1-create-warning-validation.xml | 0 .../HookPositionDto-n1-update-error-validation.xml | 0 ...ookPositionDto-n1-update-warning-validation.xml | 0 .../HookSizeDto-n1-create-error-validation.xml | 0 .../HookSizeDto-n1-create-warning-validation.xml | 0 .../HookSizeDto-n1-update-error-validation.xml | 0 .../HookSizeDto-n1-update-warning-validation.xml | 0 .../HookTypeDto-n1-create-error-validation.xml | 0 .../HookTypeDto-n1-create-warning-validation.xml | 0 .../HookTypeDto-n1-update-error-validation.xml | 0 .../HookTypeDto-n1-update-warning-validation.xml | 0 ...ontalPositionDto-n1-create-error-validation.xml | 0 ...talPositionDto-n1-create-warning-validation.xml | 0 ...ontalPositionDto-n1-update-error-validation.xml | 0 ...talPositionDto-n1-update-warning-validation.xml | 0 ...ticalPositionDto-n1-create-error-validation.xml | 0 ...calPositionDto-n1-create-warning-validation.xml | 0 ...ticalPositionDto-n1-update-error-validation.xml | 0 ...calPositionDto-n1-update-warning-validation.xml | 0 ...htsticksColorDto-n1-create-error-validation.xml | 0 ...sticksColorDto-n1-create-warning-validation.xml | 0 ...htsticksColorDto-n1-update-error-validation.xml | 0 ...sticksColorDto-n1-update-warning-validation.xml | 0 ...ghtsticksTypeDto-n1-create-error-validation.xml | 0 ...tsticksTypeDto-n1-create-warning-validation.xml | 0 ...ghtsticksTypeDto-n1-update-error-validation.xml | 0 ...tsticksTypeDto-n1-update-warning-validation.xml | 0 .../LineTypeDto-n1-create-error-validation.xml | 0 .../LineTypeDto-n1-create-warning-validation.xml | 0 .../LineTypeDto-n1-update-error-validation.xml | 0 .../LineTypeDto-n1-update-warning-validation.xml | 0 ...aturityStatusDto-n1-create-error-validation.xml | 0 ...urityStatusDto-n1-create-warning-validation.xml | 0 ...aturityStatusDto-n1-update-error-validation.xml | 0 ...urityStatusDto-n1-update-warning-validation.xml | 0 ...itigationTypeDto-n1-create-error-validation.xml | 0 ...igationTypeDto-n1-create-warning-validation.xml | 0 ...itigationTypeDto-n1-update-error-validation.xml | 0 ...igationTypeDto-n1-update-warning-validation.xml | 0 .../SensorBrandDto-n1-create-error-validation.xml | 0 ...SensorBrandDto-n1-create-warning-validation.xml | 0 .../SensorBrandDto-n1-update-error-validation.xml | 0 ...SensorBrandDto-n1-update-warning-validation.xml | 0 ...sorDataFormatDto-n1-create-error-validation.xml | 0 ...rDataFormatDto-n1-create-warning-validation.xml | 0 ...sorDataFormatDto-n1-update-error-validation.xml | 0 ...rDataFormatDto-n1-update-warning-validation.xml | 0 .../SensorTypeDto-n1-create-error-validation.xml | 0 .../SensorTypeDto-n1-create-warning-validation.xml | 0 .../SensorTypeDto-n1-update-error-validation.xml | 0 .../SensorTypeDto-n1-update-warning-validation.xml | 0 .../SettingShapeDto-n1-create-error-validation.xml | 0 ...ettingShapeDto-n1-create-warning-validation.xml | 0 .../SettingShapeDto-n1-update-error-validation.xml | 0 ...ettingShapeDto-n1-update-warning-validation.xml | 0 ...zeMeasureTypeDto-n1-create-error-validation.xml | 0 ...MeasureTypeDto-n1-create-warning-validation.xml | 0 ...zeMeasureTypeDto-n1-update-error-validation.xml | 0 ...MeasureTypeDto-n1-update-warning-validation.xml | 0 ...tomacFullnessDto-n1-create-error-validation.xml | 0 ...macFullnessDto-n1-create-warning-validation.xml | 0 ...tomacFullnessDto-n1-update-error-validation.xml | 0 ...macFullnessDto-n1-update-warning-validation.xml | 0 .../TripTypeDto-n1-create-error-validation.xml | 0 .../TripTypeDto-n1-create-warning-validation.xml | 0 .../TripTypeDto-n1-update-error-validation.xml | 0 .../TripTypeDto-n1-update-warning-validation.xml | 0 ...ivityLonglineDto-n1-create-error-validation.xml | 0 ...ityLonglineDto-n1-create-warning-validation.xml | 0 ...ivityLonglineDto-n1-update-error-validation.xml | 0 ...ityLonglineDto-n1-update-warning-validation.xml | 0 ...htMeasureTypeDto-n1-create-error-validation.xml | 0 ...MeasureTypeDto-n1-create-warning-validation.xml | 0 ...htMeasureTypeDto-n1-update-error-validation.xml | 0 ...MeasureTypeDto-n1-update-warning-validation.xml | 0 ...DetectionModeDto-n1-create-error-validation.xml | 0 ...tectionModeDto-n1-create-warning-validation.xml | 0 ...DetectionModeDto-n1-update-error-validation.xml | 0 ...tectionModeDto-n1-update-warning-validation.xml | 0 .../ObjectFateDto-n1-create-error-validation.xml | 0 .../ObjectFateDto-n1-create-warning-validation.xml | 0 .../ObjectFateDto-n1-update-error-validation.xml | 0 .../ObjectFateDto-n1-update-warning-validation.xml | 0 ...jectOperationDto-n1-create-error-validation.xml | 0 ...ctOperationDto-n1-create-warning-validation.xml | 0 ...jectOperationDto-n1-update-error-validation.xml | 0 ...ctOperationDto-n1-update-warning-validation.xml | 0 .../ObjectTypeDto-n1-create-error-validation.xml | 0 .../ObjectTypeDto-n1-create-warning-validation.xml | 0 .../ObjectTypeDto-n1-update-error-validation.xml | 0 .../ObjectTypeDto-n1-update-warning-validation.xml | 0 ...bservedSystemDto-n1-create-error-validation.xml | 0 ...ervedSystemDto-n1-create-warning-validation.xml | 0 ...bservedSystemDto-n1-update-error-validation.xml | 0 ...ervedSystemDto-n1-update-warning-validation.xml | 0 ...sonForDiscardDto-n1-create-error-validation.xml | 0 ...nForDiscardDto-n1-create-warning-validation.xml | 0 ...sonForDiscardDto-n1-update-error-validation.xml | 0 ...nForDiscardDto-n1-update-warning-validation.xml | 0 ...nForNoFishingDto-n1-create-error-validation.xml | 0 ...orNoFishingDto-n1-create-warning-validation.xml | 0 ...nForNoFishingDto-n1-update-error-validation.xml | 0 ...orNoFishingDto-n1-update-warning-validation.xml | 0 ...sonForNullSetDto-n1-create-error-validation.xml | 0 ...nForNullSetDto-n1-create-warning-validation.xml | 0 ...sonForNullSetDto-n1-update-error-validation.xml | 0 ...nForNullSetDto-n1-update-warning-validation.xml | 0 .../SpeciesFateDto-n1-create-error-validation.xml | 0 ...SpeciesFateDto-n1-create-warning-validation.xml | 0 .../SpeciesFateDto-n1-update-error-validation.xml | 0 ...SpeciesFateDto-n1-update-warning-validation.xml | 0 ...SpeciesStatusDto-n1-create-error-validation.xml | 0 ...eciesStatusDto-n1-create-warning-validation.xml | 0 ...SpeciesStatusDto-n1-update-error-validation.xml | 0 ...eciesStatusDto-n1-update-warning-validation.xml | 0 ...ndingActivityDto-n1-create-error-validation.xml | 0 ...ingActivityDto-n1-create-warning-validation.xml | 0 ...ndingActivityDto-n1-update-error-validation.xml | 0 ...ingActivityDto-n1-update-warning-validation.xml | 0 ...BuoyOperationDto-n1-create-error-validation.xml | 0 ...oyOperationDto-n1-create-warning-validation.xml | 0 ...BuoyOperationDto-n1-update-error-validation.xml | 0 ...oyOperationDto-n1-update-warning-validation.xml | 0 ...ttingBuoyTypeDto-n1-create-error-validation.xml | 0 ...ingBuoyTypeDto-n1-create-warning-validation.xml | 0 ...ttingBuoyTypeDto-n1-update-error-validation.xml | 0 ...ingBuoyTypeDto-n1-update-warning-validation.xml | 0 ...ActivitySeineDto-n1-create-error-validation.xml | 0 ...tivitySeineDto-n1-create-warning-validation.xml | 0 ...ActivitySeineDto-n1-update-error-validation.xml | 0 ...tivitySeineDto-n1-update-warning-validation.xml | 0 ...eightCategoryDto-n1-create-error-validation.xml | 0 ...ghtCategoryDto-n1-create-warning-validation.xml | 0 ...eightCategoryDto-n1-update-error-validation.xml | 0 ...ghtCategoryDto-n1-update-warning-validation.xml | 0 .../seine/WindDto-n1-create-error-validation.xml | 0 .../seine/WindDto-n1-create-warning-validation.xml | 0 .../seine/WindDto-n1-update-error-validation.xml | 0 .../seine/WindDto-n1-update-warning-validation.xml | 0 ...ActivitySeineDto-n1-create-error-validation.xml | 0 ...tivitySeineDto-n1-create-warning-validation.xml | 0 ...ActivitySeineDto-n1-update-error-validation.xml | 0 ...tivitySeineDto-n1-update-warning-validation.xml | 0 ...bservedSystemDto-n1-update-error-validation.xml | 0 ...ervedSystemDto-n1-update-warning-validation.xml | 0 ...loatingObjectDto-n1-create-error-validation.xml | 0 ...atingObjectDto-n1-create-warning-validation.xml | 0 ...loatingObjectDto-n1-update-error-validation.xml | 0 ...atingObjectDto-n1-update-warning-validation.xml | 0 ...choolEstimateDto-n1-update-error-validation.xml | 0 ...nsmittingBuoyDto-n1-update-error-validation.xml | 0 ...FeaturesSeineDto-n1-update-error-validation.xml | 0 ...onTargetCatchDto-n1-update-error-validation.xml | 0 ...TargetCatchDto-n1-update-warning-validation.xml | 0 ...nTargetLengthDto-n1-update-error-validation.xml | 0 ...argetLengthDto-n1-update-warning-validation.xml | 0 ...nTargetSampleDto-n1-update-error-validation.xml | 0 ...servedSpeciesDto-n1-update-error-validation.xml | 0 ...choolEstimateDto-n1-update-error-validation.xml | 0 ...oolEstimateDto-n1-update-warning-validation.xml | 0 .../seine/RouteDto-n1-create-error-validation.xml | 0 .../RouteDto-n1-create-warning-validation.xml | 0 .../seine/RouteDto-n1-update-error-validation.xml | 0 .../RouteDto-n1-update-warning-validation.xml | 0 ...choolEstimateDto-n1-update-error-validation.xml | 0 .../SetSeineDto-n1-create-error-validation.xml | 0 .../SetSeineDto-n1-create-warning-validation.xml | 0 .../SetSeineDto-n1-update-error-validation.xml | 0 .../SetSeineDto-n1-update-warning-validation.xml | 0 ...onTargetCatchDto-n1-update-error-validation.xml | 0 ...choolEstimateDto-n1-update-error-validation.xml | 0 ...hDto-n1-update-targetCatch-error-validation.xml | 0 ...-n1-update-targetDiscarded-error-validation.xml | 0 ...hDto-n1-update-targetCatch-error-validation.xml | 0 ...to-n1-update-targetCatch-warning-validation.xml | 0 ...-n1-update-targetDiscarded-error-validation.xml | 0 ...1-update-targetDiscarded-warning-validation.xml | 0 .../TargetLengthDto-n1-update-error-validation.xml | 0 ...argetLengthDto-n1-update-warning-validation.xml | 0 .../TargetSampleDto-n1-update-error-validation.xml | 0 ...nsmittingBuoyDto-n1-update-error-validation.xml | 0 ...mittingBuoyDto-n1-update-warning-validation.xml | 0 .../TripSeineDto-n1-create-error-validation.xml | 0 .../TripSeineDto-n1-create-warning-validation.xml | 0 .../TripSeineDto-n1-update-error-validation.xml | 0 .../TripSeineDto-n1-update-warning-validation.xml | 0 ...eineGearUseDto-n1-update-warning-validation.xml | 0 ...e-application-swing-validation_en_GB.properties | 414 +++++++++++++ ...e-application-swing-validation_es_ES.properties | 425 +++++++++++++ ...e-application-swing-validation_fr_FR.properties | 425 +++++++++++++ .../validation/BeanValidatorDetectorTest.java | 501 +++++++++++++++ .../src/test/resources/log4j.properties | 34 ++ .../src/test/resources/validators.xml | 70 +++ observe-application-swing/pom.xml | 26 +- pom.xml | 3 + 344 files changed, 2877 insertions(+), 100 deletions(-) diff --git a/observe-application-swing-validation/LICENSE.txt b/observe-application-swing-validation/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/observe-application-swing-validation/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/observe-application-swing-validation/README.md b/observe-application-swing-validation/README.md new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/observe-application-swing-validation/README.md @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/observe-application-swing-validation/changelog.txt b/observe-application-swing-validation/changelog.txt new file mode 100644 index 0000000..60d39cb --- /dev/null +++ b/observe-application-swing-validation/changelog.txt @@ -0,0 +1,2 @@ +0.1 chemit 200812?? + - first release \ No newline at end of file diff --git a/observe-application-swing-validation/pom.xml b/observe-application-swing-validation/pom.xml new file mode 100644 index 0000000..86ee048 --- /dev/null +++ b/observe-application-swing-validation/pom.xml @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <version>5.0-SNAPSHOT</version> + </parent> + + <artifactId>observe-application-swing-validation</artifactId> + + <name>ObServe :: Application Swing Validation</name> + <description>ObServe Application Swing Validation</description> + + <properties> + + </properties> + + <dependencies> + + <!-- sibling dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-validation-shared</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-application-swing-decoration</artifactId> + <version>${project.version}</version> + </dependency> + + + <!-- commons dependencies --> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <!-- Nuiton --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <!-- XWork --> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> + + <!-- test dependencies --> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>scan-sources</id> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + <goal>gen</goal> + </goals> + <configuration> + <entries> + <entry> + <specificGoal>parserValidation</specificGoal> + <basedir>${project.basedir}/src/main/resources/</basedir> + <includes> + <param>**/**-validation.xml</param> + </includes> + </entry> + </entries> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/observe-application-swing-validation/src/license/THIRD-PARTY.properties b/observe-application-swing-validation/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..e8bb5de --- /dev/null +++ b/observe-application-swing-validation/src/license/THIRD-PARTY.properties @@ -0,0 +1,80 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Apache 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 +# - Apache Software License, version 1.1 +# - BSD License +# - BSD License for HSQL +# - Common Development and Distribution License +# - EPSG database distribution license +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 +# - Eclipse Public License, Version 1.0 +# - GNU General Public License - Version 2 with the class path exception +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License +# - GNU Lesser General Public License, Version 2.1 +# - GNU Library or Lesser General Public License +# - General Public License (GPL) +# - HSQLDB License, a BSD open source license +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - JDL (Java Distribution License) +# - LGPL 2.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - OGC copyright +# - Public Domain +# - Similar to Apache License but with the acknowledgment clause removed +# - Simplified BSD +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - The MIT License(MIT) +# - The PostgreSQL License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jul 11 12:20:32 CEST 2016 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +it.geosolutions.jaiext.affine--jt-affine--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.algebra--jt-algebra--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandcombine--jt-bandcombine--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandmerge--jt-bandmerge--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.bandselect--jt-bandselect--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.binarize--jt-binarize--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.border--jt-border--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.buffer--jt-buffer--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.classifier--jt-classifier--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.colorconvert--jt-colorconvert--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.colorindexer--jt-colorindexer--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.crop--jt-crop--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.errordiffusion--jt-errordiffusion--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.format--jt-format--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.imagefunction--jt-imagefunction--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.iterators--jt-iterators--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.lookup--jt-lookup--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.mosaic--jt-mosaic--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.nullop--jt-nullop--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.orderdither--jt-orderdither--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.piecewise--jt-piecewise--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.rescale--jt-rescale--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.rlookup--jt-rlookup--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.scale--jt-scale--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.stats--jt-stats--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.translate--jt-translate--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.utilities--jt-utilities--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.vectorbin--jt-vectorbin--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.warp--jt-warp--1.0.9=The Apache Software License, Version 2.0 +it.geosolutions.jaiext.zonal--jt-zonal--1.0.9=The Apache Software License, Version 2.0 +javax.media--jai_codec--1.1.3=JDL (Java Distribution License) +javax.media--jai_core--1.1.3=JDL (Java Distribution License) +javax.media--jai_imageio--1.1=JDL (Java Distribution License) +jgridshift--jgridshift--1.0=GNU Library or Lesser General Public License diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/AbstractEspeceFieldDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java similarity index 88% rename from observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/AbstractEspeceFieldDtoValidator.java rename to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java index d88400f..338993f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/AbstractEspeceFieldDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator.dto; +package fr.ird.observe.application.swing.validation.validators; /* * #%L @@ -22,7 +22,6 @@ package fr.ird.observe.validation.validator.dto; * #L% */ -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -57,11 +56,10 @@ import org.apache.commons.logging.LogFactory; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public abstract class AbstractEspeceFieldDtoValidator extends FieldValidatorSupport { +public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSupport { /** Logger. */ - private static final Log log = - LogFactory.getLog(AbstractEspeceFieldDtoValidator.class); + private static final Log log = LogFactory.getLog(AbstractSpeciesFieldDtoValidator.class); public static class Bound { @@ -99,12 +97,12 @@ public abstract class AbstractEspeceFieldDtoValidator extends FieldValidatorSupp } } - /** - * la stack de validation interceptée lors de la création du validateur. - * - * Utilisée pour pousser des données dans le context. - */ - protected ValueStack valueStack; +// /** +// * la stack de validation interceptée lors de la création du validateur. +// * +// * Utilisée pour pousser des données dans le context. +// */ +// protected ValueStack valueStack; /** le ratio a appliquer sur les bornes définies dans le référentiel */ protected Float ratio; @@ -120,19 +118,19 @@ public abstract class AbstractEspeceFieldDtoValidator extends FieldValidatorSupp protected String speciesField = "species"; - public ValueStack getValueStack() { - return valueStack; - } +// public ValueStack getValueStack() { +// return valueStack; +// } public String getSpeciesField() { return speciesField; } - @Override - public void setValueStack(ValueStack valueStack) { - this.valueStack = valueStack; - super.setValueStack(valueStack); - } +// @Override +// public void setValueStack(ValueStack valueStack) { +// this.valueStack = valueStack; +// super.setValueStack(valueStack); +// } public void setSpeciesField(String speciesField) { this.speciesField = speciesField; @@ -230,7 +228,7 @@ public abstract class AbstractEspeceFieldDtoValidator extends FieldValidatorSupp log.debug("Espece to validate : " + speciesRef); } - SpeciesDto speciesDto = (SpeciesDto) getValueStack().findValue("getSpecies(\"" + speciesRef.getId() + "\")"); + SpeciesDto speciesDto = (SpeciesDto) stack.findValue("getSpecies(\"" + speciesRef.getId() + "\")"); Bound bound = getBound(speciesDto); @@ -256,12 +254,12 @@ public abstract class AbstractEspeceFieldDtoValidator extends FieldValidatorSupp if (!valid) { - valueStack.push(bound); + stack.push(bound); try { addFieldError(fieldName, object); } finally { - valueStack.pop(); + stack.pop(); } } } @@ -279,8 +277,7 @@ public abstract class AbstractEspeceFieldDtoValidator extends FieldValidatorSupp return new Bound(min, max); } - protected boolean validateBound(Float value, - Bound bound) { + protected boolean validateBound(Float value, Bound bound) { if (value == null) { // valeur non définie diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivityFinDeVeilleExistsDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java similarity index 92% rename from observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivityFinDeVeilleExistsDtoValidator.java rename to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java index 0c2033d..c3b3bf8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivityFinDeVeilleExistsDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator.dto; +package fr.ird.observe.application.swing.validation.validators; /* * #%L @@ -22,7 +22,6 @@ package fr.ird.observe.validation.validator.dto; * #L% */ -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -84,8 +83,6 @@ public class ActivityFinDeVeilleExistsDtoValidator extends FieldValidatorSupport */ private Boolean required; - private ValueStack stack; - @Override public String getValidatorType() { return "activityFinDeVeilleExists"; @@ -96,12 +93,6 @@ public class ActivityFinDeVeilleExistsDtoValidator extends FieldValidatorSupport } @Override - public void setValueStack(ValueStack stack) { - this.stack = stack; - super.setValueStack(stack); - } - - @Override public void validate(Object object) throws ValidationException { if (required == null) { @@ -159,9 +150,9 @@ public class ActivityFinDeVeilleExistsDtoValidator extends FieldValidatorSupport if (log.isInfoEnabled()) { log.info("check [required : " + required + - "?] activity fin de veille sur la route " + - route.getId() + ":" + route.getDate() - + "sur " + route.sizeActivitySeine() + " activity(s)."); + "?] activity fin de veille sur la route " + + route.getId() + ":" + route.getDate() + + "sur " + route.sizeActivitySeine() + " activity(s)."); } boolean detected = route.isActivityFindDeVeilleFound(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java similarity index 88% rename from observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java rename to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java index 69c4c15..4b6367d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator.dto; +package fr.ird.observe.application.swing.validation.validators; /* * #%L @@ -22,15 +22,14 @@ package fr.ird.observe.validation.validator.dto; * #L% */ -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; -import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.util.gps.GPSPoint; -import fr.ird.observe.util.gps.GpsPoints; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.util.gps.GPSPoint; +import fr.ird.observe.util.gps.GpsPoints; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -84,12 +83,6 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { } @Override - public void setValueStack(ValueStack stack) { - this.stack = stack; - super.setValueStack(stack); - } - - @Override public void validate(Object object) throws ValidationException { if (speed == null) { @@ -172,15 +165,18 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { } protected String decorate(ActivitySeineDto activitySeine) { - return ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ActivitySeineDto.class).toString(activitySeine); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + return decoratorService.getDecoratorByType(ActivitySeineDto.class).toString(activitySeine); } protected String decorate(ActivitySeineStubDto activitySeine) { - return ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ActivitySeineStubDto.class).toString(activitySeine); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + return decoratorService.getDecoratorByType(ActivitySeineStubDto.class).toString(activitySeine); } protected String decorate(GPSPoint currentPoint) { - return ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(GPSPoint.class).toString(currentPoint); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + return decoratorService.getDecoratorByType(GPSPoint.class).toString(currentPoint); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java similarity index 89% rename from observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java rename to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java index 4e7cd97..0864aaa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator.dto; +package fr.ird.observe.application.swing.validation.validators; /* * #%L @@ -22,14 +22,13 @@ package fr.ird.observe.validation.validator.dto; * #L% */ -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; -import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.util.gps.GPSPoint; -import fr.ird.observe.util.gps.GpsPoints; +import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.util.gps.GPSPoint; +import fr.ird.observe.util.gps.GpsPoints; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator; @@ -85,12 +84,6 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { this.speed = speed; } - @Override - public void setValueStack(ValueStack stack) { - this.stack = stack; - super.setValueStack(stack); - } - protected String invalidActivity; public String getInvalidActivity() { @@ -98,11 +91,13 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { } protected String decorate(ActivitySeineStubDto activitySeine) { - return ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ActivitySeineStubDto.class).toString(activitySeine); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + return decoratorService.getDecoratorByType(ActivitySeineStubDto.class).toString(activitySeine); } protected String decorate(GPSPoint currentPoint) { - return ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(GPSPoint.class).toString(currentPoint); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + return decoratorService.getDecoratorByType(GPSPoint.class).toString(currentPoint); } public CollectionFieldExpressionValidator getDelegate(final RouteDto route) { @@ -160,11 +155,11 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { if (LOG.isInfoEnabled()) { LOG.info("Speed from " + - decorate(previousActivity) + - " to " + invalidActivity + - " is " + computedSpeed + - " which is more thant authorized one " + - speed); + decorate(previousActivity) + + " to " + invalidActivity + + " is " + computedSpeed + + " which is more thant authorized one " + + speed); } } return valid; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SetLonglineUniqueHomeIdDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java similarity index 83% rename from observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SetLonglineUniqueHomeIdDtoValidator.java rename to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java index 7aa25e7..e661364 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SetLonglineUniqueHomeIdDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator.dto; +package fr.ird.observe.application.swing.validation.validators; /* * #%L @@ -24,16 +24,15 @@ package fr.ird.observe.validation.validator.dto; import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; -import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.decoration.DecoratorService; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDtos; -import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; /** * Created on 12/7/14. @@ -44,12 +43,6 @@ import fr.ird.observe.ui.util.decorator.DataReferenceDecorator; public class SetLonglineUniqueHomeIdDtoValidator extends FieldValidatorSupport { @Override - public void setValueStack(ValueStack stack) { - this.stack = stack; - super.setValueStack(stack); - } - - @Override public void validate(Object object) throws ValidationException { SetLonglineDto setLongline = (SetLonglineDto) object; @@ -63,7 +56,8 @@ public class SetLonglineUniqueHomeIdDtoValidator extends FieldValidatorSupport { DataReference<ActivityLonglineDto> activityLonglineRef = sameHomeIdSetLonglineOptional.get().getActivityLongline(); - DataReferenceDecorator<ActivityLonglineDto> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDataReferenceDecorator(ActivityLonglineDto.class); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + DataReferenceDecorator<ActivityLonglineDto> decorator = decoratorService.getDataReferenceDecorator(ActivityLonglineDto.class); stack.set("duplicatedActivity", decorator.toString(activityLonglineRef)); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SetLonglineUniqueNumberDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java similarity index 78% rename from observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SetLonglineUniqueNumberDtoValidator.java rename to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java index 62aa89a..bf6f04f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SetLonglineUniqueNumberDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator.dto; +package fr.ird.observe.application.swing.validation.validators; /* * #%L @@ -24,16 +24,15 @@ package fr.ird.observe.validation.validator.dto; import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; -import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.decoration.DecoratorService; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDtos; -import org.nuiton.decorator.Decorator; /** * Created on 12/7/14. @@ -44,12 +43,6 @@ import org.nuiton.decorator.Decorator; public class SetLonglineUniqueNumberDtoValidator extends FieldValidatorSupport { @Override - public void setValueStack(ValueStack stack) { - this.stack = stack; - super.setValueStack(stack); - } - - @Override public void validate(Object object) throws ValidationException { SetLonglineDto setLongline = (SetLonglineDto) object; @@ -61,9 +54,10 @@ public class SetLonglineUniqueNumberDtoValidator extends FieldValidatorSupport { if (sameNumberSetLonglineOptional.isPresent()) { - DataReference activityLonglineRef = sameNumberSetLonglineOptional.get().getActivityLongline(); + DataReference<ActivityLonglineDto> activityLonglineRef = sameNumberSetLonglineOptional.get().getActivityLongline(); - Decorator<Class<ActivityLonglineDto>> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecorator(ActivityLonglineDto.class); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + DataReferenceDecorator<ActivityLonglineDto> decorator = decoratorService.getDataReferenceDecorator(ActivityLonglineDto.class); stack.set("duplicatedActivity", decorator.toString(activityLonglineRef)); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SpeciesLengthFieldDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java similarity index 89% rename from observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SpeciesLengthFieldDtoValidator.java rename to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java index 546dd7c..a762742 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SpeciesLengthFieldDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator.dto; +package fr.ird.observe.application.swing.validation.validators; /* * #%L @@ -30,7 +30,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public class SpeciesLengthFieldDtoValidator extends AbstractEspeceFieldDtoValidator { +public class SpeciesLengthFieldDtoValidator extends AbstractSpeciesFieldDtoValidator { @Override protected Float getBoundMin(SpeciesDto referentiel) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SpeciesWeightFieldDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java similarity index 89% rename from observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SpeciesWeightFieldDtoValidator.java rename to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java index 3923256..cba6cd2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SpeciesWeightFieldDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.validation.validator.dto; +package fr.ird.observe.application.swing.validation.validators; /* * #%L @@ -30,7 +30,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public class SpeciesWeightFieldDtoValidator extends AbstractEspeceFieldDtoValidator { +public class SpeciesWeightFieldDtoValidator extends AbstractSpeciesFieldDtoValidator { @Override protected Float getBoundMin(SpeciesDto referentiel) { diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-n1-update-table-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-n1-update-table-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-n1-update-table-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-n1-update-table-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-catchLongline-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-catchLongline-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-catchLongline-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-catchLongline-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-table-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-table-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-table-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-table-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-n1-update-table-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-n1-update-table-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-n1-update-table-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-n1-update-table-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-baitsComposition-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-baitsComposition-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-baitsComposition-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-baitsComposition-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-branchlinesComposition-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-branchlinesComposition-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-branchlinesComposition-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-branchlinesComposition-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-floatlinesComposition-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-floatlinesComposition-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-floatlinesComposition-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-floatlinesComposition-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-globalComposition-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-globalComposition-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-globalComposition-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-globalComposition-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-hooksComposition-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-hooksComposition-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-hooksComposition-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-n1-update-hooksComposition-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectSchoolEstimateDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetSampleDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetSampleDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetSampleDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetSampleDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ObjectSchoolEstimateDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SchoolEstimateDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SchoolEstimateDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SchoolEstimateDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SchoolEstimateDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineNonTargetCatchDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineNonTargetCatchDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineNonTargetCatchDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineNonTargetCatchDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineSchoolEstimateDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineSchoolEstimateDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineSchoolEstimateDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineSchoolEstimateDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-n1-update-targetCatch-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-n1-update-targetCatch-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-n1-update-targetCatch-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-n1-update-targetCatch-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-n1-update-targetDiscarded-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-n1-update-targetDiscarded-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-n1-update-targetDiscarded-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/SetSeineTargetCatchDto-n1-update-targetDiscarded-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetCatch-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetCatch-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetCatch-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetCatch-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetCatch-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetCatch-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetCatch-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetCatch-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetDiscarded-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetDiscarded-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetDiscarded-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetDiscarded-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetDiscarded-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetDiscarded-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetDiscarded-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-n1-update-targetDiscarded-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetSampleDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetSampleDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TargetSampleDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetSampleDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-create-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-error-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-error-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-error-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineDto-n1-update-warning-validation.xml diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml similarity index 100% rename from observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml rename to observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml diff --git a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties new file mode 100644 index 0000000..e5c1336 --- /dev/null +++ b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties @@ -0,0 +1,414 @@ +validator.activity.bound.latitude= +validator.activity.bound.longitude= +validator.activity.bound.seaSurfaceTemperature= +validator.activity.bound.vesselSpeed= +validator.activity.comment.tobig= +validator.activity.desactivated.currentFpaZone= +validator.activity.desactivated.detectionMode= +validator.activity.desactivated.nextFpaZone= +validator.activity.desactivated.observedSystem= +validator.activity.desactivated.previousFpaZone= +validator.activity.desactivated.reasonForNoFishing= +validator.activity.desactivated.surroundingActivity= +validator.activity.desactivated.vesselActivity= +validator.activity.desactivated.wind= +validator.activity.duplicated.time= +validator.activity.invalid.quadrant= +validator.activity.invalid.seaSurfaceTemperature= +validator.activity.invalid.speed= +validator.activity.null.dcp= +validator.activity.null.fpaZone= +validator.activity.null.observedSystem= +validator.activity.null.observedSystemDistance= +validator.activity.null.seaSurfaceTemperature= +validator.activity.null.surroundingActivity= +validator.activity.null.wind= +validator.activity.required.comment.for.currentFpaZone= +validator.activity.required.comment.for.detectionMode= +validator.activity.required.comment.for.fpaZone= +validator.activity.required.comment.for.nextFpaZone= +validator.activity.required.comment.for.observedSystem= +validator.activity.required.comment.for.previousFpaZone= +validator.activity.required.comment.for.reasonForNoFishing= +validator.activity.required.comment.for.vesselActivity= +validator.activity.required.date= +validator.activity.required.latitude= +validator.activity.required.longitude= +validator.activity.required.quadrant= +validator.activity.required.time= +validator.activity.required.vesselActivity= +validator.activityLongline.desactivated.fpaZone= +validator.baitsComposition.bound.individualSize= +validator.baitsComposition.bound.individualWeight= +validator.baitsComposition.bound.proportion= +validator.baitsComposition.desactivated.baitSettingStatus= +validator.baitsComposition.desactivated.baitType= +validator.baitsComposition.required.baitSettingStatus= +validator.baitsComposition.required.baitType= +validator.baitsComposition.required.proportion= +validator.basket.bound.floatline1Length= +validator.basket.bound.floatline2Length= +validator.basket.required.settingIdentifier= +validator.branchline.bound.branchlineLength= +validator.branchline.bound.tracelineLength= +validator.branchline.desactivated.baitHaulingStatus= +validator.branchline.desactivated.baitSettingStatus= +validator.branchline.desactivated.baitType= +validator.branchline.desactivated.hookSize= +validator.branchline.desactivated.hookType= +validator.branchline.desactivated.topType= +validator.branchline.desactivated.tracelineType= +validator.branchline.required.settingIdentifier= +validator.branchline.required.topType= +validator.branchline.required.tracelineType= +validator.branchlinesComposition.bound.length= +validator.branchlinesComposition.bound.proportion= +validator.branchlinesComposition.desactivated.topType= +validator.branchlinesComposition.desactivated.tracelineType= +validator.branchlinesComposition.required.length= +validator.branchlinesComposition.required.proportion= +validator.branchlinesComposition.required.topType= +validator.branchlinesComposition.required.tracelineType= +validator.catchLongline.bound.gonadeWeight= +validator.catchLongline.comment.tobig= +validator.catchLongline.desactivated.catchFateLongline= +validator.catchLongline.desactivated.catchHealthness= +validator.catchLongline.desactivated.discardHealthness= +validator.catchLongline.desactivated.hookPosition= +validator.catchLongline.desactivated.maturityStatus= +validator.catchLongline.desactivated.sex= +validator.catchLongline.desactivated.speciesCatch= +validator.catchLongline.desactivated.stomacFullness= +validator.catchLongline.required.comment.for.speciesCatch= +validator.catchLongline.required.count.when.acquisitionModeIsGrouped= +validator.catchLongline.required.position= +validator.catchLongline.required.speciesCatch= +validator.country.invalid.iso2Code.uniqueKey= +validator.country.invalid.iso3Code.uniqueKey= +validator.country.required.iso2Code= +validator.country.required.iso3Code= +validator.encounter.desactivated.encounterType= +validator.encounter.desactivated.species= +validator.encounter.required.count= +validator.encounter.required.distance= +validator.encounter.required.encounterType= +validator.encounter.required.species= +validator.floatingObject.comment.tobig= +validator.floatingObject.desactivated.objectFate= +validator.floatingObject.desactivated.objectOperation= +validator.floatingObject.desactivated.type= +validator.floatingObject.null.daysAtSeaCount= +validator.floatingObject.positive.daysAtSeaCount= +validator.floatingObject.required.comment.for.balise1= +validator.floatingObject.required.comment.for.balise2= +validator.floatingObject.required.comment.for.objectFate= +validator.floatingObject.required.comment.for.type= +validator.floatingObject.required.objectFate= +validator.floatingObject.required.objectOperation= +validator.floatingObject.required.type= +validator.floatingObject.size.supportVesselName= +validator.floatlinesComposition.bound.length= +validator.floatlinesComposition.bound.proportion= +validator.floatlinesComposition.desactivated.lineType= +validator.floatlinesComposition.required.length= +validator.floatlinesComposition.required.lineType= +validator.floatlinesComposition.required.proportion= +validator.gearCaracteristic.desactivated.gearCaracteristicType= +validator.gearCaracteristic.required.gearCaracteristicType= +validator.gearUseFeature.desactivated.gear= +validator.gearUseFeature.required.gear= +validator.gearUseFeature.required.number= +validator.harbour.desactivated.country= +validator.harbour.null.latitude= +validator.harbour.null.locode= +validator.harbour.null.longitude= +validator.harbour.required.country= +validator.harbour.required.name= +validator.hooksComposition.bound.hookOffset= +validator.hooksComposition.bound.proportion= +validator.hooksComposition.desactivated.hookSize= +validator.hooksComposition.desactivated.hookType= +validator.hooksComposition.required.hookSize= +validator.hooksComposition.required.hookType= +validator.hooksComposition.required.proportion= +validator.lengthWeightParameter.invalid.lengthWeightFormula= +validator.lengthWeightParameter.invalid.uniqueKey= +validator.lengthWeightParameter.invalid.weightLengthFormula= +validator.lengthWeightParameter.null.ocean= +validator.lengthWeightParameter.required.coefficients= +validator.lengthWeightParameter.required.endDate= +validator.lengthWeightParameter.required.lengthWeightFormula= +validator.lengthWeightParameter.required.species= +validator.lengthWeightParameter.required.startDate= +validator.lengthWeightParameter.required.weightLengthFormula= +validator.nonTargetCatch.bound.catchWeight= +validator.nonTargetCatch.bound.meanLength= +validator.nonTargetCatch.bound.meanWeight= +validator.nonTargetCatch.bound.totalCount= +validator.nonTargetCatch.comment.tobig= +validator.nonTargetCatch.desactivated.reasonForDiscard= +validator.nonTargetCatch.desactivated.species= +validator.nonTargetCatch.desactivated.speciesFate= +validator.nonTargetCatch.positive.meanLength= +validator.nonTargetCatch.positive.meanWeight= +validator.nonTargetCatch.required.comment.for.reasonForDiscard= +validator.nonTargetCatch.required.comment.for.speciesFate= +validator.nonTargetCatch.required.species= +validator.nonTargetCatch.required.speciesFate= +validator.nonTargetCatch.required.weightOrNombreEstime= +validator.nonTargetCatch.required.weightOrTailleMoyen= +validator.nonTargetCatch.uniqueKey= +validator.nonTargetSample.bound.length= +validator.nonTargetSample.bound.weight= +validator.nonTargetSample.comment.tobig= +validator.nonTargetSample.desactivated.species= +validator.nonTargetSample.positive.length= +validator.nonTargetSample.positive.weight= +validator.nonTargetSample.required.comment.for.species= +validator.nonTargetSample.required.count= +validator.nonTargetSample.required.gender= +validator.nonTargetSample.required.species= +validator.nonTargetSample.required.taille= +validator.nonTargetSample.required.weight.or.taille= +validator.objectObservedSpecies.desactivated.species= +validator.objectObservedSpecies.desactivated.speciesStatus= +validator.objectObservedSpecies.positive.count= +validator.objectObservedSpecies.required.count= +validator.objectObservedSpecies.required.species= +validator.objectObservedSpecies.required.speciesStatus= +validator.organism.desactivated.country= +validator.organism.null.description= +validator.organism.required.country= +validator.person.desactivated.country= +validator.person.required.country= +validator.person.required.firstName= +validator.person.required.lastName= +validator.program.comment.tobig= +validator.program.desactivated.organism= +validator.program.required.endDate= +validator.program.required.gearType= +validator.program.required.organism= +validator.program.required.startDate= +validator.referentiel.invalid.code.uniqueKey= +validator.referentiel.invalid.uri.uniqueKey= +validator.referentiel.null.uri= +validator.referentiel.required.brandName= +validator.referentiel.required.label1= +validator.referentiel.required.label2= +validator.referentiel.required.label3= +validator.referentiel.status.desactivated= +validator.referentiel.status.required= +validator.referentiel.untranslated.label1= +validator.referentiel.untranslated.label3= +validator.route.activityFinDeVeille.notAvailable= +validator.route.comment.tobig= +validator.route.duplicated.date= +validator.route.invalid.date= +validator.route.invalid.endLogValue.maximum= +validator.route.invalid.endLogValue.minimum= +validator.route.invalid.quadrant= +validator.route.invalid.seaSurfaceTemperature= +validator.route.invalid.speed= +validator.route.invalid.startLogValue= +validator.route.invalid.time= +validator.route.missing.activityFinDeVeille= +validator.route.null.comment= +validator.route.positive.startLogValue= +validator.route.required.date= +validator.schoolEstimate.bound.weight= +validator.schoolEstimate.comment.tobig= +validator.schoolEstimate.desactivated.species= +validator.schoolEstimate.required.comment.for.species= +validator.schoolEstimate.required.species= +validator.schoolEstimate.required.weight= +validator.schoolEstimate.species.uniqueKey= +validator.section.required.settingIdentifier= +validator.sensorUsed.desactivated.sensorBrand= +validator.sensorUsed.desactivated.sensorDataFormat= +validator.sensorUsed.desactivated.sensorType= +validator.sensorUsed.null.sensorSerialNo= +validator.sensorUsed.required.sensorType= +validator.set.bound.currentDirection= +validator.set.bound.currentSpeed= +validator.set.bound.delay= +validator.set.bound.maxGearDepth= +validator.set.bound.schoolMeanDepth= +validator.set.bound.schoolThickness= +validator.set.bound.schoolTopDepth= +validator.set.comment.tobig= +validator.set.delay.too.long= +validator.set.desactivated.reasonForNullSet= +validator.set.endDate.after.endPursingDate= +validator.set.endPursingDate.after.date= +validator.set.endPursingTimeStamp.after.startTime= +validator.set.endSetTimeStamp.after.endPursingTimeStamp= +validator.set.null.currentDirection= +validator.set.required.comment.for.reasonForNullSet= +validator.set.size.supportVesselName= +validator.set.startTime.after.time= +validator.setLongline.bad.baitsCompositionProportionSum= +validator.setLongline.bad.branchlinesCompositionProportionSum= +validator.setLongline.bad.floatlinesCompositionProportionSum= +validator.setLongline.bad.hooksCompositionProportionSum= +validator.setLongline.baitsComposition.uniqueKey= +validator.setLongline.bound.basketsPerSectionCount= +validator.setLongline.bound.branchlinesPerBasketCount= +validator.setLongline.bound.haulingEndLatitude= +validator.setLongline.bound.haulingEndLongitude= +validator.setLongline.bound.haulingStartLatitude= +validator.setLongline.bound.haulingStartLongitude= +validator.setLongline.bound.lightsticksPerBasketCount= +validator.setLongline.bound.settingEndLatitude= +validator.setLongline.bound.settingEndLongitude= +validator.setLongline.bound.settingStartLatitude= +validator.setLongline.bound.settingStartLongitude= +validator.setLongline.bound.settingVesselSpeed= +validator.setLongline.bound.shooterSpeed= +validator.setLongline.bound.snapWeight= +validator.setLongline.bound.swivelWeight= +validator.setLongline.bound.timeBetweenHooks= +validator.setLongline.bound.totalBasketsCount= +validator.setLongline.bound.totalHooksCount= +validator.setLongline.bound.totalSectionsCount= +validator.setLongline.branchlinesComposition.uniqueKey= +validator.setLongline.desactivated.lightsticksColor= +validator.setLongline.desactivated.lightsticksType= +validator.setLongline.desactivated.lineType= +validator.setLongline.desactivated.settingShape= +validator.setLongline.duplicated.homeId= +validator.setLongline.duplicated.number= +validator.setLongline.floatlinesComposition.uniqueKey= +validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp= +validator.setLongline.hooksComposition.uniqueKey= +validator.setLongline.null.homeId= +validator.setLongline.required.basketsPerSectionCount= +validator.setLongline.required.branchlinesPerBasketCount= +validator.setLongline.required.haulingBreaks= +validator.setLongline.required.haulingDirectionSameAsSetting= +validator.setLongline.required.haulingEndLatitude= +validator.setLongline.required.haulingEndLongitude= +validator.setLongline.required.haulingEndTimeStamp= +validator.setLongline.required.haulingStartLatitude= +validator.setLongline.required.haulingStartLongitude= +validator.setLongline.required.haulingStartTimeStamp= +validator.setLongline.required.settingEndLatitude= +validator.setLongline.required.settingEndLongitude= +validator.setLongline.required.settingEndTimeStamp= +validator.setLongline.required.settingStartLatitude= +validator.setLongline.required.settingStartLongitude= +validator.setLongline.required.settingStartTimeStamp= +validator.setLongline.required.totalSectionsCount= +validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp= +validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp= +validator.species.desactivated.speciesGroup= +validator.species.invalid.faoCode.uniqueKey= +validator.species.invalid.homeId.uniqueKey= +validator.species.invalid.scientificLabel.uniqueKey= +validator.species.invalid.wormsId= +validator.species.invalid.wormsId.uniqueKey= +validator.species.null.faoCode= +validator.species.null.homeId= +validator.species.required.ocean= +validator.species.required.scientificLabel= +validator.species.required.speciesGroup= +validator.speciesList.null.code= +validator.targetCatch.bound.weight= +validator.targetCatch.comment.tobig= +validator.targetCatch.desactivated.species= +validator.targetCatch.desactivated.weightCategory= +validator.targetCatch.required.species= +validator.targetCatch.required.weight= +validator.targetCatch.required.weightCategory= +validator.targetCatch.required.well= +validator.targetCatch.uniqueKey= +validator.targetDiscarded.bound.weight= +validator.targetDiscarded.comment.tobig= +validator.targetDiscarded.desactivated.reasonForDiscard= +validator.targetDiscarded.desactivated.species= +validator.targetDiscarded.desactivated.weightCategory= +validator.targetDiscarded.required.comment.for.reasonForDiscard= +validator.targetDiscarded.required.reasonForDiscard= +validator.targetDiscarded.required.species= +validator.targetDiscarded.required.weight= +validator.targetDiscarded.required.weightCategory= +validator.targetDiscarded.uniqueKey= +validator.targetLength.bound.length= +validator.targetLength.bound.weight= +validator.targetLength.desactivated.species= +validator.targetLength.positive.length= +validator.targetLength.positive.weight= +validator.targetLength.required.count= +validator.targetLength.required.species= +validator.targetLength.required.taille= +validator.targetLength.required.weight.or.taille= +validator.targetSample.comment.tobig= +validator.targetSample.required.comment.for.species= +validator.tdr.deployementStart.before.fishingStart= +validator.tdr.desactivated.itemHorizontalPosition= +validator.tdr.desactivated.itemVerticalPosition= +validator.tdr.desactivated.sensorBrand= +validator.tdr.fishingEnd.before.deployementEnd= +validator.tdr.fishingStart.before.fishingEnd= +validator.tdr.required.position= +validator.transmittingBuoy.desactivated.country= +validator.transmittingBuoy.desactivated.transmittingBuoyOperation= +validator.transmittingBuoy.desactivated.transmittingBuoyType= +validator.transmittingBuoy.null.code= +validator.transmittingBuoy.required.transmittingBuoyOperation= +validator.transmittingBuoy.required.transmittingBuoyType= +validator.trip.comment.tobig= +validator.trip.desactivated.captain= +validator.trip.desactivated.dataEntryOperator= +validator.trip.desactivated.departureHarbour= +validator.trip.desactivated.landingHarbour= +validator.trip.desactivated.observer= +validator.trip.desactivated.ocean= +validator.trip.desactivated.tripType= +validator.trip.desactivated.vessel= +validator.trip.endDate.after.startDate= +validator.trip.invalid.date= +validator.trip.invalid.endDate= +validator.trip.invalid.formsUrl= +validator.trip.invalid.loch= +validator.trip.invalid.reportsUrl= +validator.trip.invalid.startDate= +validator.trip.null.captain= +validator.trip.null.dataEntryOperator= +validator.trip.null.departureHarbour= +validator.trip.null.gearUseFeature= +validator.trip.null.landingHarbour= +validator.trip.required.comment.for.captain= +validator.trip.required.comment.for.dataEntryOperator= +validator.trip.required.comment.for.departureHarbour= +validator.trip.required.comment.for.landingHarbour= +validator.trip.required.comment.for.observer= +validator.trip.required.comment.for.ocean= +validator.trip.required.comment.for.tripType= +validator.trip.required.comment.for.vessel= +validator.trip.required.departureHarbour= +validator.trip.required.endDate= +validator.trip.required.observer= +validator.trip.required.ocean= +validator.trip.required.startDate= +validator.trip.required.tripType= +validator.trip.required.vessel= +validator.vessel.desactivated.flagCountry= +validator.vessel.desactivated.vesselSizeCategory= +validator.vessel.desactivated.vesselType= +validator.vessel.invalid.capacity= +validator.vessel.invalid.fleetCountry= +validator.vessel.invalid.keelCode= +validator.vessel.invalid.length= +validator.vessel.invalid.power= +validator.vessel.invalid.searchMaximum= +validator.vessel.invalid.yearService= +validator.vessel.null.changeDate= +validator.vessel.required.flagCountry= +validator.vessel.required.vesselSizeCategory= +validator.vessel.required.vesselType= +validator.vesselSizeCategory.required.capacityLabel= +validator.vesselSizeCategory.required.gaugeLabel= +validator.weightCategory.desactivated.species= +validator.weightCategory.required.species= +validator.wind.required.speedRange= +validator.wind.required.waveHeight= diff --git a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties new file mode 100644 index 0000000..8a6c465 --- /dev/null +++ b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties @@ -0,0 +1,425 @@ +validator.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. +validator.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. +validator.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. +validator.activity.bound.vesselSpeed=La Velocidad del viento estar comprendida entre %1$s y %2$s. +validator.activity.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.activity.desactivated.currentFpaZone= +validator.activity.desactivated.detectionMode=El mode de detección seleccionado está desactivado. +validator.activity.desactivated.nextFpaZone= +validator.activity.desactivated.observedSystem=Al menos uno de los sistemas observados seleccioinado está desacticado. +validator.activity.desactivated.previousFpaZone= +validator.activity.desactivated.reasonForNoFishing=La razón de no lance seleccionada está desactivada. +validator.activity.desactivated.surroundingActivity=Actividad circundante seleccionada está desactivada. +validator.activity.desactivated.vesselActivity=Actividad del barco seleccionado está desactivada. +validator.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada. +validator.activity.duplicated.time=Ya existe una actividad a esa hora. +validator.activity.invalid.quadrant=El cuadrante no es coherente con el informe del océano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4) +validator.activity.invalid.seaSurfaceTemperature=La temperatura superficial (%1$s) no puede variar mas de 12° con respecto a la temperatura superficial (%2$s) de la actividad anterio %3$s. +validator.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos. +validator.activity.null.dcp=No se ha introducido objeto flotante. +validator.activity.null.fpaZone= +validator.activity.null.observedSystem=No hay sistema observado seleccionado. +validator.activity.null.observedSystemDistance=No se ha especificado la distancia al sistema observado. +validator.activity.null.seaSurfaceTemperature=No se ha introducido temperatur superficial. +validator.activity.null.surroundingActivity=No hay actividad circundante seleccionada. +validator.activity.null.wind=No se ha seleccionado fuerza del viento. +validator.activity.required.comment.for.currentFpaZone= +validator.activity.required.comment.for.detectionMode=Es necesario un comentario para el modo de detección. +validator.activity.required.comment.for.fpaZone= +validator.activity.required.comment.for.nextFpaZone= +validator.activity.required.comment.for.observedSystem=Es necesario un comentario para uno de los sistemas observados seleccionados. +validator.activity.required.comment.for.previousFpaZone= +validator.activity.required.comment.for.reasonForNoFishing=Es necesario un comentario para la causa de no lance. +validator.activity.required.comment.for.vesselActivity=Es necesario un comentario para la actividad del barco. +validator.activity.required.date= +validator.activity.required.latitude=La latitud debe ser introducida +validator.activity.required.longitude=La longitud debe ser introducida +validator.activity.required.quadrant=Se debe seleccioinar el cuadrante. +validator.activity.required.time=Es necesaria la hora de la observación para la actividad. +validator.activity.required.vesselActivity=Se debe seleccionar la actividad del barco. +validator.activityLongline.desactivated.fpaZone= +validator.baitsComposition.bound.individualSize= +validator.baitsComposition.bound.individualWeight= +validator.baitsComposition.bound.proportion= +validator.baitsComposition.desactivated.baitSettingStatus= +validator.baitsComposition.desactivated.baitType= +validator.baitsComposition.required.baitSettingStatus= +validator.baitsComposition.required.baitType= +validator.baitsComposition.required.proportion= +validator.basket.bound.floatline1Length= +validator.basket.bound.floatline2Length= +validator.basket.required.settingIdentifier= +validator.branchline.bound.branchlineLength= +validator.branchline.bound.tracelineLength= +validator.branchline.desactivated.baitHaulingStatus= +validator.branchline.desactivated.baitSettingStatus= +validator.branchline.desactivated.baitType= +validator.branchline.desactivated.hookSize= +validator.branchline.desactivated.hookType= +validator.branchline.desactivated.topType= +validator.branchline.desactivated.tracelineType= +validator.branchline.required.settingIdentifier= +validator.branchline.required.topType= +validator.branchline.required.tracelineType= +validator.branchlinesComposition.bound.length= +validator.branchlinesComposition.bound.proportion= +validator.branchlinesComposition.desactivated.topType= +validator.branchlinesComposition.desactivated.tracelineType= +validator.branchlinesComposition.required.length= +validator.branchlinesComposition.required.proportion= +validator.branchlinesComposition.required.topType= +validator.branchlinesComposition.required.tracelineType= +validator.catchLongline.bound.gonadeWeight= +validator.catchLongline.comment.tobig= +validator.catchLongline.desactivated.catchFateLongline= +validator.catchLongline.desactivated.catchHealthness= +validator.catchLongline.desactivated.discardHealthness= +validator.catchLongline.desactivated.hookPosition= +validator.catchLongline.desactivated.maturityStatus= +validator.catchLongline.desactivated.sex= +validator.catchLongline.desactivated.speciesCatch= +validator.catchLongline.desactivated.stomacFullness= +validator.catchLongline.required.comment.for.speciesCatch= +validator.catchLongline.required.count.when.acquisitionModeIsGrouped= +validator.catchLongline.required.position= +validator.catchLongline.required.speciesCatch= +validator.country.invalid.iso2Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.country.invalid.iso3Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.country.required.iso2Code=Código ISO2 no especificado +validator.country.required.iso3Code=Código ISO3 no especificado. +validator.encounter.desactivated.encounterType= +validator.encounter.desactivated.species= +validator.encounter.required.count= +validator.encounter.required.distance= +validator.encounter.required.encounterType= +validator.encounter.required.species= +validator.floatingObject.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.floatingObject.desactivated.objectFate=El devenir seleccionado está desactivada. +validator.floatingObject.desactivated.objectOperation=Al menos una de las operaciones seleccionadas está desactivada. +validator.floatingObject.desactivated.type=El tipo de objeto seleccionado está desactivada. +validator.floatingObject.null.daysAtSeaCount=Número de días en el mar no especificado. +validator.floatingObject.positive.daysAtSeaCount=El número de días en el mar es un entero positivo. +validator.floatingObject.required.comment.for.balise1=Se requiere un comentario para la primera baliza (étant donné son type). +validator.floatingObject.required.comment.for.balise2=Se requiere un comentario para la segunda baliza (étant donné son type). +validator.floatingObject.required.comment.for.objectFate=Se requiere un comentario para el devenir. +validator.floatingObject.required.comment.for.type=Se requiere un comentario para el tipo de objeto +validator.floatingObject.required.objectFate=Es recomiendo selecciona un devenir. +validator.floatingObject.required.objectOperation=Es obligatorio selecciona un operación. +validator.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. +validator.floatingObject.size.supportVesselName=El count introducido debe tener una longitud inferior a %1$s carácteres. +validator.floatlinesComposition.bound.length= +validator.floatlinesComposition.bound.proportion= +validator.floatlinesComposition.desactivated.lineType= +validator.floatlinesComposition.required.length= +validator.floatlinesComposition.required.lineType= +validator.floatlinesComposition.required.proportion= +validator.gearCaracteristic.desactivated.gearCaracteristicType= +validator.gearCaracteristic.required.gearCaracteristicType= +validator.gearUseFeature.desactivated.gear= +validator.gearUseFeature.required.gear= +validator.gearUseFeature.required.number= +validator.harbour.desactivated.country= +validator.harbour.null.latitude= +validator.harbour.null.locode= +validator.harbour.null.longitude= +validator.harbour.required.country= +validator.harbour.required.name= +validator.hooksComposition.bound.hookOffset= +validator.hooksComposition.bound.proportion= +validator.hooksComposition.desactivated.hookSize= +validator.hooksComposition.desactivated.hookType= +validator.hooksComposition.required.hookSize= +validator.hooksComposition.required.hookType= +validator.hooksComposition.required.proportion= +validator.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no coherente. +validator.lengthWeightParameter.invalid.uniqueKey=Tupla (sexo/océano/especie) debe ser única, la tupla ya se ha usado. +validator.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no coherente. +validator.lengthWeightParameter.null.ocean=No se ha seleccionado océano. +validator.lengthWeightParameter.required.coefficients=Coeficientes no se han especificados. +validator.lengthWeightParameter.required.endDate=Fecha de fin de validez no especificada. +validator.lengthWeightParameter.required.lengthWeightFormula=Relación de peso no especificado. +validator.lengthWeightParameter.required.species=Especie no especificada. +validator.lengthWeightParameter.required.startDate=fecha de comienzo de validez no especificada. +validator.lengthWeightParameter.required.weightLengthFormula=Relación de talla no especificado. +validator.nonTargetCatch.bound.catchWeight=El peso medio estimado debe estar comprendido entre %1$s y %2$s. +validator.nonTargetCatch.bound.meanLength=La talla media para esta especie debe estár comprendida entre %1$s y %2$s. +validator.nonTargetCatch.bound.meanWeight=El peso medio para esta especie estar comprendido entre %1$s y %2$s. +validator.nonTargetCatch.bound.totalCount=El número estimado debe estar comprendido entre %1$s y %2$s. +validator.nonTargetCatch.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.nonTargetCatch.desactivated.reasonForDiscard=La razón de descarte seleccionada está desactivada. +validator.nonTargetCatch.desactivated.species=La especie seleccionada está desactivada. +validator.nonTargetCatch.desactivated.speciesFate=El objectFate de fauna seleccionado está desactivado. +validator.nonTargetCatch.positive.meanLength=La talla media tiene que ser un entero positivo. +validator.nonTargetCatch.positive.meanWeight=El peso medio debe ser un entero positivo. +validator.nonTargetCatch.required.comment.for.reasonForDiscard=Es necesario un comentario para la razón de descarte seleccionada. +validator.nonTargetCatch.required.comment.for.speciesFate=Es necesario un comentario para el objectFate de la fauna seleccionada. +validator.nonTargetCatch.required.species=Es obligatorio seleccionar una especie de fauna. +validator.nonTargetCatch.required.speciesFate=Es obligatoiro seleccionar un objectFate de fauna. +validator.nonTargetCatch.required.weightOrNombreEstime=Debe seleccionar uno de los dos valores (peso estimado, número estimado). +validator.nonTargetCatch.required.weightOrTailleMoyen=Debe seleccionar uno de los dos valores (peso medio o talla media). +validator.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe ser única. +validator.nonTargetSample.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. +validator.nonTargetSample.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.nonTargetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.nonTargetSample.desactivated.species=La especie seleccionada está desactivada. +validator.nonTargetSample.positive.length=La talla debe ser un entero positivo. +validator.nonTargetSample.positive.weight=El peso debe ser un entero positivo. +validator.nonTargetSample.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s del muestreo. +validator.nonTargetSample.required.count=Es obligatoria especificar el número de grupo de talla. +validator.nonTargetSample.required.gender=Es obligatoria seleccionar un sexo para la especie de fauna. +validator.nonTargetSample.required.species=Es obligatorio seleccionar una especie de fauna. +validator.nonTargetSample.required.taille=Es obligatoria especificar el talla. +validator.nonTargetSample.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. +validator.objectObservedSpecies.desactivated.species=La especie seleccionada está desactivada. +validator.objectObservedSpecies.desactivated.speciesStatus=El estado seleccionado está desactivado. +validator.objectObservedSpecies.positive.count=El número es entero positivo. +validator.objectObservedSpecies.required.count=El número es obligatorio. +validator.objectObservedSpecies.required.species=Es obligatorio seleccionar una especie de fauna. +validator.objectObservedSpecies.required.speciesStatus=Es obligatorio seleccionar un estado de especie. +validator.organism.desactivated.country=El país está desactivado. +validator.organism.null.description=La descripción no se ha especificado. +validator.organism.required.country=No se ha seleccionado país. +validator.person.desactivated.country= +validator.person.required.country= +validator.person.required.firstName=El count del observado es obligatorio. +validator.person.required.lastName=El apellido del observador es obligatorio. +validator.program.comment.tobig=La longitud del campo de comentarios está limitado a 1024 carácteres. +validator.program.desactivated.organism=El organismo seleccionado está desactivado. +validator.program.required.endDate=Fecha de fin de programa no especificada. +validator.program.required.gearType= +validator.program.required.organism=Ningún organismo seleccionado. +validator.program.required.startDate=Fecha de comienzo de programa no especificada. +validator.referentiel.invalid.code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.referentiel.invalid.uri.uniqueKey=El uri debe ser único, el valor %1$s ya se ha usado. +validator.referentiel.null.uri=Ningún uri especificado. +validator.referentiel.required.brandName= +validator.referentiel.required.label1=Ninguna etiqueta en inglé establecida. +validator.referentiel.required.label2=Ninguna etiqueta en francés establecida. +validator.referentiel.required.label3=Ninguna etiqueta en espaÑol establecida. +validator.referentiel.status.desactivated=El objeto está desactivado (no se puede usar en los datos de los observadores o en los nuevos referenciales). +validator.referentiel.status.required= +validator.referentiel.untranslated.label1=La etiqueta en inglés no se ha traducido. +validator.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido. +validator.route.activityFinDeVeille.notAvailable=Existe una actividad de fin de guardia en la ruta. +validator.route.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres. +validator.route.duplicated.date=Ya existe otra ruta en esa fecha. +validator.route.invalid.date=El día de observación debe ser superior o igual a la fecha de comienzo de marea (%1$s). +validator.route.invalid.endLogValue.maximum=La corredera de tarde no puede ser superior en %1$s a la de mañana. +validator.route.invalid.endLogValue.minimum=la corredera de tarde debe ser superior a la de mañana. +validator.route.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4) +validator.route.invalid.seaSurfaceTemperature=La temperatura superficial no puede variar más de 12° entre 2 actividades (actividad %1$s incorrecta). +validator.route.invalid.speed=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). +validator.route.invalid.startLogValue=La corredera de mañana (%1$s) debe ser superior a la de tarde (%2$s) de la routa %3$s. +validator.route.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta). +validator.route.missing.activityFinDeVeille=No hay actividad de fin de guardia definido en la ruta. +validator.route.null.comment=No hay comentario especificado. +validator.route.positive.startLogValue=La corredera de mañana debe ser un entero positivo. +validator.route.required.date=Se debe especificar el día de observación. +validator.route.unclosed.activity=Existe una actividad no cerrada (%1$s). +validator.schoolEstimate.bound.weight=El tonelaje debe estar comprendido entre %1$s y %2$s. +validator.schoolEstimate.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.schoolEstimate.desactivated.species=La especie seleccionada está desactivada. +validator.schoolEstimate.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s de la estimación. +validator.schoolEstimate.required.species=Es obligatorio seleccionar una especie de atún. +validator.schoolEstimate.required.weight=Especificar un peso. +validator.schoolEstimate.species.uniqueKey=Las estimaciones de la especie debe ser única. +validator.section.required.settingIdentifier= +validator.sensorUsed.desactivated.sensorBrand= +validator.sensorUsed.desactivated.sensorDataFormat= +validator.sensorUsed.desactivated.sensorType= +validator.sensorUsed.null.sensorSerialNo= +validator.sensorUsed.required.sensorType= +validator.set.bound.currentDirection=La dirección de la corriente debe ser un número comprendido entre %1$s y %2$s. +validator.set.bound.currentSpeed=La velocidad de la corriente debe ser un número comprendido entre %1$s y %2$s +validator.set.bound.delay=La duración entre la hora final del lance y la de final de recogida de la jareta debe ser al menos de %1$s minutos. +validator.set.bound.maxGearDepth=La profundidas debe estar comprendida entre %1$s y %2$s. +validator.set.bound.schoolMeanDepth=La profundidad media debe ser un entero comprendido entre %1$s y %2$s +validator.set.bound.schoolThickness=El espesor del banco debe ser un entero comprendido entre %1$s y %2$s +validator.set.bound.schoolTopDepth=La profundidad superior debe ser un entero comprendido entre %1$s y %2$s. +validator.set.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.set.delay.too.long=La duración del lance es elevada (máximo %1$s minutos). +validator.set.desactivated.reasonForNullSet=La causa del lanze nulo seleccionada está desactivada. +validator.set.endDate.after.endPursingDate=El día de fin debe ser superior o igual a la dia de final de recogida de la jareta. +validator.set.endPursingDate.after.date=El día de final de recogida de la jareta debe ser superior o igual a la día de observación. +validator.set.endPursingTimeStamp.after.startTime=La hora final de recogida de la jareta debe ser superior o igual a la hora de comienzo. +validator.set.endSetTimeStamp.after.endPursingTimeStamp=La hora de fin debe ser superior o igual a la hora de fin de recogida de la jareta. +validator.set.null.currentDirection=Dirección de la corriente no introducida. +validator.set.required.comment.for.reasonForNullSet=Es necesario un comentario para la causa de lance nulo seleccionado. +validator.set.size.supportVesselName=El count del supply debe tener una longitud inferior a %1$s caracteres. +validator.set.startTime.after.time=La hora de comienzo debe ser superior o igual a la hora de observación. +validator.setLongline.bad.baitsCompositionProportionSum= +validator.setLongline.bad.branchlinesCompositionProportionSum= +validator.setLongline.bad.floatlinesCompositionProportionSum= +validator.setLongline.bad.hooksCompositionProportionSum= +validator.setLongline.baitsComposition.uniqueKey= +validator.setLongline.bound.basketsPerSectionCount= +validator.setLongline.bound.branchlinesPerBasketCount= +validator.setLongline.bound.haulingEndLatitude= +validator.setLongline.bound.haulingEndLongitude= +validator.setLongline.bound.haulingStartLatitude= +validator.setLongline.bound.haulingStartLongitude= +validator.setLongline.bound.lightsticksPerBasketCount= +validator.setLongline.bound.settingEndLatitude= +validator.setLongline.bound.settingEndLongitude= +validator.setLongline.bound.settingStartLatitude= +validator.setLongline.bound.settingStartLongitude= +validator.setLongline.bound.settingVesselSpeed= +validator.setLongline.bound.shooterSpeed= +validator.setLongline.bound.snapWeight= +validator.setLongline.bound.swivelWeight= +validator.setLongline.bound.timeBetweenHooks= +validator.setLongline.bound.totalBasketsCount= +validator.setLongline.bound.totalHooksCount= +validator.setLongline.bound.totalSectionsCount= +validator.setLongline.branchlinesComposition.uniqueKey= +validator.setLongline.desactivated.lightsticksColor= +validator.setLongline.desactivated.lightsticksType= +validator.setLongline.desactivated.lineType= +validator.setLongline.desactivated.settingShape= +validator.setLongline.duplicated.homeId= +validator.setLongline.duplicated.number= +validator.setLongline.floatlinesComposition.uniqueKey= +validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp= +validator.setLongline.hooksComposition.uniqueKey= +validator.setLongline.invalid.haulingEndQuadrant= +validator.setLongline.invalid.haulingStartQuadrant= +validator.setLongline.invalid.settingEndQuadrant= +validator.setLongline.invalid.settingStartQuadrant= +validator.setLongline.null.homeId= +validator.setLongline.required.basketsPerSectionCount= +validator.setLongline.required.branchlinesPerBasketCount= +validator.setLongline.required.haulingBreaks= +validator.setLongline.required.haulingDirectionSameAsSetting= +validator.setLongline.required.haulingEndLatitude= +validator.setLongline.required.haulingEndLongitude= +validator.setLongline.required.haulingEndQuadrant= +validator.setLongline.required.haulingEndTimeStamp= +validator.setLongline.required.haulingStartLatitude= +validator.setLongline.required.haulingStartLongitude= +validator.setLongline.required.haulingStartQuadrant= +validator.setLongline.required.haulingStartTimeStamp= +validator.setLongline.required.settingEndLatitude= +validator.setLongline.required.settingEndLongitude= +validator.setLongline.required.settingEndQuadrant= +validator.setLongline.required.settingEndTimeStamp= +validator.setLongline.required.settingStartLatitude= +validator.setLongline.required.settingStartLongitude= +validator.setLongline.required.settingStartQuadrant= +validator.setLongline.required.settingStartTimeStamp= +validator.setLongline.required.totalSectionsCount= +validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp= +validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp= +validator.species.desactivated.speciesGroup=El grupo de especies seleccionado está desactivado. +validator.species.invalid.faoCode.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.species.invalid.homeId.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.species.invalid.scientificLabel.uniqueKey=El count científico debe ser único, el valor %1$s ya ha sido utilizado. +validator.species.invalid.wormsId=Código worms no válido. +validator.species.invalid.wormsId.uniqueKey=El wormsId debe ser único, el valor %1$s ya se ha usado. +validator.species.null.faoCode=Código FAO no introducido. +validator.species.null.homeId=Código 3L no válido. +validator.species.required.ocean= +validator.species.required.scientificLabel=La etiqueta Scientifique no se ha establecido (introduzca xx si no la conoce). +validator.species.required.speciesGroup=No se ha introducido ningún grupo de especie de fauna. +validator.speciesList.null.code=Código no introducido. +validator.targetCatch.bound.weight=El tonelaje debe estar comprendido entre %1$s y %2$s +validator.targetCatch.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.targetCatch.desactivated.species=La especie seleccionada está desactivada. +validator.targetCatch.desactivated.weightCategory=La categoría de peso seleccionada está desactivada +validator.targetCatch.required.species=Debe seleccionar una especie de atún. +validator.targetCatch.required.weight=No se ha introducido el peso. +validator.targetCatch.required.weightCategory=Se debe seleccionar una categoría de peso. +validator.targetCatch.required.well=No se ha introducido la cuba. +validator.targetCatch.uniqueKey=El par (categoría de peso - cuba) debe ser única. +validator.targetDiscarded.bound.weight=El tonelaje dado está comprendido entre %1$s y %2$s. +validator.targetDiscarded.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres. +validator.targetDiscarded.desactivated.reasonForDiscard=La causa del descarte seleccionada está desactivada. +validator.targetDiscarded.desactivated.species=La especie seleccionada está desactivada. +validator.targetDiscarded.desactivated.weightCategory=La categoría de peso seleccionada está desactivada. +validator.targetDiscarded.required.comment.for.reasonForDiscard=Se requiere un comentario para la causa de descarte. +validator.targetDiscarded.required.reasonForDiscard=Es obligatoria seleccionar una causa del descarte. +validator.targetDiscarded.required.species=Es obligatorio seleccionar una especie de atún. +validator.targetDiscarded.required.weight=El peso es obligatorio. +validator.targetDiscarded.required.weightCategory=Es obligatorio seleccionar una categoría de peso. +validator.targetDiscarded.uniqueKey=El par (categoria - causa del descarte) debe ser única. +validator.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. +validator.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.targetLength.desactivated.species=La especie seleccionada está desactivada. +validator.targetLength.positive.length=La talla debe ser un entero positivo. +validator.targetLength.positive.weight=El peso debe ser un entero positivo. +validator.targetLength.required.count=Es obligatoria especificar el número de grupo de talla. +validator.targetLength.required.species=Es obligatoria seleccionar una especie de atún. +validator.targetLength.required.taille=Es obligatoria especificar el talla. +validator.targetLength.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. +validator.targetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.targetSample.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s del muestreo. +validator.tdr.deployementStart.before.fishingStart= +validator.tdr.desactivated.itemHorizontalPosition= +validator.tdr.desactivated.itemVerticalPosition= +validator.tdr.desactivated.sensorBrand= +validator.tdr.fishingEnd.before.deployementEnd= +validator.tdr.fishingStart.before.fishingEnd= +validator.tdr.required.position= +validator.transmittingBuoy.desactivated.country= +validator.transmittingBuoy.desactivated.transmittingBuoyOperation= +validator.transmittingBuoy.desactivated.transmittingBuoyType= +validator.transmittingBuoy.null.code=El código de baliza no ha sido especificado. +validator.transmittingBuoy.required.transmittingBuoyOperation= +validator.transmittingBuoy.required.transmittingBuoyType= +validator.trip.comment.tobig=La longitud del campo de comentarios está limitado a 1024 carácteres. +validator.trip.desactivated.captain= +validator.trip.desactivated.dataEntryOperator= +validator.trip.desactivated.departureHarbour= +validator.trip.desactivated.landingHarbour= +validator.trip.desactivated.observer= +validator.trip.desactivated.ocean=El oceano seleccionado está desactivado. +validator.trip.desactivated.tripType= +validator.trip.desactivated.vessel=El barco seleccionado está desactivado. +validator.trip.endDate.after.startDate=La fecha de fin de marea debe ser supuerio a la fecha de comienzo. +validator.trip.invalid.date=El día de observación debe ser superior al de una ruta anterior ( la ruta %1$s es incorrecta) +validator.trip.invalid.endDate=La fecha de fin de marea debe ser superior al dia de observación de cada ruta (la ruta %1$s es incorrecta). +validator.trip.invalid.formsUrl=La URL del formulario no es válido. +validator.trip.invalid.loch=La corredera de mañana (%1$s) de la ruta %2$s debe ser superior a la de tarde (%3$s) de la ruta anterior. +validator.trip.invalid.reportsUrl=La URL del informe no es válida. +validator.trip.invalid.startDate=La fecha de comienzo de marea debe ser inferior al día de observación de cualquier ruta (la ruta %1$s es incorrecta). +validator.trip.null.captain= +validator.trip.null.dataEntryOperator= +validator.trip.null.departureHarbour= +validator.trip.null.gearUseFeature= +validator.trip.null.landingHarbour= +validator.trip.required.comment.for.captain= +validator.trip.required.comment.for.dataEntryOperator= +validator.trip.required.comment.for.departureHarbour= +validator.trip.required.comment.for.landingHarbour= +validator.trip.required.comment.for.observer= +validator.trip.required.comment.for.ocean= +validator.trip.required.comment.for.tripType= +validator.trip.required.comment.for.vessel= +validator.trip.required.departureHarbour= +validator.trip.required.endDate=La fecha de fin de marea es obligatoria. +validator.trip.required.observer= +validator.trip.required.ocean=No se ha seleccionado océano. +validator.trip.required.startDate=La fecha de comienzo de marea es obligatoria. +validator.trip.required.tripType= +validator.trip.required.vessel=Es obligatorio seleccionar un barco. +validator.tripLongline.unclosed.activity= +validator.tripSeine.unclosed.route= +validator.vessel.desactivated.flagCountry=la bandera seleccionada está desactivada. +validator.vessel.desactivated.vesselSizeCategory=la capacidad seleccionada está desactivada. +validator.vessel.desactivated.vesselType=La perquería seleccionada está desactivada. +validator.vessel.invalid.capacity=No se ha especificado el año de servicio. +validator.vessel.invalid.fleetCountry=El código de la flota no se ha especificado. +validator.vessel.invalid.keelCode=El código de quilla no se ha especificado. +validator.vessel.invalid.length=Longueur hors tout no se ha especificado. +validator.vessel.invalid.power=Potencia no especificada. +validator.vessel.invalid.searchMaximum=Velocidad máxima no especificada. +validator.vessel.invalid.yearService=No se ha especificado el año de servicio. +validator.vessel.null.changeDate=Fecha de carga no establecida. +validator.vessel.required.flagCountry=No se ha seleccionado la bandera. +validator.vessel.required.vesselSizeCategory=No se ha seleccionado la capacidad. +validator.vessel.required.vesselType=No se ha seleccionado la pesquería. +validator.vesselSizeCategory.required.capacityLabel=La etiqueta «Capacidad» no se ha establecido. +validator.vesselSizeCategory.required.gaugeLabel=La etiqueta «Capacidad00BB no se ha establecido. +validator.weightCategory.desactivated.species=La especie seleccionada está desactivada. +validator.weightCategory.required.species=Ninguna especie seleccionada. +validator.wind.required.speedRange=Etiqueta para la velocidad del viento no especificada. +validator.wind.required.waveHeight=Etiqueta descriptiva para la altura media de las olas no especificada. diff --git a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties new file mode 100644 index 0000000..fcf7938 --- /dev/null +++ b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties @@ -0,0 +1,425 @@ +validator.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. +validator.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. +validator.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. +validator.activity.bound.vesselSpeed=La vitesse navire doit être comprise entre %1$s et %2$s. +validator.activity.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.activity.desactivated.currentFpaZone=La zone courante est désactivée. +validator.activity.desactivated.detectionMode=Le mode de détection sélectionné est désactivé. +validator.activity.desactivated.nextFpaZone=La zone pénétrée est désactivée. +validator.activity.desactivated.observedSystem=Au moins un des systèmes observés sélectionné est désactivé. +validator.activity.desactivated.previousFpaZone=La zone quitée est désactivée. +validator.activity.desactivated.reasonForNoFishing=La raison de non coup de senne sélectionnée est désactivée. +validator.activity.desactivated.surroundingActivity=L'activité environnante sélectionnée est désactivée. +validator.activity.desactivated.vesselActivity=L'activité vessel sélectionnée est désactivée. +validator.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé. +validator.activity.duplicated.time=Il existe déjà une autre activité à cette heure. +validator.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.activity.invalid.seaSurfaceTemperature=La température surface (%1$s) ne peut pas varier de plus de 12° par rapport à la température surface (%2$s) de l'activité précédente %3$s. +validator.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd +validator.activity.null.dcp=Aucun objet flottant saisi. +validator.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire. +validator.activity.null.observedSystem=Aucun système observé sélectionné. +validator.activity.null.observedSystemDistance=La distance au système observé n'est pas renseignée. +validator.activity.null.seaSurfaceTemperature=Aucune température de surface saisie. +validator.activity.null.surroundingActivity=Aucune activité environnante sélectionné. +validator.activity.null.wind=Aucun vent Beaufort sélectionné. +validator.activity.required.comment.for.currentFpaZone=Un commentaire est requis pour la zone courante. +validator.activity.required.comment.for.detectionMode=Un commentaire est requis pour le mode détection. +validator.activity.required.comment.for.fpaZone=Un commentaire est requis pour la zone. +validator.activity.required.comment.for.nextFpaZone=Un commentaire est requis pour la zone pénétrée. +validator.activity.required.comment.for.observedSystem=Un commentaire est requis pour un des systèmes observés sélectionnés. +validator.activity.required.comment.for.previousFpaZone=Un commentaire est requis pour la zone quitée. +validator.activity.required.comment.for.reasonForNoFishing=Un commentaire est requis pour la raison de non coup de senne. +validator.activity.required.comment.for.vesselActivity=Un commentaire est requis pour l'activité navire. +validator.activity.required.date=La date d'observation de l'activité est obligatoire. +validator.activity.required.latitude=La latitude doit être renseignée. +validator.activity.required.longitude=La longitude doit être renseignée. +validator.activity.required.quadrant=Le quadrant doit être sélectionné. +validator.activity.required.time=L'heure d'observation de l'activité est obligatoire. +validator.activity.required.vesselActivity=L'activité du navire est obligatoire. +validator.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. +validator.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s. +validator.baitsComposition.bound.individualWeight=Le poids doit être comprise entre %s et %s. +validator.baitsComposition.bound.proportion=La proportion doit être comprise entre %s et %s. +validator.baitsComposition.desactivated.baitSettingStatus=Le type d'état sélectionné est désactivée. +validator.baitsComposition.desactivated.baitType=Le type d'appât sélectionné est désactivée. +validator.baitsComposition.required.baitSettingStatus=La sélection d'un état est obligatoire. +validator.baitsComposition.required.baitType=La sélection d'un type est obligatoire. +validator.baitsComposition.required.proportion=Proportion non renseignée. +validator.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. +validator.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& +validator.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. +validator.branchline.bound.branchlineLength=La longeur avançon doit être comprise entre %1$s et %2$s. +validator.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s. +validator.branchline.desactivated.baitHaulingStatus=L'état d'appât est désactivé. +validator.branchline.desactivated.baitSettingStatus=L'état d'appât est désactivé. +validator.branchline.desactivated.baitType=Le type d'appât est désactivé. +validator.branchline.desactivated.hookSize=La taille d'hameçon est désactivé. +validator.branchline.desactivated.hookType=Le type d'hameçon est désactivé. +validator.branchline.desactivated.topType=Le type est désactivé. +validator.branchline.desactivated.tracelineType=Le type est désactivé. +validator.branchline.required.settingIdentifier=L'identifiant de filage est obligatoire. +validator.branchline.required.topType=La sélection d'un type de partie supérieure est recommandée +validator.branchline.required.tracelineType=La sélection d'un type de bas de ligne est recommandée +validator.branchlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. +validator.branchlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. +validator.branchlinesComposition.desactivated.topType=Le type de partie supérieure de ligne sélectionné est désactivé +validator.branchlinesComposition.desactivated.tracelineType=Le type de bas de ligne sélectionné est désactivé +validator.branchlinesComposition.required.length=Longueur non renseignée. +validator.branchlinesComposition.required.proportion=Proportion non renseignée. +validator.branchlinesComposition.required.topType=La sélection d'un topType est obligatoire. +validator.branchlinesComposition.required.tracelineType=La sélection d'un type de bas de ligne est obligatoire. +validator.catchLongline.bound.gonadeWeight=Le poids doit être compris entre %1$s et %2$s +validator.catchLongline.comment.tobig=Commentaire trop grand (ne doit pas dépasser 1023 caractères). +validator.catchLongline.desactivated.catchFateLongline=Le devenir sélectionné est désactivé. +validator.catchLongline.desactivated.catchHealthness=L'état à la capture sélectionné est désactivé. +validator.catchLongline.desactivated.discardHealthness=L'état au rejet sélectionné est désactivé. +validator.catchLongline.desactivated.hookPosition=La position de l'hameçon sélectionnée est désactivée. +validator.catchLongline.desactivated.maturityStatus=La maturité sexuelle sélectionnée est désactivée. +validator.catchLongline.desactivated.sex=Le sexe sélectionné est désactivé. +validator.catchLongline.desactivated.speciesCatch=L'espèce sélectionnée est désactivée. +validator.catchLongline.desactivated.stomacFullness=L'état de l'estomac sélectionné est désactivé. +validator.catchLongline.required.comment.for.speciesCatch=Un commentaire est requis pour l'espèce sélectionnée. +validator.catchLongline.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé. +validator.catchLongline.required.position=Pas de position renseignée sur la palangre. +validator.catchLongline.required.speciesCatch=L'espèce n'est pas renseignée. +validator.country.invalid.iso2Code.uniqueKey=Le code ISO2 n'est pas unique +validator.country.invalid.iso3Code.uniqueKey=Le code ISO3 n'est pas unique +validator.country.required.iso2Code=Code ISO2 non renseigné. +validator.country.required.iso3Code=Code ISO3 non renseigné. +validator.encounter.desactivated.encounterType=Le type de rencontre est désactivé. +validator.encounter.desactivated.species=L'espèce sélectionnée est désactivée. +validator.encounter.required.count=Nombre non renseignée. +validator.encounter.required.distance=Distance non renseignée. +validator.encounter.required.encounterType=La sélection d'un type de rencontre est obligatoire. +validator.encounter.required.species=La sélection d'une espèce est obligatoire. +validator.floatingObject.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.floatingObject.desactivated.objectFate=Le devenir objet sélectionné est désactivé. +validator.floatingObject.desactivated.objectOperation=Au moins une des opérations sélectionnée est désactivée. +validator.floatingObject.desactivated.type=Le type d'objet sélectionné est désactivé. +validator.floatingObject.null.daysAtSeaCount=Nombre de jour à l'eau non renseigné. +validator.floatingObject.positive.daysAtSeaCount=Le nombre de jour à l'eau est un entier positif. +validator.floatingObject.required.comment.for.balise1=Un commentaire est requis pour la première balise (étant donné son type). +validator.floatingObject.required.comment.for.balise2=Un commentaire est requis pour la seconde balise (étant donné son type). +validator.floatingObject.required.comment.for.objectFate=Un commentaire est requis pour le devenir objet. +validator.floatingObject.required.comment.for.type=Un commentaire est requis pour le type d'objet. +validator.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. +validator.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. +validator.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. +validator.floatingObject.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. +validator.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. +validator.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. +validator.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. +validator.floatlinesComposition.required.length=Proportion non renseignée. +validator.floatlinesComposition.required.lineType=La sélection d'un type est obligatoire. +validator.floatlinesComposition.required.proportion=Proportion non renseignée. +validator.gearCaracteristic.desactivated.gearCaracteristicType=Le type sélectionnée est désactivée. +validator.gearCaracteristic.required.gearCaracteristicType=Le type sélectionnée est obligatoire. +validator.gearUseFeature.desactivated.gear=L'équipement sélectionné est désactivé. +validator.gearUseFeature.required.gear=L'équipement est obligatoire. +validator.gearUseFeature.required.number=Le nombre est obligatoire. +validator.harbour.desactivated.country=Le pays sélectionné est désactivé. +validator.harbour.null.latitude=La latitude n'est pas renseignée. +validator.harbour.null.locode=Le locode n'est pas renseigné. +validator.harbour.null.longitude=La longitude n'est pas renseignée. +validator.harbour.required.country=La sélection d'un pays est obligatoire. +validator.harbour.required.name=Le nom du port n'est pas renseigné. +validator.hooksComposition.bound.hookOffset=L'offset doit être compris entre %s et %s. +validator.hooksComposition.bound.proportion=La proportion doit être comprise entre %s et %s. +validator.hooksComposition.desactivated.hookSize=La taille d'hameçon sélectionné est désactivée. +validator.hooksComposition.desactivated.hookType=Le type d'hameçon sélectionné est désactivée. +validator.hooksComposition.required.hookSize=La sélection d'une taille d'hameçon est obligatoire. +validator.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. +validator.hooksComposition.required.proportion=Proportion non renseignée. +validator.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. +validator.lengthWeightParameter.invalid.uniqueKey=Le tuple (gender/ocean/species/startDate) doit être unique, le tuple est déjà utilisé. +validator.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente. +validator.lengthWeightParameter.null.ocean=Aucun océan sélectionné. +validator.lengthWeightParameter.required.coefficients=Les coefficients ne sont pas renseignés. +validator.lengthWeightParameter.required.endDate=Date de fin de validité non renseignée. +validator.lengthWeightParameter.required.lengthWeightFormula=La relation poids n'est pas renseignée. +validator.lengthWeightParameter.required.species=L'espèce n'est pas renseignée. +validator.lengthWeightParameter.required.startDate=date de début de validité non renseignée. +validator.lengthWeightParameter.required.weightLengthFormula=La relation taille n'est pas renseignée. +validator.nonTargetCatch.bound.catchWeight=Le poids estimé doit être compris entre %1$s et %2$s. +validator.nonTargetCatch.bound.meanLength=La taille moyenne pour cette espèce doit être comprise entre %1$s et %2$s. +validator.nonTargetCatch.bound.meanWeight=Le poids moyen pour cette espèce doit être compris entre %1$s et %2$s. +validator.nonTargetCatch.bound.totalCount=Le nombre estimé doit être compris entre %1$s et %2$s. +validator.nonTargetCatch.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.nonTargetCatch.desactivated.reasonForDiscard=La raison rejet sélectionnée est désactivée. +validator.nonTargetCatch.desactivated.species=L'espèce sélectionnée est désactivée. +validator.nonTargetCatch.desactivated.speciesFate=Le devenir faune sélectionné est désactivé. +validator.nonTargetCatch.positive.meanLength=La taille moyenne est un entier strictement positif. +validator.nonTargetCatch.positive.meanWeight=Le poids moyen est un entier strictement positif. +validator.nonTargetCatch.required.comment.for.reasonForDiscard=Un commentaire est requis vu la raison de rejet sélectionnée. +validator.nonTargetCatch.required.comment.for.speciesFate=Un commentaire est requis vu le devenir faune sélectionné. +validator.nonTargetCatch.required.species=La sélection d'une espèce de faune est obligatoire. +validator.nonTargetCatch.required.speciesFate=La sélection d'un devenir faune est obligatoire. +validator.nonTargetCatch.required.weightOrNombreEstime=Une des deux valeurs (poids estimé, nombre estimé) doit être renseignée. +validator.nonTargetCatch.required.weightOrTailleMoyen=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. +validator.nonTargetCatch.uniqueKey=Le couple (espèce - objectFate) doit être unique. +validator.nonTargetSample.bound.length=La taille pour cette espèce doit être comprise entre %1$s et %2$s. +validator.nonTargetSample.bound.weight=Le poids pour cette espèce doit être compris entre %1$s et %2$s. +validator.nonTargetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.nonTargetSample.desactivated.species=L'espèce sélectionnée est désactivée. +validator.nonTargetSample.positive.length=La longueur est un entier strictement positif. +validator.nonTargetSample.positive.weight=Le poids est un entier strictement positif. +validator.nonTargetSample.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'échantillonage. +validator.nonTargetSample.required.count=Le nombre effectif est obligatoire. +validator.nonTargetSample.required.gender=La sélection d'un sexe d'espèce de faune est obligatoire. +validator.nonTargetSample.required.species=La sélection d'une espèce de faune est obligatoire. +validator.nonTargetSample.required.taille=La taille est obligatoire. +validator.nonTargetSample.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. +validator.objectObservedSpecies.desactivated.species=L'espèce sélectionnée est désactivée. +validator.objectObservedSpecies.desactivated.speciesStatus=Le statut espèce sélectionné est désactivé. +validator.objectObservedSpecies.positive.count=Le lastNamebre est un entier strictement positif. +validator.objectObservedSpecies.required.count=Le lastNamebre est obligatoire. +validator.objectObservedSpecies.required.species=La sélection d'une espèce de faune est obligatoire. +validator.objectObservedSpecies.required.speciesStatus=La sélection d'un statut d'espèce de faune est obligatoire. +validator.organism.desactivated.country=Le pays est désactivé. +validator.organism.null.description=La description n'est pas renseignée. +validator.organism.required.country=Aucun pays sélectionné. +validator.person.desactivated.country=La nationalité sélectionnée est désactivée. +validator.person.required.country=La nationalité est obligatoire. +validator.person.required.firstName=Le prénom est obligatoire. +validator.person.required.lastName=Le nom est obligatoire. +validator.program.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.program.desactivated.organism=L'organisme sélectionné est désactivé. +validator.program.required.endDate=Date de fin de programme non renseigné. +validator.program.required.gearType=Aucun type d'engin sélectionné. +validator.program.required.organism=Aucun organisme sélectionné. +validator.program.required.startDate=Date de début de programme non renseigné. +validator.referentiel.invalid.code.uniqueKey=Le code doit être unique, la valeur %1$s est déjà utilisée. +validator.referentiel.invalid.uri.uniqueKey=L'uri doit être unique, la valeur %1$s est déjà utilisée. +validator.referentiel.null.uri=Aucune uri renseignée. +validator.referentiel.required.brandName=Le nom n'est pas renseigné. +validator.referentiel.required.label1=Aucun libellé anglais renseigné. +validator.referentiel.required.label2=Aucun libellé français renseigné. +validator.referentiel.required.label3=Aucun libellé espagnol renseigné. +validator.referentiel.status.desactivated=L'objet est déasactivé (il ne pourra plus être utilisée dans des données observer ou des nouveaux référentiels). +validator.referentiel.status.required= +validator.referentiel.untranslated.label1=Le libellé anglais n'est pas traduit. +validator.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit. +validator.route.activityFinDeVeille.notAvailable=Il existe déjà une activité de fin de veille sur la route +validator.route.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.route.duplicated.date=Il existe déjà une autre route à cette date. +validator.route.invalid.date=Le jour d'observation doit être supérieure ou égale à la date de début de la marée (%1$s). +validator.route.invalid.endLogValue.maximum=Le loch du soir ne peut pas être supérieur de %1$s à celui du matin. +validator.route.invalid.endLogValue.minimum=Le loch du soir doit être strictement supérieur à celui du matin. +validator.route.invalid.quadrant=Le quadrant de l'activity à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1,2, atlantiqe \: 1, 2, 3, 4) +validator.route.invalid.seaSurfaceTemperature=La température surface ne peut pas varier de plus de 12° entre 2 activités (activité de position %1$s incorrecte). +validator.route.invalid.speed=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd). +validator.route.invalid.startLogValue=Le loch du matin (%1$s) doit être supérieur au loch soir (%2$s) de la route %3$s. +validator.route.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte). +validator.route.missing.activityFinDeVeille=Aucune activité de fin de veille définie sur la route. +validator.route.null.comment=Aucun commentaire renseigné. +validator.route.positive.startLogValue=Le loch du matin doit être un entier strictement positif. +validator.route.required.date=Le jour d'observation doit être renseigné. +validator.route.unclosed.activity=Il existe une activité non clôturée (%1$s). +validator.schoolEstimate.bound.weight=Le tonnage doit être compris entre %1$s et %2$s. +validator.schoolEstimate.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.schoolEstimate.desactivated.species=L'espèce sélectionnée est désactivée. +validator.schoolEstimate.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'estimation. +validator.schoolEstimate.required.species=La sélection d'une espèce de thon est obligatoire. +validator.schoolEstimate.required.weight=Un des deux poids doit être renseigné. +validator.schoolEstimate.species.uniqueKey=L'espèce est déjà utilisée. +validator.section.required.settingIdentifier=L'identifiant de filage est obligatoire. +validator.sensorUsed.desactivated.sensorBrand=La marque sélectionnée est désactivée. +validator.sensorUsed.desactivated.sensorDataFormat=Le type de format de données sélectionné est désactivé. +validator.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé. +validator.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné. +validator.sensorUsed.required.sensorType=La sélection d'un type est obligatoire. +validator.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. +validator.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. +validator.set.bound.delay=La durée entre l'heure de fin de calée et l'heure de fin de coulissage doit être d'au moins %1$s minutes. +validator.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s. +validator.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s. +validator.set.bound.schoolThickness=L'épaisseur Banc doit être un entier compris entre %1$s et %2$s. +validator.set.bound.schoolTopDepth=La profondeur sommet doit être un entier compris entre %1$s et %2$s. +validator.set.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.set.delay.too.long=La durée de la calée est trop longue (maximum de %1$s minutes). +validator.set.desactivated.reasonForNullSet=La cause coup null sélectionnée est désactivée. +validator.set.endDate.after.endPursingDate=La date de fin doit être supérieure ou égal à la date de fin de coulissage. +validator.set.endPursingDate.after.date=La date de fin de coulissage doit être supérieure ou égal à la date du jour d'observation. +validator.set.endPursingTimeStamp.after.startTime=L'heure de fin de coulissage doit être supérieure ou égal à l'heure de début. +validator.set.endSetTimeStamp.after.endPursingTimeStamp=L'heure de fin doit être supérieure ou égal à l'heure de fin de coulissage. +validator.set.null.currentDirection=Direction courant non saisie. +validator.set.required.comment.for.reasonForNullSet=Un commentaire est requis pour la cause coup nul sélectionnée. +validator.set.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. +validator.set.startTime.after.time=L'heure de début doit être supérieure ou égal à l'heure d'observation de l'activité. +validator.setLongline.bad.baitsCompositionProportionSum=La somme des proportions d'appâts doit valoir 100. +validator.setLongline.bad.branchlinesCompositionProportionSum=La somme des proportions d'avançons doit valoir 100. +validator.setLongline.bad.floatlinesCompositionProportionSum=La somme des proportions de floatline doit valoir 100. +validator.setLongline.bad.hooksCompositionProportionSum=La somme des proportions d'hameçons doit valoir 100. +validator.setLongline.baitsComposition.uniqueKey=Le tuple (type/état/taille/poids) doit être unique, le tuple est déjà utilisé. +validator.setLongline.bound.basketsPerSectionCount=Le nombre de panier par section doit être compris entre %1$s et %2$s. +validator.setLongline.bound.branchlinesPerBasketCount=Le nombre d'hameçons par panier doit être compris entre %1$s et %2$s. +validator.setLongline.bound.haulingEndLatitude=La latitude de fin de virage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.haulingEndLongitude=La longitude de fin de virage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.haulingStartLatitude=La latitude de début de virage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.haulingStartLongitude=La longitude de début de virage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.lightsticksPerBasketCount=Le nombre de cyalumes par panier doit être compris entre %1$s et %2$s. +validator.setLongline.bound.settingEndLatitude=La latitude de fin de filage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.settingEndLongitude=La longitude de fin de filage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.settingStartLatitude=La latitude de début de filage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.settingStartLongitude=La longitude de début de filage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.settingVesselSpeed=La vitesse bateau doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.shooterSpeed=La vitesse de shooter doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.snapWeight=Le poids snap doit être compris entre %1$s et %2$s. +validator.setLongline.bound.swivelWeight=Le poids emerillon doit être compris entre %1$s et %2$s. +validator.setLongline.bound.timeBetweenHooks=Le temps entre hameçons doit être compris entre %1$s et %2$s. +validator.setLongline.bound.totalBasketsCount=Le nombre total de paniers doit être compris entre %1$s et %2$s. +validator.setLongline.bound.totalHooksCount=Le nombre total d'hameçons doit être compris entre %1$s et %2$s. +validator.setLongline.bound.totalSectionsCount=Le nombre total de sections doit être compris entre %1$s et %2$s. +validator.setLongline.branchlinesComposition.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique, le tuple est déjà utilisé. +validator.setLongline.desactivated.lightsticksColor=La couleur de cyalume sélectionné est désactivé. +validator.setLongline.desactivated.lightsticksType=Le type de cyalume sélectionné est désactivé. +validator.setLongline.desactivated.lineType=Le type de ligne sélectionné est désactivé. +validator.setLongline.desactivated.settingShape=Le type de forme sélectionné est désactivé. +validator.setLongline.duplicated.homeId=L'Id métier est déjà utilisé par une autre opération de pêche (%s) +validator.setLongline.duplicated.number=Le numéro est déjà utilisé par une autre opération de pêche (%s) +validator.setLongline.floatlinesComposition.uniqueKey=Le tuple (type/longueur) doit être unique, le tuple est déjà utilisé. +validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp=L'heure de fin de virage doit être supérieure ou égal à l'heure de début de virage. +validator.setLongline.hooksComposition.uniqueKey=Le tuple (type/taille/offset) doit être unique, le tuple est déjà utilisé. +validator.setLongline.invalid.haulingEndQuadrant=Le quadrant de fin de virage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.setLongline.invalid.haulingStartQuadrant=Le quadrant de début de virage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.setLongline.invalid.settingEndQuadrant=Le quadrant de fin de filage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.setLongline.invalid.settingStartQuadrant=Le quadrant de début de filage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.setLongline.null.homeId=Id métier non renseigné. +validator.setLongline.required.basketsPerSectionCount=Nombre de paniers par section non renseigné. +validator.setLongline.required.branchlinesPerBasketCount=Nombre d'hameçons par panier non renseigné. +validator.setLongline.required.haulingBreaks=Nombre de coupures non renseigné. +validator.setLongline.required.haulingDirectionSameAsSetting=Le champ doit être renseigné. +validator.setLongline.required.haulingEndLatitude=Latitude de fin de virage non renseignée. +validator.setLongline.required.haulingEndLongitude=longitude de fin de virage non renseignée. +validator.setLongline.required.haulingEndQuadrant=Quadrant de fin de virage non renseigné. +validator.setLongline.required.haulingEndTimeStamp=Horodatage de fin de virage non renseigné. +validator.setLongline.required.haulingStartLatitude=Latitude de début de virage non renseignée. +validator.setLongline.required.haulingStartLongitude=longitude de début de virage non renseignée. +validator.setLongline.required.haulingStartQuadrant=Quadrant de début de virage non renseigné. +validator.setLongline.required.haulingStartTimeStamp=Horodatage de début de virage non renseigné. +validator.setLongline.required.settingEndLatitude=Latitude de fin de filage non renseignée. +validator.setLongline.required.settingEndLongitude=longitude de fin de filage non renseignée. +validator.setLongline.required.settingEndQuadrant=Quadrant de fin de filage non renseigné. +validator.setLongline.required.settingEndTimeStamp=Horodatage de fin de filage non renseigné. +validator.setLongline.required.settingStartLatitude=Latitude de début de filage non renseignée. +validator.setLongline.required.settingStartLongitude=longitude de début de filage non renseignée. +validator.setLongline.required.settingStartQuadrant=Quadrant de début de filage non renseigné. +validator.setLongline.required.settingStartTimeStamp=Horodatage de début de filage non renseigné. +validator.setLongline.required.totalSectionsCount=Nombre de sections non renseigné. +validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=L'heure de début de virage doit être supérieure ou égal à l'heure de fin de filage. +validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de filage doit être supérieure ou égal à l'heure de début de filage. +validator.species.desactivated.speciesGroup=Le groupe d'espèce sélectionnée est désactivé. +validator.species.invalid.faoCode.uniqueKey=Le codeFAO doit être unique, la valeur %1$s est déjà utilisée. +validator.species.invalid.homeId.uniqueKey=Le code3l doit être unique, la valeur %1$s est déjà utilisée. +validator.species.invalid.scientificLabel.uniqueKey=Le libellé scientifique doit être unique, la valeur %1$s est déjà utilisée. +validator.species.invalid.wormsId=Le code worms n'est pas valide. +validator.species.invalid.wormsId.uniqueKey=Le wormsId doit être unique, la valeur %1$s est déjà utilisée. +validator.species.null.faoCode=Le code FAO n'est pas renseigné. +validator.species.null.homeId=Le code 3L n'est pas renseigné. +validator.species.required.ocean=Aucun océan sélectionné. +validator.species.required.scientificLabel=Le libellé scientifique n'est pas renseigné (mettre xx si non connu). +validator.species.required.speciesGroup=Aucun groupe d'espèce faune renseigné. +validator.speciesList.null.code=Le code n'est pas renseigné. +validator.targetCatch.bound.weight=Le tonnage doit être compris entre %1$s et %2$s +validator.targetCatch.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.targetCatch.desactivated.species=L'espèce sélectionnée est désactivée. +validator.targetCatch.desactivated.weightCategory=La catégorie poids sélectionnée est désactivée. +validator.targetCatch.required.species=La sélection d'une espèce de thon est obligatoire. +validator.targetCatch.required.weight=Le poids n'est pas renseigné. +validator.targetCatch.required.weightCategory=La sélection d'une catégorie poids est obligatoire. +validator.targetCatch.required.well=La cuve n'est pas renseignée. +validator.targetCatch.uniqueKey=Le couple (catégorie poids - well) doit être unique. +validator.targetDiscarded.bound.weight=Le tonnage doit être compris entre %1$s et %2$s. +validator.targetDiscarded.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.targetDiscarded.desactivated.reasonForDiscard=La raison rejet sélectionnée est désactivée. +validator.targetDiscarded.desactivated.species=L'espèce sélectionnée est désactivée. +validator.targetDiscarded.desactivated.weightCategory=La catégorie poids sélectionnée est désactivée. +validator.targetDiscarded.required.comment.for.reasonForDiscard=un commentaire est requis pour le raison rejet du rejet. +validator.targetDiscarded.required.reasonForDiscard=La sélection d'une raison de rejet est obligatoire. +validator.targetDiscarded.required.species=La sélection d'une espèce de thon est obligatoire. +validator.targetDiscarded.required.weight=Le poids est obligatoire. +validator.targetDiscarded.required.weightCategory=La sélection d'une catégorie poids est obligatoire. +validator.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. +validator.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. +validator.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. +validator.targetLength.desactivated.species=L'espèce sélectionnée est désactivée. +validator.targetLength.positive.length=La longueur est un entier strictement positif. +validator.targetLength.positive.weight=Le poids est un entier strictement positif. +validator.targetLength.required.count=Le nombre effectif est obligatoire. +validator.targetLength.required.species=La sélection d'une espèce de thon est obligatoire. +validator.targetLength.required.taille=La taille est obligatoire. +validator.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. +validator.targetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.targetSample.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'échantillonage. +validator.tdr.deployementStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement. +validator.tdr.desactivated.itemHorizontalPosition=La position sur la ligne sélectionnée est désactivée. +validator.tdr.desactivated.itemVerticalPosition=La position verticale sélectionnée est désactivée. +validator.tdr.desactivated.sensorBrand=La marque sélectionnée est déasactivée. +validator.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. +validator.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. +validator.tdr.required.position=Pas de position renseignée sur la palangre. +validator.transmittingBuoy.desactivated.country=Le pays sélectionné est désactivé. +validator.transmittingBuoy.desactivated.transmittingBuoyOperation=L'operation balise sélectionnée est désactivée. +validator.transmittingBuoy.desactivated.transmittingBuoyType=Le type de balise sélectionné est désactivé. +validator.transmittingBuoy.null.code=Le code de la balise n'est pas renseigné. +validator.transmittingBuoy.required.transmittingBuoyOperation=La sélection d'une opération sur balise est obligatoire. +validator.transmittingBuoy.required.transmittingBuoyType=La sélection d'une type de balise est obligatoire. +validator.trip.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.trip.desactivated.captain=Le capitaine sélectionné est désactivé. +validator.trip.desactivated.dataEntryOperator=Le saisisseur sélectionné est désactivé. +validator.trip.desactivated.departureHarbour=Le port de départ sélectionné est désactivé. +validator.trip.desactivated.landingHarbour=Le port d'arrivée sélectionné est désactivé. +validator.trip.desactivated.observer=L'observateur sélectionné est désactivé. +validator.trip.desactivated.ocean=L'ocean sélectionné est désactivé. +validator.trip.desactivated.tripType=Le type de marée est désactivé. +validator.trip.desactivated.vessel=Le bateau sélectionné est désactivée. +validator.trip.endDate.after.startDate=La date de fin de marée doit être supérieure à sa date de début. +validator.trip.invalid.date=Le jour d'observation doit être supérieure à celui d'une route précédente. (la route à la position %1$s est incorrecte). +validator.trip.invalid.endDate=La date de fin de marée doit être supérieure au jour d'observation de chaque route. (la route à la position %1$s est incorrecte). +validator.trip.invalid.formsUrl=L'url du formulaire n'est pas valide. +validator.trip.invalid.loch=Le loch du matin (%1$s) de la route %2$s doit être supérieur au loch soir (%3$s) de la route précédente. +validator.trip.invalid.reportsUrl=L'url du rapport n'est pas valide. +validator.trip.invalid.startDate=La date de début de marée doit être inférieure au jour d'observation de chaque route. (la route à la position %1$s est incorrecte). +validator.trip.null.captain=Pas de capitaine sélectionné. +validator.trip.null.dataEntryOperator=Pas de saisisseur sélectionné. +validator.trip.null.departureHarbour=Pas de port de départ sélectionné. +validator.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). +validator.trip.null.landingHarbour=Pas de port d'arrivée sélectionné. +validator.trip.required.comment.for.captain=Un commentaire est requis pour le captiaine sélectionné. +validator.trip.required.comment.for.dataEntryOperator=Un commentaire est requis pour le saisisseur sélectionné. +validator.trip.required.comment.for.departureHarbour=Un commentaire est requis pour le port de départ sélectionné. +validator.trip.required.comment.for.landingHarbour=Un commentaire est requis pour le port d'arrivée sélectionné. +validator.trip.required.comment.for.observer=Un commentaire est requis pour l'observateur sélectionné. +validator.trip.required.comment.for.ocean=Un commentaire est requis pour l'ocean sélectionné. +validator.trip.required.comment.for.tripType=Un commentaire est requis pour le type de marée sélectionné. +validator.trip.required.comment.for.vessel=Un commentaire est requis pour le navire sélectionné. +validator.trip.required.departureHarbour=La sélection d'un port de départ est obligatoire. +validator.trip.required.endDate=La date de fin de marée est obligatoire. +validator.trip.required.observer=La sélection d'un observateur est obligatoire. +validator.trip.required.ocean=La sélection d'un océan est obligatoire. +validator.trip.required.startDate=La date de début est obligatoire. +validator.trip.required.tripType=Le type de marée est obligatoire. +validator.trip.required.vessel=La sélection d'un bateau est obligatoire. +validator.tripLongline.unclosed.activity=Il existe une activité non clôturée (%1$s). +validator.tripSeine.unclosed.route=Il existe une route non clôturée (%1$s). +validator.vessel.desactivated.flagCountry=Le pavillon sélectionné est désactivée. +validator.vessel.desactivated.vesselSizeCategory=La jauge sélectionnée est désactivée. +validator.vessel.desactivated.vesselType=La pêcherie sélectionnée est désactivée. +validator.vessel.invalid.capacity=Année de mise en service non renseignée. +validator.vessel.invalid.fleetCountry=Code Flotte non renseigné. +validator.vessel.invalid.keelCode=Code Quille non renseigné. +validator.vessel.invalid.length=Longueur hors tout non renseignée. +validator.vessel.invalid.power=Puissance non renseignée. +validator.vessel.invalid.searchMaximum=Vitesse maximale non renseignée. +validator.vessel.invalid.yearService=Année de mise en service non renseignée. +validator.vessel.null.changeDate=Date chargement non renseignée. +validator.vessel.required.flagCountry=Aucun pavillon renseigné. +validator.vessel.required.vesselSizeCategory=Aucune jauge sélectionnée. +validator.vessel.required.vesselType=Aucune pêcherie renseignée. +validator.vesselSizeCategory.required.capacityLabel=Le libellé Capacité n'est pas renseigné. +validator.vesselSizeCategory.required.gaugeLabel=Le libellé Jauge n'est pas renseigné. +validator.weightCategory.desactivated.species=L'espèce sélectionnée est désactivée. +validator.weightCategory.required.species=Aucune espèce sélectionnée. +validator.wind.required.speedRange=Libellé vitesse vent non renseigné. +validator.wind.required.waveHeight=Libellé descriptif hauteur moyenne vagues non renseigné. diff --git a/observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java b/observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java new file mode 100644 index 0000000..2b3f83f --- /dev/null +++ b/observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java @@ -0,0 +1,501 @@ +package fr.ird.observe.application.swing.validation; + +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.longline.BaitsCompositionDto; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; +import fr.ird.observe.services.dto.longline.CatchLonglineDto; +import fr.ird.observe.services.dto.longline.EncounterDto; +import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.HooksCompositionDto; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SensorUsedDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; +import fr.ird.observe.services.dto.referential.CountryDto; +import fr.ird.observe.services.dto.referential.FpaZoneDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.HarbourDto; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; +import fr.ird.observe.services.dto.referential.OceanDto; +import fr.ird.observe.services.dto.referential.OrganismDto; +import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.SpeciesGroupDto; +import fr.ird.observe.services.dto.referential.SpeciesListDto; +import fr.ird.observe.services.dto.referential.VesselDto; +import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; +import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; +import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; +import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; +import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; +import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.dto.referential.longline.HealthnessDto; +import fr.ird.observe.services.dto.referential.longline.HookPositionDto; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; +import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; +import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; +import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; +import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; +import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; +import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; +import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; +import fr.ird.observe.services.dto.referential.longline.TripTypeDto; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; +import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; +import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; +import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; +import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; +import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import fr.ird.observe.services.dto.referential.seine.WindDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.SchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; +import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; +import fr.ird.observe.services.dto.seine.TargetCatchDto; +import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.dto.seine.TargetSampleDto; +import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.validator.AbstractValidatorDetectorTest; +import org.nuiton.validator.NuitonValidator; +import org.nuiton.validator.NuitonValidatorScope; +import org.nuiton.validator.ValidatorTestHelper; +import org.nuiton.validator.xwork2.XWork2NuitonValidatorProvider; + +import java.io.File; +import java.util.Iterator; +import java.util.SortedSet; +import java.util.regex.Pattern; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +/** + * Created on 26/07/16. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { + + private static final String N1_CREATE_CONTEXT_NAME = "n1-create"; + + private static final String N1_UPDATE_CONTEXT_NAME = "n1-update"; + + SortedSet<NuitonValidator<?>> validators; + + public BeanValidatorDetectorTest() { + super(XWork2NuitonValidatorProvider.PROVIDER_NAME); + } + + static Class<?>[] ALL_TYPES; + + @BeforeClass + public static void setUpClass() throws Exception { + ALL_TYPES = new Class[]{ + ActivityLonglineDto.class, + ActivityLonglineEncouterDto.class, + ActivityLonglineSensorUsedDto.class, + ActivitySeineDto.class, + ActivitySeineObservedSystemDto.class, + BaitsCompositionDto.class, + BaitHaulingStatusDto.class, + BaitSettingStatusDto.class, + BaitTypeDto.class, + BasketDto.class, + BranchlineDto.class, + BranchlinesCompositionDto.class, + CatchFateLonglineDto.class, + CatchLonglineDto.class, + CountryDto.class, + DetectionModeDto.class, + EncounterDto.class, + EncounterTypeDto.class, + FloatingObjectDto.class, + FloatingObjectSchoolEstimateDto.class, + FloatingObjectTransmittingBuoyDto.class, + FloatlinesCompositionDto.class, + FpaZoneDto.class, + GearCaracteristicDto.class, + GearCaracteristicTypeDto.class, + GearDto.class, + GearUseFeaturesLonglineDto.class, + GearUseFeaturesSeineDto.class, + HarbourDto.class, + HealthnessDto.class, + HooksCompositionDto.class, + HookPositionDto.class, + HookSizeDto.class, + HookTypeDto.class, + ItemHorizontalPositionDto.class, + ItemVerticalPositionDto.class, + LengthWeightParameterDto.class, + LightsticksColorDto.class, + LightsticksTypeDto.class, + LineTypeDto.class, + MaturityStatusDto.class, + MitigationTypeDto.class, + NonTargetCatchDto.class, + NonTargetLengthDto.class, + NonTargetSampleDto.class, + ObjectFateDto.class, + ObjectObservedSpeciesDto.class, + ObjectOperationDto.class, + ObjectSchoolEstimateDto.class, + ObjectTypeDto.class, + ObservedSystemDto.class, + OceanDto.class, + OrganismDto.class, + PersonDto.class, + ProgramDto.class, + ReasonForDiscardDto.class, + ReasonForNoFishingDto.class, + ReasonForNullSetDto.class, + RouteDto.class, + SchoolEstimateDto.class, + SectionDto.class, + SensorBrandDto.class, + SensorDataFormatDto.class, + SensorTypeDto.class, + SensorUsedDto.class, + SetLonglineDto.class, + SetLonglineGlobalCompositionDto.class, + SetSeineDto.class, + SetSeineNonTargetCatchDto.class, + SetSeineSchoolEstimateDto.class, + SetSeineTargetCatchDto.class, + SettingShapeDto.class, + SexDto.class, + SizeMeasureTypeDto.class, + SpeciesDto.class, + SpeciesFateDto.class, + SpeciesGroupDto.class, + SpeciesListDto.class, + SpeciesStatusDto.class, + StomacFullnessDto.class, + SurroundingActivityDto.class, + TargetCatchDto.class, + TargetLengthDto.class, + TargetSampleDto.class, + TdrDto.class, + TransmittingBuoyDto.class, + TransmittingBuoyOperationDto.class, + TransmittingBuoyTypeDto.class, + TripLonglineDto.class, + TripLonglineGearUseDto.class, + TripSeineDto.class, + TripSeineGearUseDto.class, + TripTypeDto.class, + VesselActivityLonglineDto.class, + VesselActivitySeineDto.class, + VesselDto.class, + VesselSizeCategoryDto.class, + VesselTypeDto.class, + WeightCategoryDto.class, + WeightMeasureTypeDto.class, + WindDto.class + }; + } + + @Override + protected File getRootDirectory(File basedir) { + return new File(basedir, "src" + File.separator + "main" + File.separator + "resources"); + } + + @Test + public void detectAll() { + + SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); + assertFalse(validators.isEmpty()); + assertEquals(175, validators.size()); + + } + + @Test + public void testDetectN1Create() { + String contextName = N1_CREATE_CONTEXT_NAME; + + validators = detectValidators(Pattern.compile(contextName), ALL_TYPES); + + assertValidatorSetWithSameContextName(validators, contextName, + ActivityLonglineDto.class, + ActivitySeineDto.class, + BaitHaulingStatusDto.class, + BaitSettingStatusDto.class, + BaitTypeDto.class, + CatchFateLonglineDto.class, + CountryDto.class, + DetectionModeDto.class, + EncounterTypeDto.class, + FloatingObjectDto.class, + FpaZoneDto.class, + GearCaracteristicDto.class, + GearCaracteristicTypeDto.class, + GearDto.class, + HarbourDto.class, + HealthnessDto.class, + HookPositionDto.class, + HookSizeDto.class, + HookTypeDto.class, + ItemHorizontalPositionDto.class, + ItemVerticalPositionDto.class, + LengthWeightParameterDto.class, + LightsticksColorDto.class, + LightsticksTypeDto.class, + LineTypeDto.class, + MaturityStatusDto.class, + MitigationTypeDto.class, + ObjectFateDto.class, + ObjectOperationDto.class, + ObjectTypeDto.class, + ObservedSystemDto.class, + OceanDto.class, + OrganismDto.class, + PersonDto.class, + ProgramDto.class, + ReasonForDiscardDto.class, + ReasonForNoFishingDto.class, + ReasonForNullSetDto.class, + RouteDto.class, + SensorBrandDto.class, + SensorDataFormatDto.class, + SensorTypeDto.class, + SetLonglineDto.class, + SetSeineDto.class, + SettingShapeDto.class, + SexDto.class, + SizeMeasureTypeDto.class, + SpeciesDto.class, + SpeciesFateDto.class, + SpeciesGroupDto.class, + SpeciesListDto.class, + SpeciesStatusDto.class, + StomacFullnessDto.class, + SurroundingActivityDto.class, + TransmittingBuoyOperationDto.class, + TransmittingBuoyTypeDto.class, + TripLonglineDto.class, + TripSeineDto.class, + TripTypeDto.class, + VesselActivityLonglineDto.class, + VesselActivitySeineDto.class, + VesselDto.class, + VesselSizeCategoryDto.class, + VesselTypeDto.class, + WeightCategoryDto.class, + WeightMeasureTypeDto.class, + WindDto.class); + } + + public void assertValidatorSetWithSameContextName2(SortedSet<NuitonValidator<?>> result, String context, Class... contextThenClass) { + Assert.assertNotNull(result); + + Iterator itr = result.iterator(); + int index = 0; + NuitonValidatorScope[] scopes = NuitonValidatorScope.values(); + + while (itr.hasNext()) { + NuitonValidator next = (NuitonValidator) itr.next(); + ValidatorTestHelper.assertValidatorModel(next, context, contextThenClass[index++], scopes); + } + Assert.assertEquals((long) contextThenClass.length, (long) result.size()); + } + + @Test + public void testDetectN1Update() { + String contextName = N1_UPDATE_CONTEXT_NAME; + + validators = detectValidators(Pattern.compile(contextName), ALL_TYPES); + + assertValidatorSetWithSameContextName2(validators, + contextName, + ActivityLonglineDto.class, +//FIXME ActivityLonglineEncouterDto.class, + ActivityLonglineSensorUsedDto.class, + ActivitySeineDto.class, + ActivitySeineObservedSystemDto.class, + BaitHaulingStatusDto.class, + BaitSettingStatusDto.class, + BaitTypeDto.class, + BaitsCompositionDto.class, + BranchlineDto.class, + BranchlinesCompositionDto.class, + CatchFateLonglineDto.class, + CatchLonglineDto.class, + CountryDto.class, + DetectionModeDto.class, + EncounterDto.class, + EncounterTypeDto.class, + FloatingObjectDto.class, + FloatingObjectSchoolEstimateDto.class, + FloatingObjectTransmittingBuoyDto.class, + FloatlinesCompositionDto.class, + FpaZoneDto.class, + GearCaracteristicDto.class, + GearCaracteristicTypeDto.class, + GearDto.class, + GearUseFeaturesLonglineDto.class, + GearUseFeaturesSeineDto.class, + HarbourDto.class, + HealthnessDto.class, + HookPositionDto.class, + HookSizeDto.class, + HookTypeDto.class, + HooksCompositionDto.class, + ItemHorizontalPositionDto.class, + ItemVerticalPositionDto.class, + LengthWeightParameterDto.class, + LightsticksColorDto.class, + LightsticksTypeDto.class, + LineTypeDto.class, + MaturityStatusDto.class, + MitigationTypeDto.class, + NonTargetCatchDto.class, + NonTargetLengthDto.class, + NonTargetSampleDto.class, + ObjectFateDto.class, + ObjectObservedSpeciesDto.class, + ObjectOperationDto.class, + ObjectSchoolEstimateDto.class, + ObjectTypeDto.class, + ObservedSystemDto.class, + OceanDto.class, + OrganismDto.class, + PersonDto.class, + ProgramDto.class, + ReasonForDiscardDto.class, + ReasonForNoFishingDto.class, + ReasonForNullSetDto.class, + RouteDto.class, + SchoolEstimateDto.class, + SensorBrandDto.class, + SensorDataFormatDto.class, + SensorTypeDto.class, + SensorUsedDto.class, + SetLonglineDto.class, + SetSeineDto.class, + SetSeineNonTargetCatchDto.class, + SetSeineSchoolEstimateDto.class, + SettingShapeDto.class, + SexDto.class, + SizeMeasureTypeDto.class, + SpeciesDto.class, + SpeciesFateDto.class, + SpeciesGroupDto.class, + SpeciesListDto.class, + SpeciesStatusDto.class, + StomacFullnessDto.class, + SurroundingActivityDto.class, + TargetLengthDto.class, + TargetSampleDto.class, + TdrDto.class, + TransmittingBuoyDto.class, + TransmittingBuoyOperationDto.class, + TransmittingBuoyTypeDto.class, + TripLonglineDto.class, + TripLonglineGearUseDto.class, + TripSeineDto.class, + TripSeineGearUseDto.class, + TripTypeDto.class, + VesselActivityLonglineDto.class, + VesselActivitySeineDto.class, + VesselDto.class, + VesselSizeCategoryDto.class, + VesselTypeDto.class, + WeightCategoryDto.class, + WeightMeasureTypeDto.class, + WindDto.class); + } + + @Test + public void testDetectN1UpdateExt() { + String contextName = N1_UPDATE_CONTEXT_NAME; + + validators = detectValidators(Pattern.compile(contextName + "-.*"), ALL_TYPES); + + assertValidatorSetWithMultiContextName(validators, +// contextName + "-encounter", ActivityLonglineDto.class, +// contextName + "-sensorUsed", ActivityLonglineDto.class, +// contextName + "-observedSystem", ActivitySeineDto.class, + contextName + "-table", BasketDto.class, + contextName + "-catchLongline", BranchlineDto.class, + contextName + "-table", BranchlineDto.class, +// contextName + "-objectSchoolEstimate", FloatingObjectDto.class, +// contextName + "-transmittingBuoyOperation", FloatingObjectDto.class, + contextName + "-table", SectionDto.class, + contextName + "-baitsComposition", SetLonglineGlobalCompositionDto.class, + contextName + "-branchlinesComposition", SetLonglineGlobalCompositionDto.class, + contextName + "-floatlinesComposition", SetLonglineGlobalCompositionDto.class, + contextName + "-globalComposition", SetLonglineGlobalCompositionDto.class, + contextName + "-hooksComposition", SetLonglineGlobalCompositionDto.class, +// contextName + "-nonTargetCatch", SetSeineDto.class, +// contextName + "-schoolEstimate", SetSeineDto.class, + contextName + "-targetCatch", SetSeineTargetCatchDto.class, + contextName + "-targetDiscarded", SetSeineTargetCatchDto.class, + contextName + "-targetCatch", TargetCatchDto.class, + contextName + "-targetDiscarded", TargetCatchDto.class +// contextName + "-gearUseFeatures", TripSeineDto.class + ); + + } + + public void assertValidatorSetWithMultiContextName(SortedSet<NuitonValidator<?>> result, Object... contextThenClass) { + Assert.assertNotNull(result); + Iterator itr = result.iterator(); + int index = 0; + + for (NuitonValidatorScope[] scopes = NuitonValidatorScope.values(); itr.hasNext(); ++index) { + NuitonValidator next = (NuitonValidator) itr.next(); + ValidatorTestHelper.assertValidatorModel(next, (String) contextThenClass[2 * index], (Class) contextThenClass[2 * index + 1], scopes); + } + Assert.assertEquals((long) (contextThenClass.length / 2), (long) result.size()); + + } +} \ No newline at end of file diff --git a/observe-application-swing-validation/src/test/resources/log4j.properties b/observe-application-swing-validation/src/test/resources/log4j.properties new file mode 100644 index 0000000..6f302c9 --- /dev/null +++ b/observe-application-swing-validation/src/test/resources/log4j.properties @@ -0,0 +1,34 @@ +### +# #%L +# ObServe :: Swing +# %% +# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +# Global logging configuration +log4j.rootLogger=WARN, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n + +# levels + +log4j.logger.fr.ird.observe=INFO + diff --git a/observe-application-swing-validation/src/test/resources/validators.xml b/observe-application-swing-validation/src/test/resources/validators.xml new file mode 100644 index 0000000..d04abe1 --- /dev/null +++ b/observe-application-swing-validation/src/test/resources/validators.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2013 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator Config 1.0//EN" + "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd"> +<validators> + <!-- les validateurs fournis par XWork --> + <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/> + <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/> + <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/> + <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/> + <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/> + <validator name="long" class="com.opensymphony.xwork2.validator.validators.LongRangeFieldValidator"/> + <validator name="short" class="com.opensymphony.xwork2.validator.validators.ShortRangeFieldValidator"/> + <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/> + <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/> + <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/> + <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/> + <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/> + + <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/> + <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/> + + <!-- les validateurs fournis par Nuiton-validator --> + <!--validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/--> + <!--validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/--> + <validator name="requiredFile" class="org.nuiton.validator.xwork2.field.RequiredFileFieldValidator"/> + <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/> + <validator name="notExistingFile" class="org.nuiton.validator.xwork2.field.NotExistingFileFieldValidator"/> + <validator name="existingDirectory" class="org.nuiton.validator.xwork2.field.ExistingDirectoryFieldValidator"/> + <validator name="notExistingDirectory" class="org.nuiton.validator.xwork2.field.NotExistingDirectoryFieldValidator"/> + <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> + + <!-- les validateurs spécifiques à ObServe --> + <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/> + + <!-- Les validateurs spécifique aux Dto dans observe --> + <!--<validator name="openableEntity" class="fr.ird.observe.business.validation.field.OpenableFieldValidator"/>--> + <validator name="species_lengthDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesLengthFieldDtoValidator"/> + <validator name="species_weightDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesWeightFieldDtoValidator"/> + <validator name="activitySpeedDto" class="fr.ird.observe.application.swing.validation.validators.ActivitySpeedDtoValidator"/> + <validator name="activitySimpleSpeedDto" class="fr.ird.observe.application.swing.validation.validators.ActivitySimpleSpeedDtoValidator"/> + <validator name="activityFinDeVeilleExistsDto" class="fr.ird.observe.application.swing.validation.validators.ActivityFinDeVeilleExistsDtoValidator"/> + <validator name="setLonglineUniqueHomeIdDto" class="fr.ird.observe.application.swing.validation.validators.SetLonglineUniqueHomeIdDtoValidator"/> + <validator name="setLonglineUniqueNumberDto" class="fr.ird.observe.application.swing.validation.validators.SetLonglineUniqueNumberDtoValidator"/> + +</validators> diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 4726437..16b4fa4 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -111,6 +111,12 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-application-swing-decoration</artifactId> + <version>${project.version}</version> + </dependency> + <!-- FIXME Voir pourquoi on doit mettre ça sinon l'analyse des dépendances ne passe pas --> <dependency> <groupId>${project.groupId}</groupId> @@ -127,6 +133,13 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-application-swing-validation</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <!-- jaxx dependencies --> <dependency> @@ -185,10 +198,6 @@ <artifactId>commons-beanutils</artifactId> </dependency> <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> @@ -390,13 +399,22 @@ <id>scan-sources</id> <goals> <goal>parserJava</goal> + <goal>parserValidation</goal> <goal>gen</goal> </goals> <configuration> <entries> <entry> + <specificGoal>parserJava</specificGoal> <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> + <entry> + <specificGoal>parserValidation</specificGoal> + <basedir>${project.basedir}/src/main/resources/</basedir> + <includes> + <param>**/**-validation.xml</param> + </includes> + </entry> </entries> </configuration> </execution> diff --git a/pom.xml b/pom.xml index 4a9a661..36e3524 100644 --- a/pom.xml +++ b/pom.xml @@ -90,11 +90,14 @@ <module>observe-services-model</module> <module>observe-services-api</module> <module>observe-test-data</module> + <module>observe-validation-shared</module> <module>observe-entities</module> <module>observe-services-topia</module> <module>observe-services-rest</module> <module>observe-services-runner</module> <module>observe-application-web</module> + <module>observe-application-swing-decoration</module> + <module>observe-application-swing-validation</module> <module>observe-application-swing</module> </modules> <!--scm> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm