This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jmexico. See http://git.codelutin.com/jmexico.git commit f44b19ac07dacad56191aedb62f8d489165c9df1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jun 6 16:43:38 2015 +0200 Update headers, use codelutinpom 2.2 (refs #7192) --- .gitignore | 12 + jmexico-editor-demo/LICENSE.txt | 828 +++++++++++++++++---- jmexico-editor-demo/pom.xml | 4 +- .../src/license/THIRD-PARTY.properties | 8 +- jmexico-editor-demo/src/main/assembly/bin.xml | 15 +- .../editor/demo/MexicoEditorDemoUI.css | 15 +- .../editor/demo/MexicoEditorDemoUI.jaxx | 15 +- .../editor/demo/MexicoEditorDemoUIHandler.java | 15 +- .../editor/demo/MexicoEditorDemoUIModel.java | 15 +- .../editor/demo/RunMexicoEditorDemo.java | 15 +- .../src/main/resources/log4j.properties | 15 +- jmexico-editor-demo/src/site/rst/index.rst | 15 +- jmexico-editor-demo/src/site/site_fr.xml | 15 +- jmexico-editor/pom.xml | 2 +- .../reseaumexico/editor/AbstractScenarioModel.java | 16 +- .../fr/reseaumexico/editor/CloneScenarioModel.java | 14 +- .../fr/reseaumexico/editor/CloneScenarioPanel.css | 16 +- .../fr/reseaumexico/editor/CloneScenarioPanel.jaxx | 14 +- .../reseaumexico/editor/ExportScenarioModel.java | 16 +- .../fr/reseaumexico/editor/ExportScenarioPanel.css | 14 +- .../reseaumexico/editor/ExportScenarioPanel.jaxx | 16 +- .../editor/ImportScenarioListener.java | 14 +- .../reseaumexico/editor/ImportScenarioModel.java | 16 +- .../fr/reseaumexico/editor/ImportScenarioPanel.css | 14 +- .../reseaumexico/editor/ImportScenarioPanel.jaxx | 16 +- .../fr/reseaumexico/editor/InputDesignEditor.css | 16 +- .../fr/reseaumexico/editor/InputDesignEditor.jaxx | 15 +- .../editor/InputDesignEditorHandler.java | 15 +- .../editor/InputDesignEditorModel.java | 14 +- .../fr/reseaumexico/editor/InputDesignTable.java | 14 +- .../editor/MexicoDecoratorProvider.java | 15 +- .../reseaumexico/editor/RenameScenarioModel.java | 14 +- .../fr/reseaumexico/editor/RenameScenarioPanel.css | 16 +- .../reseaumexico/editor/RenameScenarioPanel.jaxx | 14 +- .../editor/factorValue/FactorValueCellEditor.java | 15 +- .../factorValue/FactorValueCellRenderer.java | 15 +- .../editor/factorValue/FactorValueEditor.jaxx | 15 +- .../factorValue/FactorValueEditorFactory.java | 15 +- jmexico-editor/src/main/resources/log4j.properties | 15 +- .../fr/reseaumexico/model/AbstractMexicoBean.java | 14 +- .../fr/reseaumexico/model/DateFormatFactory.java | 15 +- .../fr/reseaumexico/model/InputDesignImpl.java | 15 +- .../model/MexicoTechnicalException.java | 15 +- .../java/fr/reseaumexico/model/MexicoUtil.java | 15 +- .../fr/reseaumexico/model/MexicoXmlConstant.java | 15 +- .../java/fr/reseaumexico/model/ScenarioImpl.java | 15 +- .../model/event/InputDesignFactorEvent.java | 15 +- .../model/event/InputDesignScenarioEvent.java | 15 +- .../model/event/ScenarioFactorValueEvent.java | 15 +- .../model/parser/ExperimentDesignParser.java | 15 +- .../model/parser/InputDesignParser.java | 15 +- .../reseaumexico/model/parser/MexicoXmlParser.java | 15 +- .../model/parser/ScenarioCSVParser.java | 14 +- .../model/parser/ScenarioXmlParser.java | 14 +- .../fr/reseaumexico/model/parser/XmlParser.java | 15 +- .../model/writer/ExperimentDesignXmlWriter.java | 15 +- .../model/writer/InputDesignXmlWriter.java | 15 +- .../reseaumexico/model/writer/MexicoXmlWriter.java | 15 +- .../model/writer/ScenarioXmlWriter.java | 14 +- .../java/fr/reseaumexico/model/writer/XmlNode.java | 15 +- .../fr/reseaumexico/model/writer/XmlWriter.java | 15 +- jmexico-model/src/main/xmi/mexico.properties | 15 +- jmexico-model/src/site/rst/index.rst | 15 +- jmexico-model/src/site/site_fr.xml | 15 +- pom.xml | 56 +- src/site/resources/examples/experimentDesign.xml | 15 +- src/site/resources/examples/inputDesign.xml | 15 +- src/site/rst/index.rst | 15 +- src/site/site_fr.xml | 15 +- 69 files changed, 1115 insertions(+), 735 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f92d132 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +/.idea +/*/.idea +/target +/*/target/ +/*.iml +/*/*.iml +/*.ipr +/*/*.ipr +/*.iws +/*/*.iws +/*~ +/*/*~ \ No newline at end of file diff --git a/jmexico-editor-demo/LICENSE.txt b/jmexico-editor-demo/LICENSE.txt index 3f7b8b1..94a9ed0 100644 --- a/jmexico-editor-demo/LICENSE.txt +++ b/jmexico-editor-demo/LICENSE.txt @@ -1,166 +1,674 @@ - GNU LESSER GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser 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 -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. - + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/jmexico-editor-demo/pom.xml b/jmexico-editor-demo/pom.xml index 719d33b..642bede 100644 --- a/jmexico-editor-demo/pom.xml +++ b/jmexico-editor-demo/pom.xml @@ -96,6 +96,7 @@ <useUniqueVersions>true</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> @@ -150,7 +151,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> @@ -208,7 +209,6 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>1.3</version> <executions> <execution> <id>get-keystore</id> diff --git a/jmexico-editor-demo/src/license/THIRD-PARTY.properties b/jmexico-editor-demo/src/license/THIRD-PARTY.properties index 3a501ab..4617cd6 100644 --- a/jmexico-editor-demo/src/license/THIRD-PARTY.properties +++ b/jmexico-editor-demo/src/license/THIRD-PARTY.properties @@ -3,19 +3,17 @@ # Already used licenses in project : # - Apache Software License, version 1.1 # - BSD License -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - GNU General Public License version 3 +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - MIT License # - Public Domain # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jan 16 12:09:15 CET 2012 +#Sat Jun 06 16:41:59 CEST 2015 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 diff --git a/jmexico-editor-demo/src/main/assembly/bin.xml b/jmexico-editor-demo/src/main/assembly/bin.xml old mode 100755 new mode 100644 index 7961cb8..7b50084 --- a/jmexico-editor-demo/src/main/assembly/bin.xml +++ b/jmexico-editor-demo/src/main/assembly/bin.xml @@ -1,25 +1,22 @@ <!-- #%L JMexico :: Swing Editor Demo - - $Id$ - $HeadURL$ %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <assembly> diff --git a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css index c270c56..66bf1f6 100644 --- a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css +++ b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor Demo - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ #menuFile { diff --git a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx index 4e86500..ca7ad52 100644 --- a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx +++ b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx @@ -1,25 +1,22 @@ <!-- #%L JMexico :: Swing Editor Demo - - $Id$ - $HeadURL$ %% - Copyright (C) 2011 Réseau Mexico, Codelutin + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JFrame id='mainFrame' decorator='help' diff --git a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java index f9c8ff7..41e9290 100644 --- a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java +++ b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor Demo - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.editor.demo; diff --git a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java index bfd0b0f..a30fba7 100644 --- a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java +++ b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor Demo - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.editor.demo; diff --git a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java index 4319d62..3a6805c 100644 --- a/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java +++ b/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor Demo - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.editor.demo; diff --git a/jmexico-editor-demo/src/main/resources/log4j.properties b/jmexico-editor-demo/src/main/resources/log4j.properties index 9a7b351..c081dee 100644 --- a/jmexico-editor-demo/src/main/resources/log4j.properties +++ b/jmexico-editor-demo/src/main/resources/log4j.properties @@ -1,25 +1,22 @@ ### # #%L # JMexico :: Swing Editor Demo -# -# $Id$ -# $HeadURL$ # %% -# Copyright (C) 2011 Réseau Mexico, Codelutin +# Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin # %% # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the +# 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 Lesser Public License for more details. +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Lesser Public +# You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### # Global logging configuration diff --git a/jmexico-editor-demo/src/site/rst/index.rst b/jmexico-editor-demo/src/site/rst/index.rst index a8a7bef..546125a 100644 --- a/jmexico-editor-demo/src/site/rst/index.rst +++ b/jmexico-editor-demo/src/site/rst/index.rst @@ -1,25 +1,22 @@ .. - .. * #%L .. * JMexico :: Swing Editor Demo -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% -.. * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin +.. * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin .. * %% .. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the +.. * 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 Lesser Public License for more details. +.. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Lesser Public +.. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ====================== diff --git a/jmexico-editor-demo/src/site/site_fr.xml b/jmexico-editor-demo/src/site/site_fr.xml index 9a3f8e6..4b6e0d9 100644 --- a/jmexico-editor-demo/src/site/site_fr.xml +++ b/jmexico-editor-demo/src/site/site_fr.xml @@ -2,25 +2,22 @@ <!-- #%L JMexico :: Swing Editor Demo - - $Id$ - $HeadURL$ %% - Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> diff --git a/jmexico-editor/pom.xml b/jmexico-editor/pom.xml index 075b168..b673f76 100644 --- a/jmexico-editor/pom.xml +++ b/jmexico-editor/pom.xml @@ -119,7 +119,7 @@ <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java index 2025c1b..7542fa9 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/AbstractScenarioModel.java @@ -3,24 +3,22 @@ package fr.reseaumexico.editor; /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -68,4 +66,4 @@ public class AbstractScenarioModel<M extends AbstractScenarioModel> extends Abst model.setScenarios(getScenarios()); model.setSelectedScenario(getSelectedScenario()); } -} \ No newline at end of file +} diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java index 6f0e756..cd9ce13 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioModel.java @@ -3,24 +3,22 @@ package fr.reseaumexico.editor; /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.css b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.css index 44e55a3..b2ed2de 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.css +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.css @@ -1,24 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ #scenarioNameLabel { @@ -35,4 +33,4 @@ #selectedScenarioEditor { selectedItem:{model.getSelectedScenario()}; -} \ No newline at end of file +} diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.jaxx index 38204bb..f7c49c8 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/CloneScenarioPanel.jaxx @@ -1,24 +1,22 @@ <!-- #%L JMexico :: Swing Editor - $Id$ - $HeadURL$ %% - Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table id='panel' layout='{new BorderLayout()}'> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java index 4c9a1f5..eba686c 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioModel.java @@ -3,24 +3,22 @@ package fr.reseaumexico.editor; /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -72,4 +70,4 @@ public class ExportScenarioModel extends AbstractScenarioModel<ExportScenarioMod model.setExportDirectory(getExportDirectory()); model.setExportFilename(getExportFilename()); } -} \ No newline at end of file +} diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css index c50f6b2..ca86004 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.css @@ -1,24 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ #exportFilenameLabel { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx index 870c6a2..e5dc62f 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ExportScenarioPanel.jaxx @@ -1,24 +1,22 @@ <!-- #%L JMexico :: Swing Editor - $Id$ - $HeadURL$ %% - Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as + 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 Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table id='panel' layout='{new BorderLayout()}'> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java index b0de38d..9e800fe 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioListener.java @@ -1,24 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2013 Réseau Mexico, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java index 9fb0184..a6e28d2 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioModel.java @@ -3,24 +3,22 @@ package fr.reseaumexico.editor; /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -66,4 +64,4 @@ public class ImportScenarioModel extends AbstractScenarioModel<ImportScenarioMod model.setImportFile(getImportFile()); model.setScenarioName(getScenarioName()); } -} \ No newline at end of file +} diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css index 648aa56..c7bce53 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.css @@ -1,24 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ #scenarioNameLabel { diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx index 3658987..c7db942 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/ImportScenarioPanel.jaxx @@ -1,24 +1,22 @@ <!-- #%L JMexico :: Swing Editor - $Id$ - $HeadURL$ %% - Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as + 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 Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table id='panel' layout='{new BorderLayout()}'> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.css b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.css index 8a9d51f..066877a 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.css +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.css @@ -1,24 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ #inputDesignTable { @@ -59,4 +57,4 @@ #selectedScenarioEditor { selectedItem:{model.getSelectedScenario()}; -} \ No newline at end of file +} diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx index 457cfaf..1ef5d98 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditor.jaxx @@ -1,25 +1,22 @@ <!-- #%L JMexico :: Swing Editor - - $Id$ - $HeadURL$ %% - Copyright (C) 2011 Réseau Mexico, Codelutin, Tony Chemit + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel id='inputDesignEditor' layout='{new BorderLayout()}'> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java index 975136b..f720492 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.editor; diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java index d3c90f6..fe77375 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorModel.java @@ -3,24 +3,22 @@ package fr.reseaumexico.editor; /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTable.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTable.java index cbe56f4..44ee749 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTable.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTable.java @@ -7,24 +7,22 @@ import fr.reseaumexico.model.Factor; /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2014 Réseau Mexico, Codelutin, Eric Chatellier + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java index b0d496b..ba13617 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.editor; diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioModel.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioModel.java index a316fb2..f7ce3ca 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioModel.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioModel.java @@ -3,24 +3,22 @@ package fr.reseaumexico.editor; /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.css b/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.css index 8c7a4c1..c00b5f3 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.css +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.css @@ -1,24 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2014 Réseau Mexico, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ #scenarioNameLabel { @@ -35,4 +33,4 @@ #selectedScenarioEditor { selectedItem:{model.getSelectedScenario()}; -} \ No newline at end of file +} diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.jaxx index 074baab..a20d72e 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/RenameScenarioPanel.jaxx @@ -1,24 +1,22 @@ <!-- #%L JMexico :: Swing Editor - $Id: CloneScenarioPanel.jaxx 84 2012-10-07 11:38:35Z tchemit $ - $HeadURL: https://svn.codelutin.com/jmexico/trunk/jmexico-editor/src/main/java/fr/rese... $ %% - Copyright (C) 2014 Réseau Mexico, Codelutin, Tony Chemit + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table id='panel' layout='{new BorderLayout()}'> diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java index f2d279b..cf5720e 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.editor.factorValue; diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java index bd5274c..c02d2e8 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.editor.factorValue; diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditor.jaxx b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditor.jaxx index 5274e4e..51b32f6 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditor.jaxx +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditor.jaxx @@ -1,25 +1,22 @@ <!-- #%L JMexico :: Swing Editor - - $Id$ - $HeadURL$ %% - Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog abstract='true' diff --git a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java index c07b18e..86b0f78 100644 --- a/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java +++ b/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueEditorFactory.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.editor.factorValue; diff --git a/jmexico-editor/src/main/resources/log4j.properties b/jmexico-editor/src/main/resources/log4j.properties index e08b169..4f34b60 100644 --- a/jmexico-editor/src/main/resources/log4j.properties +++ b/jmexico-editor/src/main/resources/log4j.properties @@ -1,25 +1,22 @@ ### # #%L # JMexico :: Swing Editor -# -# $Id$ -# $HeadURL$ # %% -# Copyright (C) 2011 Réseau Mexico, Codelutin +# Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin # %% # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the +# 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 Lesser Public License for more details. +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Lesser Public +# You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### # Global logging configuration diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java b/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java index 9da4daa..112e860 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/AbstractMexicoBean.java @@ -3,24 +3,22 @@ package fr.reseaumexico.model; /* * #%L * JMexico :: Model - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java b/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java index f06321f..d32e57f 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/DateFormatFactory.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java b/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java index d99cc55..42c6426 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java index 8d969be..7749c5c 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoTechnicalException.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java index d64135f..b129e45 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoUtil.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java index 9f8acbb..6a18aa3 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/MexicoXmlConstant.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java b/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java index e8ed2dc..13c4bf2 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/ScenarioImpl.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java b/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java index b846ca9..c29fe78 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignFactorEvent.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.event; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java b/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java index 56f128e..ed2c746 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/event/InputDesignScenarioEvent.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.event; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java b/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java index bbce62b..425ec87 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/event/ScenarioFactorValueEvent.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.event; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java index e452d0f..720b526 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.parser; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java index 2235039..12db159 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.parser; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java index de6d5ca..c7d01aa 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/MexicoXmlParser.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.parser; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java index 70c186b..e2f3450 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java @@ -3,24 +3,22 @@ package fr.reseaumexico.model.parser; /* * #%L * JMexico :: Model - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2013 Réseau Mexico, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java index f835d90..31bd535 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioXmlParser.java @@ -3,24 +3,22 @@ package fr.reseaumexico.model.parser; /* * #%L * JMexico :: Model - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java index c3cf9d6..e2c066a 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/parser/XmlParser.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.parser; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java index 38c4d57..7a01552 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ExperimentDesignXmlWriter.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.writer; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java index abbad9e..6669dfc 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/InputDesignXmlWriter.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.writer; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java index 4ff60f1..4907f77 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/MexicoXmlWriter.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.writer; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java index 0eed8f5..6459de4 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/ScenarioXmlWriter.java @@ -3,24 +3,22 @@ package fr.reseaumexico.model.writer; /* * #%L * JMexico :: Model - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java index 791a7bb..26a2a9e 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlNode.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.writer; diff --git a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java index b288a4a..168ead3 100644 --- a/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java +++ b/jmexico-model/src/main/java/fr/reseaumexico/model/writer/XmlWriter.java @@ -1,25 +1,22 @@ /* * #%L * JMexico :: Model - * - * $Id$ - * $HeadURL$ * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin + * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.reseaumexico.model.writer; diff --git a/jmexico-model/src/main/xmi/mexico.properties b/jmexico-model/src/main/xmi/mexico.properties index d6d165b..18b7151 100644 --- a/jmexico-model/src/main/xmi/mexico.properties +++ b/jmexico-model/src/main/xmi/mexico.properties @@ -1,25 +1,22 @@ ### # #%L # JMexico :: Model -# -# $Id$ -# $HeadURL$ # %% -# Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin +# Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin # %% # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the +# 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 Lesser Public License for more details. +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Lesser Public +# You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### diff --git a/jmexico-model/src/site/rst/index.rst b/jmexico-model/src/site/rst/index.rst index 9ebd65c..d825e1b 100644 --- a/jmexico-model/src/site/rst/index.rst +++ b/jmexico-model/src/site/rst/index.rst @@ -1,25 +1,22 @@ .. - .. * #%L .. * JMexico :: Model -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% -.. * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin +.. * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin .. * %% .. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the +.. * 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 Lesser Public License for more details. +.. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Lesser Public +.. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - =============== diff --git a/jmexico-model/src/site/site_fr.xml b/jmexico-model/src/site/site_fr.xml index 826ec19..bf1f5a5 100644 --- a/jmexico-model/src/site/site_fr.xml +++ b/jmexico-model/src/site/site_fr.xml @@ -2,25 +2,22 @@ <!-- #%L JMexico :: Model - - $Id$ - $HeadURL$ %% - Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> diff --git a/pom.xml b/pom.xml index 201d868..62901ac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.2</version> + <artifactId>codelutinpom</artifactId> + <version>2.2</version> </parent> <groupId>fr.reseaumexico</groupId> @@ -17,7 +17,7 @@ <description> Implantation de la norme Mexico en Java (http://reseau-mexico.fr/). </description> - <url>http://maven-site.forge.codelutin.com/jmexico</url> + <url>http://jmexico.codelutin.com</url> <inceptionYear>2011</inceptionYear> <organization> <name>Code Lutin</name> @@ -53,24 +53,19 @@ </modules> <scm> - <connection> - scm:svn:https://svn.codelutin.com/jmexico/trunk - </connection> - <developerConnection> - scm:svn:https://svn.codelutin.com/jmexico/trunk - </developerConnection> - <url>https://forge.codelutin.com/projects/jmexico/repository/show/trunk</url> + <url>https://gitweb.codelutin.com/jmexico.git</url> + <connection>scm:git:http://git.codelutin.com/jmexico.git</connection> + <developerConnection>scm:git:https://git.codelutin.com/jmexico.git</developerConnection> </scm> <distributionManagement> <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> - <platform>codelutin.com</platform> <projectId>jmexico</projectId> <!-- libraries version --> @@ -124,6 +119,28 @@ <version>${swingXVersion}</version> </dependency> + <!-- Commons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.4</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -144,6 +161,19 @@ <version>2.0</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <!-- xml unit for tests --> <dependency> <groupId>xmlunit</groupId> diff --git a/src/site/resources/examples/experimentDesign.xml b/src/site/resources/examples/experimentDesign.xml index 9929bf7..705fb24 100644 --- a/src/site/resources/examples/experimentDesign.xml +++ b/src/site/resources/examples/experimentDesign.xml @@ -2,25 +2,22 @@ <!-- #%L JMexico - - $Id$ - $HeadURL$ %% - Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> diff --git a/src/site/resources/examples/inputDesign.xml b/src/site/resources/examples/inputDesign.xml index e0076c8..acdf935 100644 --- a/src/site/resources/examples/inputDesign.xml +++ b/src/site/resources/examples/inputDesign.xml @@ -2,25 +2,22 @@ <!-- #%L JMexico - - $Id$ - $HeadURL$ %% - Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index d4c14e2..15d0927 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -1,25 +1,22 @@ .. - .. * #%L .. * JMexico -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% -.. * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin +.. * Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin .. * %% .. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the +.. * 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 Lesser Public License for more details. +.. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Lesser Public +.. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ======= diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index bd02d21..74ecd87 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -2,25 +2,22 @@ <!-- #%L JMexico - - $Id$ - $HeadURL$ %% - Copyright (C) 2011 Réseau Mexico, Codelutin + Copyright (C) 2011 - 2015 Réseau Mexico, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the + 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.