[Observe-commits] 03/07: Extraction d'un module avec l'api de décoration (de l'application swing)

27 Jul 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 6cf88b6956bbe720f9511c4c8d762d1cebccc258
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>.

    

[Observe-commits] 03/07: Extraction d'un module avec l'api de décoration (de l'application swing)

codelutin.com scm