wip

.github/workflows/mvn-build.yml

@@ -0,0 +1,18 @@
+name: Java CI with Maven
+
+on: [workflow_dispatch]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml

.gitignore

@@ -7,8 +7,7 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
+.settings/
 .classpath
 .factorypath
-.settings/
 .project
-AGENTS.md

COPYING

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://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 <https://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
-<https://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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://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 <https://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
-<https://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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

pom.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+
   <groupId>com.unicenta</groupId>
   <artifactId>unicentaopos</artifactId>
-  <version>5.5.0</version>
+  <version>5.4.0</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>11</maven.compiler.target>
     <derby.version>10.14.2.0</derby.version>
   </properties>
   <dependencies>
@@ -115,6 +116,7 @@
       <artifactId>poi</artifactId>
       <version>3.17</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
@@ -179,6 +181,7 @@
           <artifactId>slf4j-api</artifactId>
         </exclusion>
       </exclusions>
+
     </dependency>
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
@@ -290,6 +293,7 @@
       <artifactId>DynamicJasper-core-fonts</artifactId>
       <version>2.0</version>
     </dependency>
+
     <dependency>
       <groupId>org.eclipse.jdt.core.compiler</groupId>
       <artifactId>ecj</artifactId>
@@ -357,7 +361,7 @@
     <dependency>
       <groupId>com.unicenta</groupId>
       <artifactId>unicenta-plugins</artifactId>
-      <version>1.3.2-SNAPSHOT</version>
+      <version>1.3.1</version>
     </dependency>
     <dependency>
       <groupId>com.gluonhq</groupId>
@@ -446,6 +450,7 @@
       <version>4.2.0</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
   <build>
     <plugins>

src/main/java/com/unicenta/pos/admin/PeopleView.form

@@ -19,93 +19,10 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-128,0,0,1,-51"/>
   </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="separate" max="-2" attributes="0"/>
-                      <Component id="m_jVisible" min="-2" pref="207" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="m_jRole" min="-2" pref="180" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLblCardID" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="m_jcard" min="-2" pref="180" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="webCBSecurity" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                          <Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jButton1" min="-2" max="-2" attributes="0"/>
-                          <Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
-                      </Group>
-                  </Group>
-              </Group>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="1" attributes="0">
-              <EmptySpace type="separate" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="m_jName" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="2" attributes="0">
-                  <Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
-                  <Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="2" attributes="0">
-                  <Component id="jLblCardID" alignment="2" min="-2" max="-2" attributes="0"/>
-                  <Component id="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
-                  <Component id="webCBSecurity" alignment="2" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="m_jRole" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="jLabel3" min="-2" pref="25" max="-2" attributes="0"/>
-                  <Component id="m_jVisible" min="-2" pref="25" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
-                  <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
   <SubComponents>
-    <Component class="javax.swing.JLabel" name="jLabel1">
+    <Component class="javax.swing.JLabel" name="nameLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -121,10 +38,10 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JTextField" name="m_jName">
+    <Component class="javax.swing.JTextField" name="nameTextField">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -134,7 +51,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="m_jVisible">
+    <Component class="javax.swing.JCheckBox" name="isVisible">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -144,7 +61,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel3">
+    <Component class="javax.swing.JLabel" name="visiableLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -157,7 +74,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel4">
+    <Component class="javax.swing.JLabel" name="imageLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -170,7 +87,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
+    <Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -210,7 +127,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel2">
+    <Component class="javax.swing.JLabel" name="roleLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -223,7 +140,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="m_jcard">
+    <Component class="javax.swing.JTextField" name="cardIdTextField">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -233,7 +150,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLblCardID">
+    <Component class="javax.swing.JLabel" name="cardIdLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -246,33 +163,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
+    <Component class="javax.swing.JLabel" name="passwordLabel">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="3">
-            <StringItem index="0" value="Generate new key"/>
-            <StringItem index="1" value="Delete exisitng key"/>
-            <StringItem index="2" value="Use iButton ID"/>
-          </StringArray>
-        </Property>
-        <Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="0" type="code"/>
-        </Property>
-        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString(&quot;tooltip.peoplesecurity&quot;)"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Arial" size="14" style="0"/>
-        </Property>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[140, 45]"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
-      </Events>
-    </Component>
-    <Component class="javax.swing.JLabel" name="jLabel6">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -285,5 +176,12 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="taxIdLabel">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Tax ID"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JTextField" name="taxIdTextField">
+    </Component>
   </SubComponents>
 </Form>

src/main/java/com/unicenta/pos/admin/PeopleView.java

@@ -52,9 +52,12 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   private final ComboBoxValModel m_ReasonModel;
 
-    /** Creates new form PeopleEditor
+  /**
+   * Creates new form PeopleEditor
+   * 
    * @param dlAdmin
-     * @param dirty */
+   * @param dirty
+   */
   public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
 
     initComponents();
@@ -64,11 +67,11 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_RoleModel = new ComboBoxValModel();
 
     m_Dirty = dirty;
-        m_jName.getDocument().addDocumentListener(dirty);
+    nameTextField.getDocument().addDocumentListener(dirty);
     m_jRole.addActionListener(dirty);
-        m_jVisible.addActionListener(dirty);
+    isVisible.addActionListener(dirty);
-        m_jImage.addPropertyChangeListener("image", dirty);
+    imageEditor.addPropertyChangeListener("image", dirty);
-        m_jcard.getDocument().addDocumentListener(dirty);
+    cardIdTextField.getDocument().addDocumentListener(dirty);
 
     m_ReasonModel = new ComboBoxValModel();
     m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
@@ -86,17 +89,17 @@ public class PeopleView extends JPanel implements EditorRecord {
   @Override
   public void writeValueEOF() {
     m_oId = null;
-        m_jName.setText(null);
+    nameTextField.setText(null);
     m_sPassword = null;
     m_RoleModel.setSelectedKey(null);
-        m_jVisible.setSelected(false);
+    isVisible.setSelected(false);
-        m_jcard.setText(null);
+    cardIdTextField.setText(null);
-        m_jImage.setImage(null);
+    imageEditor.setImage(null);
-        m_jName.setEnabled(false);
+    nameTextField.setEnabled(false);
     m_jRole.setEnabled(false);
-        m_jVisible.setEnabled(false);
+    isVisible.setEnabled(false);
-        m_jcard.setEnabled(false);
+    cardIdTextField.setEnabled(false);
-        m_jImage.setEnabled(false);
+    imageEditor.setEnabled(false);
     jButton1.setEnabled(false);
     webCBSecurity.setEnabled(false);
   }
@@ -107,17 +110,17 @@ public class PeopleView extends JPanel implements EditorRecord {
   @Override
   public void writeValueInsert() {
     m_oId = null;
-        m_jName.setText(null);
+    nameTextField.setText(null);
     m_sPassword = null;
     m_RoleModel.setSelectedKey(null);
-        m_jVisible.setSelected(true);
+    isVisible.setSelected(true);
-        m_jcard.setText(null);
+    cardIdTextField.setText(null);
-        m_jImage.setImage(null);
+    imageEditor.setImage(null);
-        m_jName.setEnabled(true);
+    nameTextField.setEnabled(true);
     m_jRole.setEnabled(true);
-        m_jVisible.setEnabled(true);
+    isVisible.setEnabled(true);
-        m_jcard.setEnabled(true);
+    cardIdTextField.setEnabled(true);
-        m_jImage.setEnabled(true);
+    imageEditor.setEnabled(true);
     jButton1.setEnabled(true);
     webCBSecurity.setEnabled(true);
   }
@@ -130,18 +133,18 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void writeValueDelete(Object value) {
     Object[] people = (Object[]) value;
     m_oId = people[0];
-        m_jName.setText(Formats.STRING.formatValue(people[1]));
+    nameTextField.setText(Formats.STRING.formatValue(people[1]));
     m_sPassword = Formats.STRING.formatValue(people[2]);
     m_RoleModel.setSelectedKey(people[3]);
-        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-        m_jImage.setImage((BufferedImage) people[6]);
+    imageEditor.setImage((BufferedImage) people[6]);
 
-        m_jName.setEnabled(false);
+    nameTextField.setEnabled(false);
     m_jRole.setEnabled(false);
-        m_jVisible.setEnabled(false);
+    isVisible.setEnabled(false);
-        m_jcard.setEnabled(false);
+    cardIdTextField.setEnabled(false);
-        m_jImage.setEnabled(false);        
+    imageEditor.setEnabled(false);
     jButton1.setEnabled(false);
     webCBSecurity.setEnabled(false);
   }
@@ -154,25 +157,25 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void writeValueEdit(Object value) {
     Object[] people = (Object[]) value;
     m_oId = people[0];
-        m_jName.setText(Formats.STRING.formatValue(people[1]));
+    nameTextField.setText(Formats.STRING.formatValue(people[1]));
     m_sPassword = Formats.STRING.formatValue(people[2]);
     m_RoleModel.setSelectedKey(people[3]);
-        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-        m_jImage.setImage((BufferedImage) people[6]);
+    imageEditor.setImage((BufferedImage) people[6]);
 
-        if (m_jcard.getText().length() == 16) {
+    if (cardIdTextField.getText().length() == 16) {
-            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+      cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
     } else {
-            jLblCardID.setText(AppLocal.getIntString("label.card"));            
+      cardIdLabel.setText(AppLocal.getIntString("label.card"));
     }
-        System.out.println(m_jcard.getText().length());        
+    System.out.println(cardIdTextField.getText().length());
 
-        m_jName.setEnabled(true);
+    nameTextField.setEnabled(true);
     m_jRole.setEnabled(true);
-        m_jVisible.setEnabled(true);
+    isVisible.setEnabled(true);
-        m_jcard.setEnabled(true);
+    cardIdTextField.setEnabled(true);
-        m_jImage.setEnabled(true);
+    imageEditor.setEnabled(true);
     jButton1.setEnabled(true);
     webCBSecurity.setEnabled(true);
   }
@@ -186,12 +189,12 @@ public class PeopleView extends JPanel implements EditorRecord {
   public Object createValue() throws BasicException {
     Object[] people = new Object[7];
     people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
-        people[1] = Formats.STRING.parseValue(m_jName.getText());
+    people[1] = Formats.STRING.parseValue(nameTextField.getText());
     people[2] = Formats.STRING.parseValue(m_sPassword);
     people[3] = m_RoleModel.getSelectedKey();
-        people[4] = m_jVisible.isSelected();
+    people[4] = isVisible.isSelected();
-        people[5] = Formats.STRING.parseValue(m_jcard.getText());
+    people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
-        people[6] = m_jImage.getImage();
+    people[6] = imageEditor.getImage();
     return people;
   }
 
@@ -214,7 +217,6 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jRole.setModel(m_RoleModel);
   }
 
-   
   /**
    *
    */
@@ -222,57 +224,66 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void refresh() {
   }
 
-    /** This method is called from within the constructor to
+  /**
+   * This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
-        jLabel1 = new javax.swing.JLabel();
+    nameLabel = new javax.swing.JLabel();
-        m_jName = new javax.swing.JTextField();
+    nameTextField = new javax.swing.JTextField();
-        m_jVisible = new javax.swing.JCheckBox();
+    isVisible = new javax.swing.JCheckBox();
-        jLabel3 = new javax.swing.JLabel();
+    visiableLabel = new javax.swing.JLabel();
-        jLabel4 = new javax.swing.JLabel();
+    imageLabel = new javax.swing.JLabel();
-        m_jImage = new com.unicenta.data.gui.JImageEditor();
+    imageEditor = new com.unicenta.data.gui.JImageEditor();
     jButton1 = new javax.swing.JButton();
     m_jRole = new javax.swing.JComboBox();
-        jLabel2 = new javax.swing.JLabel();
+    roleLabel = new javax.swing.JLabel();
-        m_jcard = new javax.swing.JTextField();
+    cardIdTextField = new javax.swing.JTextField();
-        jLblCardID = new javax.swing.JLabel();
+    cardIdLabel = new javax.swing.JLabel();
-        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
+    passwordLabel = new javax.swing.JLabel();
-        jLabel6 = new javax.swing.JLabel();
+    taxIdLabel = new javax.swing.JLabel();
+    taxIdTextField = new javax.swing.JTextField();
 
     setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
     setPreferredSize(new java.awt.Dimension(500, 500));
 
-        jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+    nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
+    nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-        jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
+    nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-        jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
+    nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
       public void mouseClicked(java.awt.event.MouseEvent evt) {
-                jLabel1MouseClicked(evt);
+        nameLabelMouseClicked(evt);
       }
     });
+    add(nameLabel);
 
-        m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
+    nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(nameTextField);
 
-        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+    isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(isVisible);
 
-        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+    visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
+    visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(visiableLabel);
 
-        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+    imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
-        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
+    imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(imageLabel);
 
-        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
+    imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
+    add(imageEditor);
 
     jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
@@ -284,101 +295,34 @@ public class PeopleView extends JPanel implements EditorRecord {
         jButton1ActionPerformed(evt);
       }
     });
+    add(jButton1);
 
     m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(m_jRole);
 
-        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+    roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
-        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
+    roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(roleLabel);
 
-        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
+    cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(cardIdTextField);
 
-        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
+    cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
-        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
+    cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(cardIdLabel);
 
-        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
+    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        webCBSecurity.setSelectedIndex(0);
+    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
-        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
+    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    add(passwordLabel);
-        webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
-        webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                webCBSecurityActionPerformed(evt);
-            }
-        });
 
-        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    taxIdLabel.setText("Tax ID");
-        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
+    add(taxIdLabel);
-        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(taxIdTextField);
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addGap(18, 18, 18)
-                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
-                .addContainerGap())
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addGap(18, 18, 18)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addGap(15, 15, 15)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-        );
   }// </editor-fold>//GEN-END:initComponents
 
   private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
@@ -393,15 +337,13 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
 
-
     if (webCBSecurity.getSelectedIndex() == 0) {
       if (JOptionPane.showConfirmDialog(this,
           AppLocal.getIntString("message.cardnew"),
           AppLocal.getIntString("title.editor"),
           JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-            {  
+        cardIdTextField.setText("C" + StringUtils.getCardNumber());
-                m_jcard.setText("C" + StringUtils.getCardNumber());
         m_Dirty.setDirty(true);
       }
     }
@@ -411,9 +353,8 @@ public class PeopleView extends JPanel implements EditorRecord {
           AppLocal.getIntString("message.cardremove"),
           AppLocal.getIntString("title.editor"),
           JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-            {  
+        cardIdTextField.setText(null);
-                m_jcard.setText(null);
         m_Dirty.setDirty(true);
       }
     }
@@ -426,8 +367,8 @@ public class PeopleView extends JPanel implements EditorRecord {
           JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
 
       {
-                m_jcard.setText( uOWWatch.getibuttonid() );
+        cardIdTextField.setText(uOWWatch.getibuttonid());
-                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+        cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
         m_Dirty.setDirty(true);
       }
 
@@ -435,7 +376,7 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   }// GEN-LAST:event_webCBSecurityActionPerformed
 
-    private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
+  private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
     if (evt.getClickCount() == 2) {
       String uuidString = m_oId.toString();
       StringSelection stringSelection = new StringSelection(uuidString);
@@ -445,22 +386,23 @@ public class PeopleView extends JPanel implements EditorRecord {
       JOptionPane.showMessageDialog(null,
           AppLocal.getIntString("message.uuidcopy"));
     }
-    }//GEN-LAST:event_jLabel1MouseClicked
+  }// GEN-LAST:event_nameLabelMouseClicked
-    
 
   // Variables declaration - do not modify//GEN-BEGIN:variables
+  private javax.swing.JLabel cardIdLabel;
+  private javax.swing.JTextField cardIdTextField;
+  private com.unicenta.data.gui.JImageEditor imageEditor;
+  private javax.swing.JLabel imageLabel;
+  private javax.swing.JCheckBox isVisible;
   private javax.swing.JButton jButton1;
-    private javax.swing.JLabel jLabel1;
-    private javax.swing.JLabel jLabel2;
-    private javax.swing.JLabel jLabel3;
-    private javax.swing.JLabel jLabel4;
-    private javax.swing.JLabel jLabel6;
-    private javax.swing.JLabel jLblCardID;
-    private com.unicenta.data.gui.JImageEditor m_jImage;
-    private javax.swing.JTextField m_jName;
   private javax.swing.JComboBox m_jRole;
-    private javax.swing.JCheckBox m_jVisible;
+  private javax.swing.JLabel nameLabel;
-    private javax.swing.JTextField m_jcard;
+  private javax.swing.JTextField nameTextField;
+  private javax.swing.JLabel passwordLabel;
+  private javax.swing.JLabel roleLabel;
+  private javax.swing.JLabel taxIdLabel;
+  private javax.swing.JTextField taxIdTextField;
+  private javax.swing.JLabel visiableLabel;
   private com.alee.laf.combobox.WebComboBox webCBSecurity;
   // End of variables declaration//GEN-END:variables
 

src/main/java/com/unicenta/pos/config/JPanelConfigPayment.java

@@ -53,7 +53,6 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
         initPayments("external", new ConfigPaymentPanelEmpty());
         initPayments("PaymentSense",  new ConfigPaymentPanelEmpty());
         initPayments("Teya",  new ConfigPaymentPanelEmpty());
-        initPayments("MediaPayments",  new ConfigPaymentPanelEmpty());
 
         // Lector de tarjetas.
         jcboCardReader.addItem("Not defined");
@@ -92,17 +91,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
 
         jcboCardReader.setSelectedItem(config.getProperty("payment.magcardreader"));
         jcboPaymentGateway.setSelectedItem(config.getProperty("payment.gateway"));
-
-        String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
-        if ("MediaPayments".equals(gateway)) {
-            urlValue.setText(config.getProperty("media-payments.pdq"));
-            deviceIdValue.setText(config.getProperty("media-payments.api-key"));
-            securityKeyValue.setText(config.getProperty("media-payments.secret"));
-        } else {
         urlValue.setText(config.getProperty("payment.URL"));
         deviceIdValue.setText(config.getProperty("payment.device-id"));
         securityKeyValue.setText(config.getProperty("payment.security-key"));
-        }
         paymentConfiguration.loadProperties(config);
         dirty.setDirty(false);
     }
@@ -116,17 +107,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
 
         config.setProperty("payment.magcardreader", comboValue(jcboCardReader.getSelectedItem()));
         config.setProperty("payment.gateway", comboValue(jcboPaymentGateway.getSelectedItem()));
-
-        String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
-        if ("MediaPayments".equals(gateway)) {
-            config.setProperty("media-payments.pdq", urlValue.getText());
-            config.setProperty("media-payments.api-key", deviceIdValue.getText());
-            config.setProperty("media-payments.secret", securityKeyValue.getText());
-        } else {
         config.setProperty("payment.URL", urlValue.getText());
         config.setProperty("payment.device-id", deviceIdValue.getText());
         config.setProperty("payment.security-key", securityKeyValue.getText());
-        }
         paymentConfiguration.saveProperties(config);
         dirty.setDirty(false);
     }
@@ -292,9 +275,6 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
         paymentConfiguration = paymentsName.get(comboValue(jcboPaymentGateway.getSelectedItem()));
 
         if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("PaymentSense")) {
-            urlLabel.setText("URL");
-            deviceIdLabel.setText("Device ID");
-            securityKeyLabel.setText("Security Key");
             emvConfigPanel.setVisible(Boolean.TRUE);
             jcboCardReader.setSelectedItem("EMV");
             jcboCardReader.setEnabled(Boolean.FALSE);
@@ -305,18 +285,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
             jcboCardReader.setSelectedItem("EMV");
             jcboCardReader.setEnabled(Boolean.FALSE);
         }
-        else if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("MediaPayments")) {
-            urlLabel.setText("Terminal ID");
-            deviceIdLabel.setText("API Key");
-            securityKeyLabel.setText("Security Key");
-            emvConfigPanel.setVisible(Boolean.TRUE);
-            jcboCardReader.setSelectedItem("EMV");
-            jcboCardReader.setEnabled(Boolean.FALSE);
-        }
         else {
-            urlLabel.setText("URL");
-            deviceIdLabel.setText("Device ID");
-            securityKeyLabel.setText("Security Key");
             emvConfigPanel.setVisible(Boolean.FALSE);
             jcboCardReader.setEnabled(Boolean.TRUE);
         }

src/main/java/com/unicenta/pos/customers/CustomersPayment.java

@@ -174,7 +174,8 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
     btnPay.setEnabled(true);
     btnPrePay.setEnabled(true);
 
-//        btnPay.setEnabled(customer.getCurdebt() != null && customer.getCurdebt().doubleValue() > 0.0);
+    // btnPay.setEnabled(customer.getCurdebt() != null &&
+    // customer.getCurdebt().doubleValue() > 0.0);
 
   }
 
@@ -257,12 +258,14 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
     }
   }
 
-    /** This method is called from within the constructor to
+  /**
+   * This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
     java.awt.GridBagConstraints gridBagConstraints;
 
@@ -510,80 +513,111 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
                         .addContainerGap()
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(jPanel1Layout.createSequentialGroup()
                                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
-                                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                    .addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE)))))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250,
+                                        javax.swing.GroupLayout.PREFERRED_SIZE)))))
                     .addGroup(jPanel1Layout.createSequentialGroup()
                         .addGap(18, 18, 18)
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE,
-                            .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                            .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE,
-        );
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
     jPanel1Layout.setVerticalGroup(
         jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addGap(30, 30, 30)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-        );
+                    .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
 
     add(jPanel1, java.awt.BorderLayout.CENTER);
   }// </editor-fold>//GEN-END:initComponents
+
   private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
 
     readCustomer();
@@ -612,7 +646,8 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
           editCustomer(c);
         }
       } catch (BasicException ex) {
-                MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
+        MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
+            ex);
         msg.show(this);
       }
     }
@@ -642,7 +677,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
 
       ticket.setPayments(payments);
 
-            ticket.setUser(app.getAppUserView().getUser().getUserInfo());
+      ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
       ticket.setActiveCash(app.getActiveCashIndex());
       ticket.setDate(new Date());
       ticket.setCustomer(customerext);
@@ -654,7 +689,6 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
         msg.show(this);
       }
 
-
       // reload customer
       CustomerInfoExt c;
       try {
@@ -667,7 +701,8 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
         }
       } catch (BasicException ex) {
         c = null;
-                MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
+        MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
+            ex);
         msg.show(this);
       }
 
@@ -720,7 +755,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
 
         ticket.setPayments(payments);
 
-                ticket.setUser(app.getAppUserView().getUser().getUserInfo());
+        ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
         ticket.setActiveCash(app.getActiveCashIndex());
         ticket.setDate(new Date());
         ticket.setCustomer(customerext);
@@ -736,14 +771,16 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
         try {
           c = dlsales.loadCustomerExt(customerext.getId());
           if (c == null) {
-                        MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"));
+            MessageInf msg = new MessageInf(MessageInf.SGN_WARNING,
+                AppLocal.getIntString("message.cannotfindcustomer"));
             msg.show(this);
           } else {
             editCustomer(c);
           }
         } catch (BasicException ex) {
           c = null;
-                    MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
+          MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
+              ex);
           msg.show(this);
         }
 

src/main/java/com/unicenta/pos/payment/JPaymentVoucher.form

@@ -40,6 +40,10 @@
                           <EmptySpace type="unrelated" max="-2" attributes="0"/>
                           <Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
                       </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                      </Group>
                   </Group>
                   <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
               </Group>
@@ -83,7 +87,9 @@
                       <Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="33" max="-2" attributes="0"/>
+                  <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -160,43 +166,43 @@
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="webLblCustomer">
+        <Component class="com.alee.laf.label.WebLabel" name="webLblCustomer">
           <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value=""/>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
               <Font name="Arial" size="18" style="1"/>
             </Property>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
-            </Property>
-            <Property name="toolTipText" type="java.lang.String" value=""/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 30]"/>
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="webLblcustomerName">
+        <Component class="com.alee.laf.label.WebLabel" name="webLblcustomerName">
           <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Arial" size="14" style="0"/>
-            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value=""/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Arial" size="14" style="0"/>
+            </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 30]"/>
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="voucherStatus">
+        <Component class="com.alee.laf.label.WebLabel" name="voucherStatus">
           <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Arial" size="14" style="0"/>
-            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString(&quot;label.voucherStatus&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value=""/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Arial" size="14" style="0"/>
+            </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 30]"/>
             </Property>
@@ -218,6 +224,14 @@
             </Property>
           </Properties>
         </Component>
+        <Component class="javax.swing.JButton" name="jButton1">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="jButton1"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel11">

src/main/java/com/unicenta/pos/payment/JPaymentVoucher.java

@@ -191,10 +191,11 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
     m_jVoucher = new javax.swing.JComboBox();
     jLabel1 = new javax.swing.JLabel();
     m_jMoneyEuros = new javax.swing.JLabel();
-        webLblCustomer = new javax.swing.JLabel();
+    webLblCustomer = new com.alee.laf.label.WebLabel();
-        webLblcustomerName = new javax.swing.JLabel();
+    webLblcustomerName = new com.alee.laf.label.WebLabel();
-        voucherStatus = new javax.swing.JLabel();
+    voucherStatus = new com.alee.laf.label.WebLabel();
     jLabel6 = new javax.swing.JLabel();
+    jButton1 = new javax.swing.JButton();
     jPanel11 = new javax.swing.JPanel();
     jPanel12 = new javax.swing.JPanel();
     m_jKeys = new com.unicenta.editor.JEditorKeys();
@@ -247,6 +248,13 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
     jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
     jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
 
+    jButton1.setText("jButton1");
+    jButton1.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jButton1ActionPerformed(evt);
+      }
+    });
+
     javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
     jPanel4.setLayout(jPanel4Layout);
     jPanel4Layout.setHorizontalGroup(
@@ -262,7 +270,10 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
                                             .addContainerGap()
                                             .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                            .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addGroup(jPanel4Layout.createSequentialGroup()
+                                            .addContainerGap()
+                                            .addComponent(jButton1)))
                             .addGap(0, 0, Short.MAX_VALUE))
                     .addGroup(jPanel4Layout.createSequentialGroup()
                             .addContainerGap()
@@ -295,7 +306,9 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
                             .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                                     .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                     .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addGap(241, 241, 241))
+                            .addGap(33, 33, 33)
+                            .addComponent(jButton1)
+                            .addContainerGap())
     );
 
     add(jPanel4, java.awt.BorderLayout.CENTER);
@@ -352,8 +365,13 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
     }
   }//GEN-LAST:event_m_jVoucherActionPerformed
 
+  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+
+  }//GEN-LAST:event_jButton1ActionPerformed
+
 
   // Variables declaration - do not modify//GEN-BEGIN:variables
+  private javax.swing.JButton jButton1;
   private javax.swing.JLabel jLabel1;
   private javax.swing.JLabel jLabel5;
   private javax.swing.JLabel jLabel6;
@@ -365,9 +383,9 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
   private javax.swing.JLabel m_jMoneyEuros;
   private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
   private javax.swing.JComboBox m_jVoucher;
-    private javax.swing.JLabel voucherStatus;
+  private com.alee.laf.label.WebLabel voucherStatus;
-    private javax.swing.JLabel webLblCustomer;
+  private com.alee.laf.label.WebLabel webLblCustomer;
-    private javax.swing.JLabel webLblcustomerName;
+  private com.alee.laf.label.WebLabel webLblcustomerName;
   // End of variables declaration//GEN-END:variables
 
 }

src/main/java/com/unicenta/pos/payment/PaymentGatewayFac.java

@@ -41,8 +41,6 @@ public class PaymentGatewayFac {
                 return new PaymentGatewayPaymentSense();
             case "Teya":
                 return new PaymentGatewayTeya();
-            case "MediaPayments":
-                return new PaymentGatewayMediaPayments();
             default:
                 return null;
         }

src/main/java/com/unicenta/pos/payment/PaymentGatewayMediaPayments.java

@@ -1,97 +0,0 @@
-//    uniCenta oPOS  - Touch Friendly Point Of Sale
-//    Copyright (c) 2009-2018 uniCenta & previous Openbravo POS works
-//    https://unicenta.com
-//
-//    This file is part of uniCenta oPOS
-//
-//    uniCenta oPOS 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.
-//
-//   uniCenta oPOS 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 uniCenta oPOS.  If not, see <http://www.gnu.org/licenses/>.
-
-package com.unicenta.pos.payment;
-
-import com.unicenta.plugins.Application;
-import com.unicenta.plugins.common.AppContext;
-import com.unicenta.pos.util.RoundUtils;
-import lombok.extern.slf4j.Slf4j;
-
-import java.awt.*;
-import java.util.ArrayList;
-
-@Slf4j
-public class PaymentGatewayMediaPayments implements PaymentGateway {
-
-  public PaymentGatewayMediaPayments() {
-  }
-
-  Window getPaymentWindow(double amount) {
-    if (amount > 0) {
-      ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
-      for (Window window : Window.getWindows()) {
-        if (window instanceof JPaymentSelectReceipt) {
-          paymentWindows.add((JPaymentSelectReceipt) window);
-        }
-      }
-      return paymentWindows.get(paymentWindows.size() - 1);
-    } else {
-      ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
-      for (Window window : Window.getWindows()) {
-        if (window instanceof JPaymentSelectRefund) {
-          paymentWindows.add((JPaymentSelectRefund) window);
-        }
-      }
-      return paymentWindows.get(paymentWindows.size() - 1);
-    }
-  }
-
-  @Override
-  public void execute(PaymentInfoMagcard payinfo) {
-
-    int timer = 0;
-    int timeout = 180;
-
-    double roundedValue = RoundUtils.round(payinfo.getTotal());
-    new Application().mediaPaymentsTransaction(roundedValue, getPaymentWindow(roundedValue),
-        payinfo.getTransactionID().length() > 12 ? payinfo.getTransactionID() : null);
-
-    while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
-      try {
-        log.info("uniCenta-oPos: waiting for payment to complete ....");
-        Thread.sleep(1000);
-        timer += 1;
-        if (timer > timeout)
-          break;
-      } catch (InterruptedException e) {
-        log.error(e.getMessage());
-      }
-    }
-
-    if (AppContext.getMediaPaymentsPaymentResult() == null) {
-      payinfo.paymentError("Transaction Error! Please try again", "No Response");
-    } else if ("APPROVED".equals(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus())) {
-      payinfo.setCardName(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getCard().getType());
-      payinfo
-          .setVerification(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getVerificationMethod());
-      payinfo.setChipAndPin(true);
-      payinfo.paymentOK(
-          AppContext.getMediaPaymentsPaymentResult().getAdditionalInformation().getRequestId(),
-          AppContext.getMediaPaymentsPaymentResult().getTransactionDetails().getId(),
-          AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus());
-    } else {
-      String errorMsg = AppContext.getMediaPaymentsPaymentResult().getErrorMessage();
-      if (errorMsg == null) {
-        errorMsg = AppContext.getMediaPaymentsPaymentResult().getMessage();
-      }
-      payinfo.paymentError("Transaction Error! Please try again", errorMsg);
-    }
-  }
-}

src/main/java/com/unicenta/pos/sales/DataLogicReceipts.java

@@ -64,11 +64,10 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
     if (Id == null) {
       return null;
     } else {
-            Object[]record = (Object[]) new StaticSentence(s
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
-                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-                    , SerializerWriteString.INSTANCE
+              Datas.SERIALIZABLE }))
-                    , new SerializerReadBasic(new Datas[] {
+          .find(Id);
-                        Datas.SERIALIZABLE})).find(Id);
       return record == null ? null : (TicketInfo) record[0];
     }
   }
@@ -84,32 +83,34 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
     if (pickupId == null) {
       return null;
     } else {
-            Object[]record = (Object[]) new StaticSentence(s
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
-                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-                    , SerializerWriteString.INSTANCE
+              Datas.SERIALIZABLE }))
-                    , new SerializerReadBasic(new Datas[] {
+          .find(pickupId);
-                        Datas.SERIALIZABLE})).find(pickupId);
       return record == null ? null : (TicketInfo) record[0];
     }
   }
 
   /**
-     * JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
+   * JG Dec 14 Administrator and Manager Roles always have access to ALL
+   * SHAREDtickets
+   * 
    * @return
    * @throws BasicException
    */
   public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
 
     return (List<SharedTicketInfo>) new StaticSentence(s
-//                , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
+    // , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets
+    // ORDER BY ID"
         , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
-                        + "FROM sharedtickets ORDER BY PICKUPID" 
+            + "FROM sharedtickets ORDER BY PICKUPID",
-                , null
+        null, new SerializerReadClass(SharedTicketInfo.class)).list();
-                , new SerializerReadClass(SharedTicketInfo.class)).list();
   }
 
   /**
    * Return only current APPUSER SHAREDtickets
+   * 
    * @param appuser
    * @return
    * @throws BasicException
@@ -119,14 +120,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         + "FROM sharedtickets "
         + "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
 
-            return (List<SharedTicketInfo>) new StaticSentence(s
+    return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
-            , sql
+        .list();
-            , null
-            , new SerializerReadClass(SharedTicketInfo.class)).list();
   }
 
   /**
    * For Standard View
+   * 
    * @param id
    * @param ticket
    * @param pickupid
@@ -138,7 +138,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         id,
         ticket.getName(),
         ticket,
-            ticket.getUser().getId(),
+        ticket.getUserInfo().getId(),
         pickupid
 
     };
@@ -151,15 +151,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.INT
 
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-            , "INSERT INTO sharedtickets ("
         + "ID, "
         + "NAME, "
         + "CONTENT, "
         + "APPUSER, "
         + "PICKUPID) "
-                + "VALUES (?, ?, ?, ?, ?)"                
+        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
   }
 
   /**
@@ -175,7 +173,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         id,
         ticket.getName(),
         ticket,
-            ticket.getUser().getId(),
+        ticket.getUserInfo().getId(),
         pickupid
     };
     Datas[] datas = new Datas[] {
@@ -185,16 +183,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.STRING,
         Datas.INT
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
-                , "UPDATE sharedtickets SET "
         + "NAME = ?, "
         + "CONTENT = ?, "
         + "APPUSER = ?, "
         + "PICKUPID = ? "
-                + "WHERE ID = ?"
+        + "WHERE ID = ?",
-                , new SerializerWriteBasicExt(datas, 
+        new SerializerWriteBasicExt(datas,
             new int[] {
-                            1, 2, 3, 4, 0})).exec(values);
+                1, 2, 3, 4, 0 }))
+        .exec(values);
   }
 
   /**
@@ -221,18 +219,17 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.SERIALIZABLE,
         Datas.INT
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
-                , "UPDATE sharedtickets SET "
         + "NAME = ?, "
         + "CONTENT = ?, "
         + "PICKUPID = ? "
-                + "WHERE ID = ?"
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
-                , new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);                
   }
 
   /**
    * In place for multi-purposing like containing data from elsewhere and/or
    * using Place and User for Notifications
+   * 
    * @param id
    * @param locked
    * @throws BasicException
@@ -247,16 +244,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.STRING,
         Datas.STRING
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
-                , "UPDATE sharedtickets SET "
         + "LOCKED = ? "
-                + "WHERE ID = ?"
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
   }
 
   /**
    * In place for multi-purposing like flushing locks from elsewhere and/or
    * using Place and User for Notifications
+   * 
    * @param id
    * @param unlocked
    * @throws BasicException
@@ -271,15 +267,14 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.STRING,
         Datas.STRING
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
-                , "UPDATE sharedtickets SET "
         + "LOCKED = ? "
-                + "WHERE ID = ?"
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
   }
 
   /**
    * For Restaurant View
+   * 
    * @param id
    * @param ticket
    * @param pickupid
@@ -294,7 +289,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         id,
         ticket.getName(),
         ticket,
-            ticket.getUser(),
+        ticket.getUserInfo(),
         ticket.getPickupId(),
         ticket.getHost()
     };
@@ -307,15 +302,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.INT
 
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-            , "INSERT INTO sharedtickets ("
         + "ID, "
         + "NAME, "
         + "CONTENT, "
         + "APPUSER, "
         + "PICKUPID) "
-                + "VALUES (?, ?, ?, ?, ?)"                
+        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
   }
 
   /**
@@ -325,9 +318,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
    */
   public final void deleteSharedTicket(final String id) throws BasicException {
 
-        new StaticSentence(s
+    new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
-            , "DELETE FROM sharedtickets WHERE ID = ?"
-            , SerializerWriteString.INSTANCE).exec(id);      
   }
 
   /**
@@ -341,20 +332,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
     if (Id == null) {
       return null;
     } else {
-            Object[]record = (Object[]) new StaticSentence(s
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
-                    , "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
-                    , SerializerWriteString.INSTANCE
-                    , new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
       return record == null ? 0 : (Integer) record[0];
     }
   }
 
-
   public final String getUserId(final String id) throws BasicException {
-        Object[] userID = (Object []) new StaticSentence(s
+    Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
-            , "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
-            , SerializerWriteString.INSTANCE
-            , new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
     if (userID == null) {
       return null;
     } else {
@@ -363,20 +349,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
   }
 
   public final String getLockState(final String id, String lockState) throws BasicException {
-        Object[] state = (Object[]) new StaticSentence(s
+    Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
-            , "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-            , SerializerWriteString.INSTANCE
-            , new SerializerReadBasic(new Datas[] {
             Datas.STRING
         })).find(id);
     return (String) state[0];
   }
 
   public final String getServer(final String id, String user) throws BasicException {
-        Object[] server = (Object[]) new StaticSentence(s
+    Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
-            , "SELECT appuser FROM sharedtickets WHERE ID = ?"
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-            , SerializerWriteString.INSTANCE
-            , new SerializerReadBasic(new Datas[] {
             Datas.STRING
         })).find(id);
     return (String) server[0];

src/main/java/com/unicenta/pos/sales/JPanelTicket.java

@@ -74,7 +74,6 @@ import java.util.*;
 
 import static java.awt.Window.getWindows;
 
-
 /**
  * @author JG uniCenta
  */
@@ -155,7 +154,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
   private Integer oCount = 0;
   private Boolean pinOK;
 
-
   /**
    * Creates new form JTicketView
    */
@@ -182,8 +180,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers");
     dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts");
 
-
+    /*
-    /* uniCenta Feb 2018
+     * uniCenta Feb 2018
      * Changed for 4.3
      * Set up main toolbar area with two rows to add cater for additional scripts
      * else over-crowding and some dynamic buttons off screen/not visible
@@ -191,7 +189,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
      * Resources>Menu.Root
      */
 
-// Set Configuration>General>Tickets toolbar simple : standard : restaurant option
+    // Set Configuration>General>Tickets toolbar simple : standard : restaurant
+    // option
     m_ticketsbag = getJTicketsBag();
     m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START);
     add(m_ticketsbag.getNullComponent(), "null");
@@ -327,7 +326,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       }
     }
 
-
   }
 
   @Override
@@ -512,7 +510,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     m_oTicketExt = oTicketExt;
 
     if (m_oTicket != null) {
-      m_oTicket.setUser(m_App.getAppUserView().getUser().getUserInfo());
+      m_oTicket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
       m_oTicket.setActiveCash(m_App.getActiveCashIndex());
       m_oTicket.setDate(new Date());
 
@@ -818,10 +816,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
     // if (m_App.getProperties().getProperty("override.check").equals("true")) {
     if (!m_oTicket.getLine(i).getUpdated()) {
-      JOptionPane.showMessageDialog(this
+      JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.deletelinesent"),
-              , AppLocal.getIntString("message.deletelinesent")
+          AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
-              , AppLocal.getIntString("label.deleteline")
-              , JOptionPane.WARNING_MESSAGE);
     } else {
       if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) {
         String ticketID = Integer.toString(m_oTicket.getTicketId());
@@ -835,8 +831,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                 m_oTicket.getLine(i).getProductID(),
                 m_oTicket.getLine(i).getProductName(),
                 m_oTicket.getLine(i).getMultiply()
-                }
+            });
-        );
 
         if (m_oTicket.getLine(i).isProductCom()) {
           m_oTicket.removeLine(i);
@@ -846,8 +841,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
             if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) {
               int input = JOptionPane.showConfirmDialog(this,
-                      AppLocal.getIntString("message.deletelineyes")
+                  AppLocal.getIntString("message.deletelineyes"), AppLocal.getIntString("label.deleteline"),
-                      , AppLocal.getIntString("label.deleteline"), JOptionPane.YES_NO_OPTION);
+                  JOptionPane.YES_NO_OPTION);
 
               if (input == 0) {
                 m_oTicket.removeLine(i);
@@ -855,8 +850,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
             } else {
               JOptionPane.showMessageDialog(this,
-                      AppLocal.getIntString("message.deletelineno")
+                  AppLocal.getIntString("message.deletelineno"), AppLocal.getIntString("label.deleteline"),
-                      , AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
+                  JOptionPane.WARNING_MESSAGE);
             }
           } else {
             m_oTicket.removeLine(i);
@@ -911,7 +906,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     return dValue / (1.0 + dTaxRate);
   }
 
-
   private double getInputValue() {
     try {
       return Double.parseDouble(m_jPrice.getText());
@@ -1073,9 +1067,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
         } else if (sCode.startsWith(";")) {
           stateToZero();
 
-
           // START OF BARCODE PARSING
-          /*  This block is deliberately verbose and is base for future scanner handling
+          /*
+           * This block is deliberately verbose and is base for future scanner handling
            * Some scanners inject a CR+LF... some don't...
            * stateTransition() must allow for this as these add characters to .length()
            * First 3 digits are GS1 CountryCode OR Retailer internal use
@@ -1169,8 +1163,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
 
               TaxInfo tax = taxeslogic // get the TaxRate for the product
-                      .getTaxInfo(oProduct.getTaxCategoryID()
+                  .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer()); // calculate if ticket has a
-                              , m_oTicket.getCustomer());                         // calculate if ticket has a Customer
+                                                                                     // Customer
 
               switch (sVariableTypePrefix) {
                 // PRICE - Assign var's
@@ -1179,32 +1173,28 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                       / (1.0 + tax.getRate()); // selling price with tax
                   dUnits = (Double.parseDouble(sVariableNum)
                       / 100) / oProduct.getPriceSellTax(tax); // Units as proportion of selling price
-                  oProduct.setProperty("product.price"
+                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell())); // push to screen
-                          , Double.toString(oProduct.getPriceSell())); // push to screen
                   break;
                 case "20": // as above
                   dPriceSell = oProduct.getPriceSellTax(tax)
                       / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                       / 100) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price"
+                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSellTax(tax)));
-                          , Double.toString(oProduct.getPriceSellTax(tax)));
                   break;
                 case "21":
                   dPriceSell = oProduct.getPriceSellTax(tax)
                       / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                       / 10) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price"
+                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
-                          , Double.toString(oProduct.getPriceSell()));
                   break;
                 case "22":
                   dPriceSell = oProduct.getPriceSellTax(tax)
                       / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                       / 1) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price"
+                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
-                          , Double.toString(oProduct.getPriceSell()));
                   break;
 
                 // WEIGHT - Assign variable to Unit
@@ -1212,28 +1202,22 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                   weight = Double.parseDouble(sVariableNum)
                       / 1000; // 3 decimals = 01.049 kg
                   dUnits = weight; // which represents 1gramme Units
-                  oProduct.setProperty("product.weight"
+                  oProduct.setProperty("product.weight", Double.toString(weight));
-                          , Double.toString(weight));
+                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
-                  oProduct.setProperty("product.price"
-                          , Double.toString(dPriceSell));
                   break;
                 case "24":
                   weight = Double.parseDouble(sVariableNum)
                       / 100; // 2 decimals = 010.49 kg
                   dUnits = weight; // which represents 10gramme Units
-                  oProduct.setProperty("product.weight"
+                  oProduct.setProperty("product.weight", Double.toString(weight));
-                          , Double.toString(weight));
+                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
-                  oProduct.setProperty("product.price"
-                          , Double.toString(dPriceSell));
                   break;
                 case "25":
                   weight = Double.parseDouble(sVariableNum)
                       / 10; // 1 decimal = 0104.9 kg
                   dUnits = weight; // which represents 100gramme Units
-                  oProduct.setProperty("product.weight"
+                  oProduct.setProperty("product.weight", Double.toString(weight));
-                          , Double.toString(weight));
+                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
-                  oProduct.setProperty("product.price"
-                          , Double.toString(dPriceSell));
                   break;
 
                 /*
@@ -1241,27 +1225,25 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                  * Use this section to add more case statements but these are not mandatory
                  * If you have your own internal or other barcode schema then...
                  * Example:
-        case "28":
+                 * case "28":
-        {
+                 * {
-        // price has tax. Remove it from sPriceSell
+                 * // price has tax. Remove it from sPriceSell
-            TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
+                 * TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(),
-            dPriceSell /= (1.0 + tax.getRate());
+                 * m_oTicket.getCustomer());
-            oProduct.setProperty("product.price", Double.toString(dPriceSell));
+                 * dPriceSell /= (1.0 + tax.getRate());
-            weight = -1.0;
+                 * oProduct.setProperty("product.price", Double.toString(dPriceSell));
-        break;
+                 * weight = -1.0;
+                 * break;
                  */
                 default:
                   break;
               }
 
               if (m_jaddtax.isSelected()) {
-                addTicketLine(oProduct
+                addTicketLine(oProduct, dUnits // weight
-                        , dUnits //weight
                     , dPriceSell = oProduct.getPriceSellTax(tax));
               } else {
-                addTicketLine(oProduct
+                addTicketLine(oProduct, dUnits, dPriceSell);
-                        , dUnits
-                        , dPriceSell);
               }
             }
           } catch (BasicException eData) {
@@ -1270,14 +1252,15 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           }
 
           // UPC-A
-/* Note: if begins 02 then its a standard
+          /*
-// UPC-A max value limitation is 4 digit price
+           * Note: if begins 02 then its a standard
-// UPC-A Extended uses State digit to give 5 digit price
+           * // UPC-A max value limitation is 4 digit price
-// uniCenta oPOS does not support UPC-A Extended at this time
+           * // UPC-A Extended uses State digit to give 5 digit price
-// Identifier   Prod    State   Cost    CheckCode
+           * // uniCenta oPOS does not support UPC-A Extended at this time
-// I            PPPPP   S       CCCC    K
+           * // Identifier Prod State Cost CheckCode
-// 1            23456   7       8901    2
+           * // I PPPPP S CCCC K
-
+           * // 1 23456 7 8901 2
+           * 
            * 0 = Standard UPC number (must have a zero to do zero-suppressed numbers)
            * 1 = Reserved
            * 2 = Random-weight items (fruits, vegetables, meats, etc.)
@@ -1295,8 +1278,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
             && (sCode.length() == 12)) {
 
           try {
-            ProductInfoExt oProduct
+            ProductInfoExt oProduct = dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
-                    = dlSales.getProductInfoByUShortCode(sCode);            // Return only UPC product
 
             if (oProduct == null) {
               Toolkit.getDefaultToolkit().beep();
@@ -1313,8 +1295,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               String sVariableNum = sCode.substring(7, 11); // grab the value from the code only using 4 digit price
 
               TaxInfo tax = taxeslogic // get the TaxRate for the product
-                      .getTaxInfo(oProduct.getTaxCategoryID()
+                  .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
-                              , m_oTicket.getCustomer());
 
               if (oProduct.getPriceSell() != 0.0) { // we have a weight barcode
                 weight = Double.parseDouble(sVariableNum) / 100; // 2 decimals (e.g. 10.49 kg)
@@ -1336,13 +1317,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
 
               if (m_jaddtax.isSelected()) {
-                addTicketLine(oProduct
+                addTicketLine(oProduct, dUnits, dPriceSell);
-                        , dUnits
-                        , dPriceSell);
               } else {
-                addTicketLine(oProduct
+                addTicketLine(oProduct, dUnits, dPriceSell / (1.0 + tax.getRate()));
-                        , dUnits
-                        , dPriceSell / (1.0 + tax.getRate()));
               }
             }
           } catch (BasicException eData) {
@@ -1395,7 +1372,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans));
         }
 
-
       } else if (cTrans == '.'
           && m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) {
         m_jPrice.setText("0.");
@@ -1785,7 +1761,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
-
   private Window getActiveWindow() {
     for (Window window : getWindows()) {
       if (window instanceof JRootFrame) {
@@ -1834,7 +1809,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
             ticket.setPayments(paymentdialog.getSelectedPayments());
 
-            ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
+            ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
             ticket.setActiveCash(m_App.getActiveCashIndex());
             ticket.setDate(new Date());
 
@@ -1849,17 +1824,22 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                 m_config.setLastTicket(lastTicketNumber, lastTicketType);
 
               } catch (BasicException eData) {
-                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"), eData);
+                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"),
+                    eData);
                 msg.show(this);
               } catch (IOException ex) {
                 log.error(ex.getMessage());
               }
 
-              if (m_config.getProperty("till.digital-receipt") != null && m_config.getProperty("till.digital-receipt").equals("true")){
+              if (m_config.getProperty("till.digital-receipt") != null
+                  && m_config.getProperty("till.digital-receipt").equals("true")) {
                 log.debug("Send digital receipt");
                 String xml = dlSystem.getResourceAsXML("Printer.Ticket");
                 new Application().sendReceipt(ticket, xml, getActiveWindow());
               }
+              // this is where we trigger the efr integration
+              //
+              //
 
               executeEvent(ticket, ticketext, "ticket.close",
                   new ScriptArg("print", paymentdialog.isPrintSelected()));
@@ -1873,7 +1853,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
               if ("restaurant".equals(m_App.getProperties()
                   .getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) {
-                /* Deliberately Explicit to allow for reassignments - future
+                /*
+                 * Deliberately Explicit to allow for reassignments - future
                  * even though we could do a single SQL statment sweep for reset
                  */
                 restDB.clearCustomerNameInTable(ticketext.toString());
@@ -1932,7 +1913,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     return (tmpPickupId);
   }
 
-
   private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) {
 
     String sresource = dlSystem.getResourceAsXML(sresourcename);
@@ -2032,7 +2012,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
         }
       }
 
-
       Map reportparams = new HashMap();
 
       try {
@@ -2045,7 +2024,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       reportfields.put("TICKET", ticket);
       reportfields.put("PLACE", ticketext);
 
-      JasperPrint jp = JasperFillManager.fillReport(jr, reportparams, new JRMapArrayDataSource(new Object[]{reportfields}));
+      JasperPrint jp = JasperFillManager.fillReport(jr, reportparams,
+          new JRMapArrayDataSource(new Object[] { reportfields }));
 
       PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername"));
 
@@ -2124,7 +2104,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
-
   private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) {
 
     String resource = m_jbtnconfig.getEvent(eventkey);
@@ -2263,7 +2242,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           "<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" +
           "<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>";
 
-
       JFrame frame = new JFrame();
       JOptionPane.showMessageDialog(frame,
           content,
@@ -2367,14 +2345,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
-
   /**
    * This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the FormEditor.
    */
-  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
     m_jPanContainer = new javax.swing.JPanel();
@@ -2401,7 +2379,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     jCheckStock = new javax.swing.JButton();
     m_jPanelCentral = new javax.swing.JPanel();
     jPanel4 = new javax.swing.JPanel();
-    filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 32767));
+    filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0),
+        new java.awt.Dimension(5, 32767));
     m_jTicketId = new javax.swing.JLabel();
     m_jPanTotals = new javax.swing.JPanel();
     m_jLblTotalEuros3 = new javax.swing.JLabel();
@@ -2546,26 +2525,32 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
         m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(m_jButtonsLayout.createSequentialGroup()
                 .addContainerGap()
-                            .addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE,
+                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE,
+                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
-    );
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
     m_jButtonsLayout.setVerticalGroup(
         m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(m_jButtonsLayout.createSequentialGroup()
                 .addGap(5, 5, 5)
                 .addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                                    .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE,
-                                    .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                    .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING,
-                                    .addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING,
-    );
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
 
     m_jPanelBag.add(m_jButtons);
 
@@ -2808,7 +2793,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N
     m_jPrice.setForeground(new java.awt.Color(76, 197, 237));
     m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-    m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
+    m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(
+        javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)),
+        javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
     m_jPrice.setOpaque(true);
     m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25));
     m_jPrice.setRequestFocusEnabled(false);
@@ -2858,36 +2845,46 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
             .addGroup(jPanel9Layout.createSequentialGroup()
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                     .addComponent(m_jPor)
-                                    .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPanel9Layout.createSequentialGroup()
-                                            .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addGap(7, 7, 7)
-                                            .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128,
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
                     .addGroup(jPanel9Layout.createSequentialGroup()
-                                            .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addGap(5, 5, 5)))
-                            .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71,
-                            .addContainerGap())
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
-    );
+                .addContainerGap()));
     jPanel9Layout.setVerticalGroup(
         jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel9Layout.createSequentialGroup()
-                            .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(0, 0, Short.MAX_VALUE))
             .addGroup(jPanel9Layout.createSequentialGroup()
-                            .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44,
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING,
-                                    .addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                        javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE)))
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
                 .addComponent(m_jPor)
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
-                            .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-    );
+                .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1,
+                    javax.swing.GroupLayout.PREFERRED_SIZE)));
 
     m_jPanEntries.add(jPanel9);
 
@@ -3298,8 +3295,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer();
       if (dialog.getSelectedCustomer() != null) {
         try {
-          m_oTicket.setCustomer(dlSales.loadCustomerExt
+          m_oTicket.setCustomer(dlSales.loadCustomerExt(dialog.getSelectedCustomer().getId()));
-                  (dialog.getSelectedCustomer().getId()));
         } catch (BasicException ex) {
           log.error(ex.getMessage());
         }
@@ -3317,11 +3313,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
         if (finder.getSelectedCustomer() != null) {
           try {
-            m_oTicket.setCustomer(dlSales.loadCustomerExt
+            m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
-                    (finder.getSelectedCustomer().getId()));
             if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
-              restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
+              restDB.setCustomerNameInTableByTicketId(
-                      (finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
+                  dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
             }
 
             checkCustomer();
@@ -3352,11 +3347,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
           if (finder.getSelectedCustomer() != null) {
             try {
-              m_oTicket.setCustomer(dlSales.loadCustomerExt
+              m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
-                      (finder.getSelectedCustomer().getId()));
               if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
-                restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
+                restDB.setCustomerNameInTableByTicketId(
-                        (finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
+                    dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
               }
 
               checkCustomer();
@@ -3432,9 +3426,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
   private javax.swing.JButton m_jbtnScale;
   // End of variables declaration//GEN-END:variables
 
-/* Remote Orders Display
+  /*
-    We only know about uniCenta oPOS orders and won't try and handle any
+   * Remote Orders Display
-    that are injected from an external source
+   * We only know about uniCenta oPOS orders and won't try and handle any
+   * that are injected from an external source
    */
 
   public void remoteOrderDisplay() {
@@ -3492,29 +3487,23 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           }
         }
 
-        dlSystem.addOrder(getPickupString(m_oTicket)
+        dlSystem.addOrder(getPickupString(m_oTicket), (int) m_oTicket.getLine(i).getMultiply(),
-                , (int) m_oTicket.getLine(i).getMultiply()
+            m_oTicket.getLine(i).getProductName(), m_oTicket.getLine(i).getProductAttSetInstDesc(),
-                , m_oTicket.getLine(i).getProductName()
+            m_oTicket.getLine(i).getProperty("notes"), id, null, display, null, null);
-                , m_oTicket.getLine(i).getProductAttSetInstDesc()
-                , m_oTicket.getLine(i).getProperty("notes")
-                , id
-                , null
-                , display
-                , null
-                , null);
 
-/* this block for future - right now we're deleting all ticketlines
+        /*
-    and resending for consistency with actual ticketlines
+         * this block for future - right now we're deleting all ticketlines
-                dlSystem.updateOrder(getPickupString(m_oTicket)
+         * and resending for consistency with actual ticketlines
-                        , (int) m_oTicket.getLine(i).getMultiply()
+         * dlSystem.updateOrder(getPickupString(m_oTicket)
-                        , m_oTicket.getLine(i).getProductName()
+         * , (int) m_oTicket.getLine(i).getMultiply()
-                        , m_oTicket.getLine(i).getProductAttSetInstDesc()
+         * , m_oTicket.getLine(i).getProductName()
-                        , m_oTicket.getLine(i).getProperty("notes")
+         * , m_oTicket.getLine(i).getProductAttSetInstDesc()
-                        , id
+         * , m_oTicket.getLine(i).getProperty("notes")
-                        , null
+         * , id
-                        , display
+         * , null
-                        , null
+         * , display
-                        , null);
+         * , null
+         * , null);
          */
 
       } catch (BasicException ex) {

src/main/java/com/unicenta/pos/sales/restaurant/JTicketsBagRestaurantMap.java

@@ -74,7 +74,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
   private DataLogicSales dlSales = null;
   private DataLogicSystem dlSystem = null;
   private final RestaurantDBUtils restDB;
-    private static final Icon ICO_OCU_SM = new ImageIcon(Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
+  private static final Icon ICO_OCU_SM = new ImageIcon(
+      Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
   private static final Icon ICO_WAITER = new NullIcon(1, 1);
   private static final Icon ICO_FRE = new NullIcon(22, 22);
   private String waiterDetails;
@@ -87,10 +88,12 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
   private AppView m_app;
   private Boolean showLayout = false;
 
-        
+  /**
-    /** Creates new form JTicketsBagRestaurant
+   * Creates new form JTicketsBagRestaurant
+   * 
    * @param app
-     * @param panelticket */
+   * @param panelticket
+   */
 
   public JTicketsBagRestaurantMap(AppView app, TicketsEditor panelticket) {
 
@@ -217,8 +220,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
             pl.setY(newY);
           }
         }
-            }
+      });
-            );
 
       pl.getButton().addActionListener(new MyActionListener(pl));
     }
@@ -418,10 +420,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
           m_PlaceCurrent = null;
 
         } else {
-                    JOptionPane.showMessageDialog(null
+          JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticketlockoverriden"),
-                        , AppLocal.getIntString("message.sharedticketlockoverriden")
+              AppLocal.getIntString("title.editor"), JOptionPane.INFORMATION_MESSAGE);
-                        , AppLocal.getIntString("title.editor")
-                        , JOptionPane.INFORMATION_MESSAGE);                        
         }
       } catch (BasicException ex) {
         log.error(ex.getMessage());
@@ -598,7 +598,8 @@ Integer count = restDB.getGuestsInTable(place.getId());
                 place.getButton().setIcon((Boolean.parseBoolean(
                     m_App.getProperties().getProperty("table.showwaiterdetails"))
                     && (restDB.getCustomerNameInTable(place.getName()) != null))
-                                        ? ICO_WAITER:ICO_OCU_SM);
+                        ? ICO_WAITER
+                        : ICO_OCU_SM);
                 if (m_App.getProperties().getProperty("table.customercolour") == null) {
                   customerDetails = (restDB.getCustomerNameInTable(place.getName()) == null) ? ""
                       : "<style=font-size:9px;font-weight:bold;><font color = blue>"
@@ -646,12 +647,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
         // places here
 
       } else {
-                m_jText.setText(AppLocal.getIntString("label.restaurantcustomer"
+        m_jText.setText(AppLocal.getIntString("label.restaurantcustomer", new Object[] {
-                        , new Object[] {
             customer.getName()
-                        }
+        }));
-                )
-                );
 
         m_aplaces.stream()
             .forEach((place) -> {
@@ -660,11 +658,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
         m_jbtnReservations.setEnabled(false);
       }
     } else {
-            m_jText.setText(AppLocal.getIntString("label.restaurantmove"
+      m_jText.setText(AppLocal.getIntString("label.restaurantmove", new Object[] {
-                    , new Object[] {
           m_PlaceClipboard.getName()
-                }
+      }));
-            ));
 
       m_aplaces.stream()
           .forEach((place) -> {
@@ -709,9 +705,11 @@ Integer count = restDB.getGuestsInTable(place.getId());
   private class MyActionListener implements ActionListener {
 
     private final Place m_place;
+
     public MyActionListener(Place place) {
       m_place = place;
     }
+
     @Override
     public void actionPerformed(ActionEvent evt) {
       m_App.getAppUserView().getUser();
@@ -723,7 +721,7 @@ Integer count = restDB.getGuestsInTable(place.getId());
           TicketInfo ticket = getTicketInfo(m_place);
           if (ticket == null) { // It's an empty table
             ticket = new TicketInfo();
-                            ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
+            ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
             try {
               dlReceipts.insertSharedTicket(m_place.getId(), ticket, ticket.getPickupId());
             } catch (BasicException e) {
@@ -742,10 +740,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
                     AppLocal.getIntString("message.sharedticketlock"));
 
                 if (m_App.getAppUserView().getUser().hasPermission("sales.Override")) { // Override it
-                                        int res = JOptionPane.showConfirmDialog(null
+                  int res = JOptionPane.showConfirmDialog(null,
-                                            , AppLocal.getIntString("message.sharedticketlockoverride")
+                      AppLocal.getIntString("message.sharedticketlockoverride"), AppLocal.getIntString("title.editor"),
-                                            , AppLocal.getIntString("title.editor")
+                      JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-                                            , JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
 
                   if (res == JOptionPane.YES_OPTION) {
                     m_place.setPeople(true);
@@ -766,10 +763,8 @@ Integer count = restDB.getGuestsInTable(place.getId());
                   m_lockState = "locked";
                   setActivePlace(m_place, ticket);
                 } else {
-                                        JOptionPane.showMessageDialog(null
+                  JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticket"),
-                                            , AppLocal.getIntString("message.sharedticket")
+                      AppLocal.getIntString("title.editor"), JOptionPane.OK_OPTION);
-                                            , AppLocal.getIntString("title.editor")
-                                            , JOptionPane.OK_OPTION);
                 }
               }
             } catch (BasicException ex) {
@@ -891,14 +886,14 @@ Integer count = restDB.getGuestsInTable(place.getId());
     m_PlaceClipboard.setButtonText(btnText);
   }
 
-    
+  /**
-    
+   * This method is called from within the constructor to
-    /** This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
     m_jPanelMap = new javax.swing.JPanel();
@@ -1069,7 +1064,6 @@ Integer count = restDB.getGuestsInTable(place.getId());
     });
   }// GEN-LAST:event_m_jbtnSaveActionPerformed
 
-    
   // Variables declaration - do not modify//GEN-BEGIN:variables
   private javax.swing.JPanel jPanel1;
   private javax.swing.JPanel jPanel2;

src/main/java/com/unicenta/pos/ticket/TicketInfo.java

@@ -55,27 +55,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
 
-    private String m_sHost;
+  private String host;
-    private String m_sId;
+  private String id;
-    private int tickettype;
+  private int ticketType;
-    private int m_iTicketId;
+  private int ticketId;
-    private int m_iPickupId;
+  private int pickupId;
-    private java.util.Date m_dDate;
+  private java.util.Date date;
   private Properties attributes;
-    private UserInfo m_User;
+  private UserInfo userInfo;
   private Double multiply;
-    private CustomerInfoExt m_Customer;
+  private CustomerInfoExt cutomerInfoExt;
-    private String m_sActiveCash;
+  private String activeCash;
-    private List<TicketLineInfo> m_aLines;
+  private List<TicketLineInfo> ticketLines;
   private List<PaymentInfo> payments;
   private List<TicketTaxInfo> taxes;
   private final String m_sResponse;
   private String loyaltyCardNumber;
   private Boolean oldTicket;
   private boolean tip;
-    private PaymentInfoTicket m_paymentInfo;
+  private PaymentInfoTicket ticketPaymentInfo;
-    private boolean m_isProcessed;
+  private boolean isProcessed;
-    private final String m_locked;
+  private final String locked;
   private Double nsum;
   private int ticketstatus;
 
@@ -91,15 +91,15 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   /** Creates new TicketModel */
   public TicketInfo() {
-        m_sId = UUID.randomUUID().toString();
+    id = UUID.randomUUID().toString();
-        tickettype = RECEIPT_NORMAL;
+    ticketType = RECEIPT_NORMAL;
-        m_iTicketId = 0; // incrementamos
+    ticketId = 0; // incrementamos
-        m_dDate = new Date();
+    date = new Date();
     attributes = new Properties();
-        m_User = null;
+    userInfo = null;
-        m_Customer = null;
+    cutomerInfoExt = null;
-        m_sActiveCash = null;
+    activeCash = null;
-        m_aLines = new ArrayList<>();
+    ticketLines = new ArrayList<>();
     payments = new ArrayList<>();
     taxes = null;
     m_sResponse = null;
@@ -109,35 +109,35 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
     config.load();
     tip = Boolean.valueOf(config.getProperty("machine.showTip"));
-        m_isProcessed = false;
+    isProcessed = false;
-        m_locked = null;
+    locked = null;
     ticketstatus = 0;
   }
 
   @Override
   public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeObject(m_sId);
+    out.writeObject(id);
-        out.writeInt(tickettype);
+    out.writeInt(ticketType);
-        out.writeInt(m_iTicketId);
+    out.writeInt(ticketId);
-        out.writeObject(m_Customer);
+    out.writeObject(cutomerInfoExt);
-        out.writeObject(m_dDate);
+    out.writeObject(date);
     out.writeObject(attributes);
-        out.writeObject(m_aLines);
+    out.writeObject(ticketLines);
 
     out.writeInt(ticketstatus);
   }
 
   @Override
   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        m_sId = (String) in.readObject();
+    id = (String) in.readObject();
-        tickettype = in.readInt();
+    ticketType = in.readInt();
-        m_iTicketId = in.readInt();
+    ticketId = in.readInt();
-        m_Customer = (CustomerInfoExt) in.readObject();
+    cutomerInfoExt = (CustomerInfoExt) in.readObject();
-        m_dDate = (Date) in.readObject();
+    date = (Date) in.readObject();
     attributes = (Properties) in.readObject();
-        m_aLines = (List<TicketLineInfo>) in.readObject();
+    ticketLines = (List<TicketLineInfo>) in.readObject();
-        m_User = null;
+    userInfo = null;
-        m_sActiveCash = null;
+    activeCash = null;
     payments = new ArrayList<>(); // JG June 2102 diamond inference
     taxes = null;
 
@@ -151,11 +151,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    */
   @Override
   public void readValues(DataRead dr) throws BasicException {
-        m_sId = dr.getString(1);
+    id = dr.getString(1);
-        tickettype = dr.getInt(2);
+    ticketType = dr.getInt(2);
-        m_iTicketId = dr.getInt(3);
+    ticketId = dr.getInt(3);
-        m_dDate = dr.getTimestamp(4);
+    date = dr.getTimestamp(4);
-        m_sActiveCash = dr.getString(5);
+    activeCash = dr.getString(5);
     try {
       byte[] img = dr.getBytes(6);
       if (img != null) {
@@ -163,9 +163,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
       }
     } catch (IOException e) {
     }
-        m_User = new UserInfo(dr.getString(7), dr.getString(8));
+    userInfo = new UserInfo(dr.getString(7), dr.getString(8));
-        m_Customer = new CustomerInfoExt(dr.getString(9));
+    cutomerInfoExt = new CustomerInfoExt(dr.getString(9));
-        m_aLines = new ArrayList<>();
+    ticketLines = new ArrayList<>();
     payments = new ArrayList<>();
     taxes = null;
 
@@ -177,69 +177,72 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    * @return
    */
   public TicketInfo copyTicket() {
-        TicketInfo t = new TicketInfo();
+    TicketInfo ticketInfo = new TicketInfo();
 
-        t.tickettype = tickettype;
+    ticketInfo.ticketType = ticketType;
-        t.m_iTicketId = m_iTicketId;
+    ticketInfo.ticketId = ticketId;
-        t.m_dDate = m_dDate;
+    ticketInfo.date = date;
-        t.m_sActiveCash = m_sActiveCash;
+    ticketInfo.activeCash = activeCash;
-        t.attributes = (Properties) attributes.clone();
+    ticketInfo.attributes = (Properties) attributes.clone();
-        t.m_User = m_User;
+    ticketInfo.userInfo = userInfo;
-        t.m_Customer = m_Customer;
+    ticketInfo.cutomerInfoExt = cutomerInfoExt;
 
-        t.m_aLines = new ArrayList<>(); // JG June 2102 diamond inference
+    ticketInfo.ticketLines = new ArrayList<>(); // JG June 2102 diamond inference
-        m_aLines.forEach((l) -> {
+    ticketLines.forEach((line) -> {
-            t.m_aLines.add(l.copyTicketLine());
+      ticketInfo.ticketLines.add(line.copyTicketLine());
     });
-        t.refreshLines();
+    ticketInfo.refreshLines();
 
-        t.payments = new LinkedList<>(); // JG June 2102 diamond inference
+    ticketInfo.payments = new LinkedList<>(); // JG June 2102 diamond inference
     payments.forEach((p) -> {
-            t.payments.add(p.copyPayment());
+      ticketInfo.payments.add(p.copyPayment());
     });
-        t.oldTicket=oldTicket;
+    ticketInfo.oldTicket = oldTicket;
     // taxes are not copied, must be calculated again.
 
-        t.ticketstatus = ticketstatus;
+    ticketInfo.ticketstatus = ticketstatus;
 
-        return t;
+    return ticketInfo;
   }
 
   public String getId() {
-        return m_sId;
+    return id;
   }
 
   public int getTicketType() {
-        return tickettype;
+    return ticketType;
   }
+
   public void setTicketType(int tickettype) {
-        this.tickettype = tickettype;
+    this.ticketType = tickettype;
   }
 
   public int getTicketId() {
-        return m_iTicketId;
+    return ticketId;
   }
+
   public void setTicketId(int iTicketId) {
-        m_iTicketId = iTicketId;
+    ticketId = iTicketId;
   }
 
   public int getTicketStatus() {
     return ticketstatus;
   }
+
   public void setTicketStatus(int ticketstatus) {
-        if (m_iTicketId >0) {
+    if (ticketId > 0) {
-            this.ticketstatus = m_iTicketId;
+      this.ticketstatus = ticketId;
     } else {
       this.ticketstatus = ticketstatus;
     }
   }
 
   public void setPickupId(int iTicketId) {
-        m_iPickupId = iTicketId;
+    pickupId = iTicketId;
   }
 
   public int getPickupId() {
-        return m_iPickupId;
+    return pickupId;
   }
 
   public String getName(Object info) {
@@ -251,23 +254,23 @@ public final class TicketInfo implements SerializableRead, Externalizable {
       name.add(nameprop);
     }
 
-        if (m_User != null) {
+    if (userInfo != null) {
-            name.add(m_User.getName());                        
+      name.add(userInfo.getName());
     }
 
     if (info == null) {
-            if (m_iTicketId == 0) {
+      if (ticketId == 0) {
-                name.add("(" + m_dateformat.format(m_dDate) + " " 
+        name.add("(" + m_dateformat.format(date) + " "
-                        + Long.toString(m_dDate.getTime() % 1000) + ")");                
+            + Long.toString(date.getTime() % 1000) + ")");
       } else {
-                name.add(Integer.toString(m_iTicketId));                
+        name.add(Integer.toString(ticketId));
       }
     } else {
       name.add(info.toString());
     }
 
-        if (m_Customer != null) {        
+    if (cutomerInfoExt != null) {
-            name.add(m_Customer.getName());            
+      name.add(cutomerInfoExt.getName());
     }
 
     return org.apache.commons.lang.StringUtils.join(name, " - ");
@@ -278,11 +281,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public java.util.Date getDate() {
-        return m_dDate;
+    return date;
   }
 
   public void setDate(java.util.Date dDate) {
-        m_dDate = dDate;
+    date = dDate;
   }
 
   public String getHost() {
@@ -294,27 +297,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     return machineHostname;
   }
 
-    public UserInfo getUser() {
+  public UserInfo getUserInfo() {
-        return m_User;
+    return userInfo;
   }
 
-    public void setUser(UserInfo value) {
+  public void setUserInfo(UserInfo value) {
-        m_User = value;
+    userInfo = value;
   }
 
   public CustomerInfoExt getCustomer() {
-        return m_Customer;
+    return cutomerInfoExt;
   }
 
   public void setCustomer(CustomerInfoExt value) {
-        m_Customer = value;
+    cutomerInfoExt = value;
   }
 
   public String getCustomerId() {
-        if (m_Customer == null) {
+    if (cutomerInfoExt == null) {
       return null;
     } else {
-            return m_Customer.getId();
+      return cutomerInfoExt.getId();
     }
   }
 
@@ -331,11 +334,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public void setActiveCash(String value) {
-        m_sActiveCash = value;
+    activeCash = value;
   }
 
   public String getActiveCash() {
-        return m_sActiveCash;
+    return activeCash;
   }
 
   public String getProperty(String key) {
@@ -355,45 +358,45 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public TicketLineInfo getLine(int index) {
-        return m_aLines.get(index);
+    return ticketLines.get(index);
   }
 
   public void addLine(TicketLineInfo oLine) {
-        oLine.setTicket(m_sId, m_aLines.size());
+    oLine.setTicket(id, ticketLines.size());
-        m_aLines.add(oLine);
+    ticketLines.add(oLine);
   }
 
   public void insertLine(int index, TicketLineInfo oLine) {
-        m_aLines.add(index, oLine);
+    ticketLines.add(index, oLine);
     refreshLines();
   }
 
   public void setLine(int index, TicketLineInfo oLine) {
-        oLine.setTicket(m_sId, index);
+    oLine.setTicket(id, index);
-        m_aLines.set(index, oLine);
+    ticketLines.set(index, oLine);
   }
 
   public void removeLine(int index) {
-        m_aLines.remove(index);
+    ticketLines.remove(index);
     refreshLines();
 
   }
 
   public void refreshLines() {
-        for (int i = 0; i < m_aLines.size(); i++) {
+    for (int i = 0; i < ticketLines.size(); i++) {
-            getLine(i).setTicket(m_sId, i);
+      getLine(i).setTicket(id, i);
     }
   }
 
   public int getLinesCount() {
-        return m_aLines.size();
+    return ticketLines.size();
   }
 
   public double getArticlesCount() {
     double dArticles = 0.0;
     TicketLineInfo oLine;
 
-        for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
+    for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
       oLine = i.next();
       dArticles += oLine.getMultiply();
     }
@@ -403,9 +406,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getSubTotal() {
     double sum = 0.0;
-        sum = m_aLines.stream().map((line) -> 
+    sum = ticketLines.stream().map((line) -> line.getSubValue()).reduce(sum,
-                line.getSubValue()).reduce(sum, (accumulator, _item) -> 
+        (accumulator, _item) -> accumulator + _item);
-                        accumulator + _item);
     return sum;
   }
 
@@ -418,9 +420,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         nsum = sum;
       }
     } else {
-            sum = m_aLines.stream().map((line) -> 
+      sum = ticketLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
-                    line.getTax()).reduce(sum, (accumulator, _item) -> 
-                            accumulator + _item);
     }
     return sum;
   }
@@ -437,10 +437,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getTotalPaid() {
     double sum = 0.0;
-        sum = payments.stream().filter((p) -> 
+    sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
-                (!"debtpaid".equals(p.getName()))).map((p) -> 
+        (accumulator, _item) -> accumulator + _item);
-                        p.getTotal()).reduce(sum, (accumulator, _item) -> 
-                                accumulator + _item);
     return sum;
   }
 
@@ -449,11 +447,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public List<TicketLineInfo> getLines() {
-        return m_aLines;
+    return ticketLines;
   }
 
   public void setLines(List<TicketLineInfo> l) {
-        m_aLines = l;
+    ticketLines = l;
   }
 
   public List<PaymentInfo> getPayments() {
@@ -493,7 +491,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public void setIsProcessed(boolean isP) {
-        m_isProcessed = isP;
+    isProcessed = isP;
   }
 
   public TicketTaxInfo getTaxLine(TaxInfo tax) {
@@ -512,7 +510,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     Map<String, TicketTaxInfo> m = new HashMap<>();
 
     TicketLineInfo oLine;
-        for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
+    for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
       oLine = i.next();
 
       TicketTaxInfo t = m.get(oLine.getTaxInfo().getId());
@@ -538,8 +536,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
     m_config = null;
 
-        if (m_iTicketId > 0) {
+    if (ticketId > 0) {
-            String tmpTicketId=Integer.toString(m_iTicketId);
+      String tmpTicketId = Integer.toString(ticketId);
       if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())) {
         if (receiptPrefix != null) {
           tmpTicketId = receiptPrefix + tmpTicketId;
@@ -559,19 +557,18 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String printDate() {
-        return Formats.TIMESTAMP.formatValue(m_dDate);
+    return Formats.TIMESTAMP.formatValue(date);
   }
 
   public String printUser() {
-        return m_User == null ? "" : m_User.getName();
+    return userInfo == null ? "" : userInfo.getName();
 
   }
 
   public String printHost() {
-        return m_sHost;
+    return host;
   }
 
-    
   // Added JDL 28.05.13 for loyalty card functions
 
   /**
@@ -598,11 +595,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String printCustomer() {
-        return m_Customer == null ? "" : m_Customer.getName();
+    return cutomerInfoExt == null ? "" : cutomerInfoExt.getName();
   }
 
   public String printPhone1() {
-        return m_Customer == null ? "" : m_Customer.getPhone1();
+    return cutomerInfoExt == null ? "" : cutomerInfoExt.getPhone1();
   }
 
   public String printArticlesCount() {
@@ -642,8 +639,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String getTicketHeaderFooterData(String data) {
-        AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
+    AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
-                , AppLocal.APP_ID + ".properties"));        
     m_config.load();
     String row = (m_config.getProperty("tkt." + data));
 

src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java

@@ -56,12 +56,15 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
 
   private double newprice = 0.0;
 
-    /** Creates new TicketLineInfo
+  /**
+   * Creates new TicketLineInfo
+   * 
    * @param productid
    * @param dMultiply
    * @param dPrice
    * @param tax
-     * @param props */
+   * @param props
+   */
   public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
     init(productid, null, dMultiply, dPrice, tax, props);
   }
@@ -79,6 +82,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
 
   /**
    * Example: Call from script.TotalDiscount event
+   * 
    * @param productid
    * @param productname
    * @param producttaxcategory
@@ -87,7 +91,8 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
    * @param dPrice
    * @param tax
    */
-    public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
+  public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
+      double dMultiply, double dPrice, TaxInfo tax) {
     Properties props = new Properties();
     props.setProperty("product.name", productname);
     props.setProperty("product.taxcategoryid", producttaxcategory);
@@ -98,6 +103,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
 
   /**
    * Example: Call from script.LineDiscount event
+   * 
    * @param productname
    * @param producttaxcategory
    * @param productprinter     //added to props as may introduce printer redirect
@@ -105,7 +111,8 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
    * @param dPrice
    * @param tax
    */
-    public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
+  public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
+      double dPrice, TaxInfo tax) {
 
     Properties props = new Properties();
     props.setProperty("product.name", productname);
@@ -208,7 +215,8 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
         line.tax, (Properties) line.attributes.clone());
   }
 
-    private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
+  private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
+      Properties attributes) {
 
     this.productid = productid;
     this.attsetinstid = attsetinstid;
@@ -306,31 +314,40 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public int getTicketLine() {
     return m_iLine;
   }
+
   // These are the Lookups
   public String getProductID() {
     return productid;
   }
+
   public String getProductCategoryID() {
     return (attributes.getProperty("product.categoryid"));
   }
+
   public String getProductAttSetId() {
     return attributes.getProperty("product.attsetid");
   }
+
   public String getProductAttSetInstId() {
     return attsetinstid;
   }
+
   public String getProductAttSetInstDesc() {
     return attributes.getProperty("product.attsetdesc", "");
   }
+
   public String getProductTaxCategoryID() {
     return (attributes.getProperty("product.taxcategoryid"));
   }
+
   public String getTicketUpdated() {
     return (attributes.getProperty("ticket.updated"));
   }
+
   public TaxInfo getTaxInfo() {
     return tax;
   }
+
   public void setTaxInfo(TaxInfo oTaxInfo) {
     tax = oTaxInfo;
   }
@@ -339,22 +356,28 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public String getProductName() {
     return attributes.getProperty("product.name");
   }
+
   public String getProductMemoDate() {
     return attributes.getProperty("product.memodate");
   }
+
   public double getPrice() {
     return price;
   }
+
   public double getMultiply() {
     return multiply;
   }
+
   public double getTaxRate() {
     return tax == null ? 0.0 : tax.getRate();
   }
+
   public double getNewPrice() {
     newprice = price * (1.0 + getTaxRate());
     return price;
   }
+
   public String getProductPrinter() {
     return attributes.getProperty("product.printer");
   }
@@ -367,9 +390,11 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public Properties getProperties() {
     return attributes;
   }
+
   public String getProperty(String key) {
     return attributes.getProperty(key);
   }
+
   public String getProperty(String key, String defaultvalue) {
     return attributes.getProperty(key, defaultvalue);
   }
@@ -378,9 +403,11 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public double getTax() {
     return price * multiply * getTaxRate();
   }
+
   public double getValue() {
     return price * multiply * (1.0 + getTaxRate());
   }
+
   public double getSubValue() {
     return price * multiply;
   }
@@ -389,21 +416,27 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public void setPrice(double dValue) {
     price = dValue;
   }
+
   public void setPriceTax(double dValue) {
     price = dValue / (1.0 + getTaxRate());
   }
+
   public void setMultiply(double dValue) {
     multiply = dValue;
   }
+
   public void setProperty(String key, String value) {
     attributes.setProperty(key, value);
   }
+
   public void setProductTaxCategoryID(String taxID) {
     attributes.setProperty("product.taxcategoryid", taxID);
   }
+
   public void setProductAttSetInstId(String value) {
     attsetinstid = value;
   }
+
   public void setProductAttSetInstDesc(String value) {
     if (value == null) {
       attributes.remove(value);
@@ -411,9 +444,11 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
       attributes.setProperty("product.attsetdesc", value);
     }
   }
+
   public void setTicketUpdated(String key, String value) {
     attributes.setProperty("ticket.updated", value);
   }
+
   public void setProductPrinter(String value) {
     if (value == null) {
       attributes.remove(value);
@@ -430,60 +465,79 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public String printReference() {
     return StringUtils.encodeXML(attributes.getProperty("product.reference"));
   }
+
   public String printCode() {
     return StringUtils.encodeXML(attributes.getProperty("product.code"));
   }
+
   public String printName() {
     return StringUtils.encodeXML(attributes.getProperty("product.name"));
   }
+
   public String printProductMemoDate() {
     return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
   }
+
   public String printPrice() {
     return Formats.CURRENCY.formatValue(getPrice());
   }
+
   public String printPriceTax() {
     return Formats.CURRENCY.formatValue(getPriceTax());
   }
+
   public String printMultiply() {
     return Formats.DOUBLE.formatValue(multiply);
   }
+
   public String printValue() {
     return Formats.CURRENCY.formatValue(getValue());
   }
+
   public String printTaxRate() {
     return Formats.PERCENT.formatValue(getTaxRate());
   }
+
   public String printSubValue() {
     return Formats.CURRENCY.formatValue(getSubValue());
   }
+
   public String printTax() {
     return Formats.CURRENCY.formatValue(getTax());
   }
+
   public String printTextTip() {
     return attributes.getProperty("product.texttip");
   }
+
   public String printPrinter() {
     return StringUtils.encodeXML(attributes.getProperty("product.printer"));
   }
+
   public boolean isProductCom() {
     return "true".equals(attributes.getProperty("product.com"));
   }
+
   public boolean isProductService() {
     return "true".equals(attributes.getProperty("product.service"));
   }
+
   public boolean isProductVprice() {
     return "true".equals(attributes.getProperty("product.vprice"));
   }
+
   public boolean isProductVerpatrib() {
     return "true".equals(attributes.getProperty("product.verpatrib"));
   }
+
   public boolean isProductWarranty() {
     return "true".equals(attributes.getProperty("product.warranty"));
   }
+
   public boolean getUpdated() {
     return "true".equals(attributes.getProperty("ticket.updated"));
   }
+
   public void setUpdated(Boolean value) {
     updated = value;
   }

src/main/java/com/unicenta/pos/voucher/VoucherInfo.java

@@ -24,9 +24,7 @@ import com.unicenta.data.loader.DataRead;
 import com.unicenta.data.loader.IKeyed;
 import com.unicenta.data.loader.SerializerRead;
 
-import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
 public class VoucherInfo implements IKeyed {
     private String id;
     private String voucherNumber;
@@ -42,7 +40,8 @@ public class VoucherInfo implements IKeyed {
         String voucherNumber, 
         String customerName,
         double amount, 
-      String status) {
+        String status) 
+    {
         this.id = id;
         this.voucherNumber = voucherNumber;
         this.customerName = customerName;
@@ -50,6 +49,7 @@ public class VoucherInfo implements IKeyed {
         this.status = status;
     }
       
+
     @Override
     public Object getKey() {
         return getId();
@@ -111,6 +111,7 @@ public class VoucherInfo implements IKeyed {
         this.amount = amount;
     }
     
+    
      @Override
     public String toString() {
         return voucherNumber;
@@ -131,25 +132,16 @@ public class VoucherInfo implements IKeyed {
     }
 
     public static SerializerRead getSerializerRead() {
-    return new SerializerRead() {
+        return new SerializerRead() 
+        {
             @Override
         public Object readValues(DataRead dr) throws BasicException {
-        VoucherInfo voucherInfo = null;
+            return new VoucherInfo(
-
-        try {
-          voucherInfo = new VoucherInfo(
                     dr.getString(1), 
                     dr.getString(2), 
                     dr.getString(3),
                     dr.getDouble(4),
                     dr.getString(5));            
-        } catch (Exception e) {
+        }};
-          log.error("Error reading voucher info: {}", e.getMessage());
-          log.error(dr.getString(2));
-        }
-
-        return voucherInfo;
-      }
-    };
     }    
 }