diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9f4bb9f..5af7f30 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,11 +1,27 @@ + + + + + + + + + + + + - + + + + + diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_6_2.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_6_2.xml new file mode 100644 index 0000000..85823a2 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jfoenix_jfoenix_0_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_jfoenix_jfoenix_0_0_0_SNAPSHOT.xml new file mode 100644 index 0000000..48e0dee --- /dev/null +++ b/.idea/libraries/Maven__com_jfoenix_jfoenix_0_0_0_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5755a99..233a7f0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,8 @@ + + + - + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index d608dd7..4add186 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,8 @@ + + \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 300bd82..0000000 --- a/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are 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. - - 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. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - 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 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 work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero 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 Affero 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 Affero 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 Affero 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. - - jstudy - Copyright (C) 2019 Carlos Galindo - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - 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 AGPL, see -. diff --git a/jstudy.iml b/jstudy.iml index c33e5a0..1eedd5a 100644 --- a/jstudy.iml +++ b/jstudy.iml @@ -1,18 +1,17 @@ - + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 523e2c5..82539bd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,17 +4,21 @@ es.kauron.jstudy jstudy jar - 0.5.0 + 0.4.4 - Central Repository - https://repo.maven.apache.org/maven2 + jitpack.io + https://jitpack.io + + + Maven Snapshots + https://oss.sonatype.org/content/groups/public jstudy - http://gitlab.com/kauron/jstudy + http://maven.apache.org junit @@ -23,38 +27,42 @@ test - org.json - json - 20190722 + com.jfoenix + jfoenix + 0.0.0-SNAPSHOT - - - src/main/resources - false - - - src/main/resources-filtered - true - - + org.apache.maven.plugins maven-compiler-plugin - 3.8.1 1.8 1.8 + org.apache.maven.plugins maven-assembly-plugin + 2.6 + + + package + + single + + + + true es.kauron.jstudy.Main + + . + jar-with-dependencies diff --git a/src/main/java/es/kauron/jstudy/Main.java b/src/main/java/es/kauron/jstudy/Main.java index ced64cf..116bcd6 100644 --- a/src/main/java/es/kauron/jstudy/Main.java +++ b/src/main/java/es/kauron/jstudy/Main.java @@ -1,6 +1,6 @@ package es.kauron.jstudy; -import es.kauron.jstudy.model.AppPrefs; +import es.kauron.jstudy.model.AppConfig; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; @@ -12,12 +12,13 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception{ + AppConfig.load(); Parent root = FXMLLoader.load(Main.class.getResource("view/main.fxml")); primaryStage.setTitle("JStudy"); primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("img/icon.png"))); primaryStage.setScene(new Scene(root)); primaryStage.show(); - primaryStage.setOnHiding(event -> AppPrefs.save()); + primaryStage.setOnCloseRequest(event -> AppConfig.save()); } diff --git a/src/main/java/es/kauron/jstudy/controller/Controller.java b/src/main/java/es/kauron/jstudy/controller/Controller.java index 7874e2d..ba8c9a8 100644 --- a/src/main/java/es/kauron/jstudy/controller/Controller.java +++ b/src/main/java/es/kauron/jstudy/controller/Controller.java @@ -1,14 +1,10 @@ package es.kauron.jstudy.controller; import es.kauron.jstudy.Main; -import es.kauron.jstudy.model.AnsweredItem; -import es.kauron.jstudy.model.AppPrefs; import es.kauron.jstudy.model.TestItem; import javafx.application.Platform; -import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; -import javafx.collections.ListChangeListener; import javafx.event.ActionEvent; import javafx.event.Event; import javafx.event.EventHandler; @@ -16,83 +12,32 @@ import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; import javafx.scene.Parent; -import javafx.scene.control.Menu; -import javafx.scene.control.MenuBar; -import javafx.scene.control.MenuItem; import javafx.scene.control.*; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; -import javafx.scene.input.DragEvent; -import javafx.scene.input.TransferMode; import javafx.scene.layout.BorderPane; import javafx.stage.FileChooser; -import javafx.stage.Window; -import javafx.stage.WindowEvent; -import org.json.JSONArray; -import org.json.JSONObject; -import java.awt.*; -import java.io.*; -import java.net.HttpURLConnection; -import java.net.URI; +import java.io.File; +import java.io.IOException; import java.net.URL; -import java.nio.channels.Channels; -import java.nio.channels.ReadableByteChannel; -import java.util.List; import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; public class Controller implements Initializable { - private static final String PROJECT_URL = "https://gitlab.com/kauron/jstudy"; - @FXML private TabPane tabPane; @FXML private BorderPane root; - @FXML - private MenuItem menuCloseTab, menuSave, menuUndo, menuRedo; - - @FXML - private MenuBar menuBar; - - private final BooleanProperty tabIsTable = new SimpleBooleanProperty(false); - private final Map tabMap = new HashMap<>(); - private String updateURL, updateFileName; - private Tab theTest = null; + private BooleanProperty table = new SimpleBooleanProperty(false); + private Map tabMap = new HashMap<>(); @Override public void initialize(URL url, ResourceBundle resourceBundle) { - tabPane.getSelectionModel().selectedItemProperty().addListener((ob, o, n) -> { - if (theTest == o && AppPrefs.lockTabsOnTest.get()) { // optionally disallow switching from test - tabPane.getSelectionModel().select(o); - } else { // update if in table tab - tabIsTable.set(tabMap.get(n) != null); - menuCloseTab.setDisable(!n.isClosable()); - menuSave.disableProperty().unbind(); - menuUndo.disableProperty().unbind(); - menuRedo.disableProperty().unbind(); - menuSave.setDisable(!isTableTab(n) || ((TableController) tabMap.get(n)).saved.get()); - if (isTableTab(n)) - menuSave.disableProperty().bind(((TableController) tabMap.get(n)).saved); - if (isUndoTab(n)) { - menuUndo.disableProperty().bind(((UndoController) tabMap.get(n)).undoProperty.not()); - menuRedo.disableProperty().bind(((UndoController) tabMap.get(n)).redoProperty.not()); - } - } - }); - tabPane.getTabs().removeListener((ListChangeListener) c -> theTest = null); + tabPane.getSelectionModel().selectedItemProperty().addListener((ob, o, n) -> table.set(tabMap.get(n) != null)); Platform.runLater(() -> root.getScene().getWindow().setOnCloseRequest(event -> { for (Tab tab : tabPane.getTabs()) { EventHandler handler = tab.getOnCloseRequest(); - if (isTableTab(tab)) - ((TableController) tabMap.get(tab)).stopTimer(); - else if (isTestTab(tab)) - ((TestController) tabMap.get(tab)).stopTimer(); if (tab.isClosable() && handler != null) { tabPane.getSelectionModel().select(tab); handler.handle(event); @@ -101,115 +46,6 @@ public class Controller implements Initializable { } }) ); - // Do not show icons in the menu items of the main menu in macOS. - Platform.runLater(() -> { - if (System.getProperty("os.name").toLowerCase().startsWith("mac os x")) - for (Menu m : menuBar.getMenus()) - removeIcon(m); - }); - new Thread(this::checkUpdate).start(); - } - - private void removeIcon(Menu menu) { - menu.setGraphic(null); - for (MenuItem item : menu.getItems()) { - if (item instanceof Menu) { - removeIcon((Menu) item); - } else { - item.setGraphic(null); - } - } - } - - private boolean isTableTab(Tab tab) { - return tabMap.containsKey(tab) && tabMap.get(tab) instanceof TableController; - } - - private boolean isUndoTab(Tab tab) { - return tabMap.containsKey(tab) && tabMap.get(tab) instanceof UndoController; - } - - private boolean isTestTab(Tab tab) { - return tabMap.containsKey(tab) && tabMap.get(tab) instanceof TestController; - } - - @FXML - protected void onUndo(ActionEvent event) { - Tab tab = tabPane.getSelectionModel().getSelectedItem(); - if (isUndoTab(tab)) ((UndoController) tabMap.get(tab)).undo(); - } - - @FXML - protected void onRedo(ActionEvent event) { - Tab tab = tabPane.getSelectionModel().getSelectedItem(); - if (isUndoTab(tab)) ((UndoController) tabMap.get(tab)).redo(); - } - - private void checkUpdate() { - // Check new version via gitlab's REST API - String newVersion; - BufferedReader br; - try { - URL apiUrl = new URL("https://gitlab.com/api/v4/projects/9264549/releases"); - HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection(); - connection.setRequestMethod("GET"); - connection.setRequestProperty("Accept", "application/json"); - if (connection.getResponseCode() != 200) { - System.err.println("Error connecting to Gitlab API"); - } - br = new BufferedReader(new InputStreamReader(connection.getInputStream())); - } catch (IOException e) { - return; - } - String output = br.lines().collect(Collectors.joining()); - JSONArray tags = new JSONArray(output); - JSONObject latest = tags.getJSONObject(0); - newVersion = latest.getString("tag_name").substring(1); - if (!isNewVersion(AppPrefs.getVersion(), newVersion)) - return; - String desc = latest.getString("description"); - Matcher matcher = Pattern.compile("\\[(.*\\.jar)]" + - "\\((/uploads/.*/.*\\.jar)\\)").matcher(desc); - if (!matcher.find()) - return; - updateURL = matcher.group(2); - updateFileName = matcher.group(1); - // Ask user whether to update or not. - Platform.runLater(this::onUpdate); - } - - private void onUpdate() { - Optional res = new Alert(Alert.AlertType.INFORMATION, - "There is an update ready. Would you like to download it and open it?", - ButtonType.YES, ButtonType.NO).showAndWait(); - if (!res.isPresent() || !res.get().equals(ButtonType.YES)) - return; - try (InputStream inputStream = new URL(PROJECT_URL + updateURL).openStream(); - ReadableByteChannel readableByteChannel = Channels.newChannel(inputStream); - FileOutputStream fileOutputStream = new FileOutputStream(updateFileName)) { - fileOutputStream.getChannel().transferFrom(readableByteChannel, 0, Long.MAX_VALUE); - } catch (IOException e) { - return; - } - // Launch new version - try { - new ProcessBuilder("java", "-jar", updateFileName).start(); - } catch (IOException e) { - return; - } - onQuit(null); - } - - private boolean isNewVersion(String version, String newVersion) { - String[] o = version.split("\\."); - String[] n = newVersion.split("\\."); - for (int i = 0; i < o.length; i++) { - int a = Integer.parseInt(n[i]); - int b = Integer.parseInt(o[i]); - if (a != b) - return a > b; - } - return false; } @FXML @@ -229,7 +65,6 @@ public class Controller implements Initializable { dialog.getEditor().setPromptText("Table name"); dialog.setTitle("Creating new table"); dialog.setHeaderText("Please input a name for the new table"); - dialog.setGraphic(new ImageView(new Image(Main.class.getResource("img/Edit.png").toString()))); dialog.getDialogPane().setMinWidth(250); dialog.showAndWait(); dialog.setResultConverter(value -> value.getButtonData().equals(ButtonBar.ButtonData.OK_DONE) ? value.getText() : ""); @@ -242,58 +77,21 @@ public class Controller implements Initializable { private void onLoadAction(ActionEvent event) { FileChooser chooser = new FileChooser(); chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("JStudy file", "*.jsdb")); - if (AppPrefs.lastDir != null && AppPrefs.lastDir.exists()) chooser.setInitialDirectory(AppPrefs.lastDir); - List list = chooser.showOpenMultipleDialog(root.getScene().getWindow()); - if (list == null || list.isEmpty()) return; - AppPrefs.lastDir = list.get(0).getParentFile(); - if (list.size() > 1) { - ButtonType mergeBT = new ButtonType("Merge", ButtonBar.ButtonData.APPLY); - ButtonType openBT = new ButtonType("Open", ButtonBar.ButtonData.OK_DONE); - Alert alert = new Alert(Alert.AlertType.CONFIRMATION); - alert.getDialogPane().getButtonTypes().clear(); - alert.getDialogPane().getButtonTypes().addAll(mergeBT, openBT, ButtonType.CANCEL); - alert.setTitle("Opening files..."); - alert.setHeaderText("Several files have been opened"); - alert.setContentText("Merge files or open them separately?"); - - Optional result = alert.showAndWait(); - - if (result.isPresent() && result.get().equals(mergeBT)) { - List aux = new ArrayList<>(); - for (File file : list) { - aux.addAll(TestItem.loadFrom(file, TestItem.COLONS)); - } - tabPane.getTabs().add(createTableTab("Merge table", aux, null)); - tabPane.getSelectionModel().selectLast(); - } else if (result.isPresent() && result.get().equals(openBT)){ - for (File file : list) { - List aux = TestItem.loadFrom(file, TestItem.COLONS); - tabPane.getTabs().add(createTableTab(file.getName().substring(0, file.getName().lastIndexOf('.')), aux, file)); - } - } - } else { - File file = list.get(0); - List aux = TestItem.loadFrom(file, TestItem.COLONS); + File file = chooser.showOpenDialog(root.getScene().getWindow()); + if (file == null) return; + List aux = TestItem.loadFrom(file, TestItem.COLONS); + if (aux != null) { tabPane.getTabs().add(createTableTab(file.getName().substring(0, file.getName().lastIndexOf('.')), aux, file)); tabPane.getSelectionModel().selectLast(); } } - @FXML - private void onSaveAction(ActionEvent event) { - Tab tab = tabPane.getSelectionModel().getSelectedItem(); - if (isTableTab(tab)) - ((TableController) tabMap.get(tab)).onSaveAction(event); - } - @FXML private void onImportAction(ActionEvent event) { FileChooser chooser = new FileChooser(); chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Data files (.csv, .txt)", "*.csv", "*.txt")); - if (AppPrefs.lastDir != null) chooser.setInitialDirectory(AppPrefs.lastDir); File file = chooser.showOpenDialog(root.getScene().getWindow()); if (file == null) return; - AppPrefs.lastDir = file.getParentFile(); String separator; if (file.getName().matches(".*txt")) separator = TestItem.TAB; @@ -302,57 +100,27 @@ public class Controller implements Initializable { else separator = TestItem.COMMA; List aux = TestItem.loadFrom(file, separator); - tabPane.getTabs().add(createTableTab(file.getName().substring(0, file.getName().lastIndexOf('.')), aux, null)); - tabPane.getSelectionModel().selectLast(); + if (aux != null) { + tabPane.getTabs().add(createTableTab(file.getName().substring(0, file.getName().lastIndexOf('.')), aux, null)); + tabPane.getSelectionModel().selectLast(); + } } private Tab createTableTab(String name, List list, File file) { try { - final Tab tab = new Tab(name); + Tab tab = new Tab(name); FXMLLoader loader = new FXMLLoader(Main.class.getResource("view/table.fxml")); Parent tableRoot = loader.load(); - TableController tController = loader.getController(); - tController.setData(name, list, this, file); - tab.textProperty().bind(Bindings.format("%s%s", - Bindings.when(tController.saved).then("").otherwise("*"), - tController.name)); + ((TableController) loader.getController()).setData(list, this, file); tabMap.put(tab, loader.getController()); - MenuItem duplicate = new MenuItem("Duplicate table"); - duplicate.setOnAction(event -> { - TableController controller = loader.getController(); - Tab newTab = createTableTab(controller.getName() + " (copy)", controller.getData(), null); - tabPane.getTabs().add(tabPane.getTabs().indexOf(tab) + 1, newTab); - tabPane.getSelectionModel().selectNext(); - }); - - MenuItem merge = new MenuItem("Merge with other table"); - merge.setOnAction(event -> { - Map choices = genTabChoices(loader.getController()); - - ChoiceDialog dialog = new ChoiceDialog<>(); - dialog.setTitle("Merging tables..."); - dialog.setHeaderText("Please select another table to merge with this one"); - dialog.getItems().addAll(choices.keySet()); - Optional result = dialog.showAndWait(); - - if (result.isPresent() && choices.get(result.get()) != null) { - List newList = new ArrayList<>(list); - newList.addAll(choices.get(result.get()).getData()); - Tab newTab = createTableTab("Merge", newList, null); - tabPane.getTabs().add(tabPane.getTabs().indexOf(tab) + 1, newTab); - tabPane.getSelectionModel().selectNext(); - } - }); - tab.setContent(tableRoot); - tab.setContextMenu(new ContextMenu(duplicate, merge)); tab.setOnCloseRequest(event -> { if (!((TableController) loader.getController()).saved.get()) { Alert dialog = new Alert(Alert.AlertType.WARNING); - dialog.setHeaderText("The tab " + ((TableController) loader.getController()).name.get() + " has unsaved information"); + dialog.setHeaderText("The tab " + name + " has unsaved information"); dialog.setContentText("Do you want to save those changes?"); dialog.getButtonTypes().clear(); dialog.getButtonTypes().addAll(ButtonType.YES, ButtonType.NO, ButtonType.CANCEL); @@ -371,101 +139,17 @@ public class Controller implements Initializable { return null; } - Map genTabChoices(Initializable controller) { - Map choices = new HashMap<>(tabMap.values().size() - 1); - for (Initializable tc : tabMap.values()) - if (tc instanceof TableController && tc != controller) - choices.put(((TableController) tc).getName(), ((TableController) tc)); - return choices; - } - void newTest(List list) { try { FXMLLoader loader = new FXMLLoader(Main.class.getResource("view/test.fxml")); Parent root = loader.load(); - ((TestController) loader.getController()).setData(new ArrayList<>(list), this); + ((TestController) loader.getController()).setList(new ArrayList<>(list)); - theTest = new Tab("Test: " + tabPane.getSelectionModel().getSelectedItem().getText(), root); - tabPane.getTabs().add(theTest); - tabPane.getSelectionModel().selectLast(); - tabMap.put(theTest, loader.getController()); - } catch (IOException e) { - e.printStackTrace(); - } - } - - void createStatsTab(List answers) { - try { - FXMLLoader loader = new FXMLLoader(Main.class.getResource("view/stats.fxml")); - Parent root = loader.load(); - ((StatsController) loader.getController()).setData(answers); - Matcher m = Pattern.compile("^Test: (.*)$").matcher(tabPane.getSelectionModel().getSelectedItem().getText()); - m.find(); - tabPane.getTabs().add(new Tab("Stats: " + m.group(1), root)); + tabPane.getTabs().add(new Tab("Test: " + tabPane.getSelectionModel().getSelectedItem().getText(), root)); tabPane.getSelectionModel().selectLast(); } catch (IOException e) { e.printStackTrace(); } } - - boolean appendItemsToTab(List items, TableController controller) { - Map choices = genTabChoices(controller); - - ChoiceDialog dialog = new ChoiceDialog<>(); - dialog.setTitle("Copying rows..."); - dialog.setHeaderText("Please select another table to put the rows in"); - dialog.getItems().addAll(choices.keySet()); - Optional result = dialog.showAndWait(); - - if (result.isPresent() && choices.get(result.get()) != null) { - choices.get(result.get()).appendData(items); - // Select the tab -// tabPane.getSelectionModel().select(choices.get(result.get())); - return true; - } - return false; - } - - @FXML - protected void onAboutAction(ActionEvent event) { - if (Desktop.isDesktopSupported()) { - try { - Desktop.getDesktop().browse(URI.create(PROJECT_URL)); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @FXML - protected void onDragDropped(DragEvent event) { - List files = event.getDragboard().getFiles(); - for (File file : files) { - List aux = TestItem.loadFrom(file, TestItem.COLONS); - tabPane.getTabs().add(createTableTab(file.getName().substring(0, file.getName().lastIndexOf('.')), aux, file)); - } - event.consume(); - } - - @FXML - protected void onDragOver(DragEvent event) { - event.acceptTransferModes(TransferMode.ANY); - event.consume(); - } - - @FXML - protected void onQuit(ActionEvent event) { - Window w = root.getScene().getWindow(); - w.fireEvent(new WindowEvent(w, WindowEvent.WINDOW_CLOSE_REQUEST)); - } - - @FXML - protected void onCloseTab(ActionEvent event) { - Tab tab = tabPane.getSelectionModel().getSelectedItem(); - if (!tab.isClosable()) return; - EventHandler handler = tab.getOnCloseRequest(); - if (handler != null) handler.handle(event); - if (!event.isConsumed()) tabPane.getTabs().remove(tab); - } } diff --git a/src/main/java/es/kauron/jstudy/controller/EditController.java b/src/main/java/es/kauron/jstudy/controller/EditController.java new file mode 100644 index 0000000..f68e747 --- /dev/null +++ b/src/main/java/es/kauron/jstudy/controller/EditController.java @@ -0,0 +1,70 @@ +package es.kauron.jstudy.controller; + +import es.kauron.jstudy.model.TestItem; +import javafx.beans.property.BooleanProperty; +import javafx.collections.ObservableList; +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.Node; +import javafx.scene.control.TextField; +import javafx.stage.Stage; + +import java.net.URL; +import java.util.ResourceBundle; + +public class EditController implements Initializable { + @FXML + private TextField questionText, answerText; + private ObservableList list; + private int index; + private TestItem item; + private BooleanProperty saved; + private String originalQuestion, originalAnswer; + + @Override + public void initialize(URL url, ResourceBundle rb) { + } + + protected void setList(ObservableList list, BooleanProperty saved) { + setList(list, -1, saved); + } + + protected void setList(ObservableList list, int index, BooleanProperty saved) { + this.list = list; // Save attributes correctly + this.index = index; + this.saved = saved; + // Copy current values to textViews + // and initialize item to hold the current object in edition + if (index < 0) item = new TestItem("",""); + else { + questionText.setText(list.get(index).getQuestion()); + answerText.setText(list.get(index).getAnswer()); + item = new TestItem(list.get(index)); + } + originalQuestion = questionText.getText(); + originalAnswer = answerText.getText(); + item.questionProperty().bind(questionText.textProperty()); + item.answerProperty().bind(answerText.textProperty()); + } + + @FXML + protected void onSaveAction(ActionEvent event) { + if (index < 0) { + if (!item.isValid()) + return; + list.add(item); + } else { + list.set(index, item); + } + if (!originalQuestion.equals(item.getQuestion()) || !originalAnswer.equals(item.getAnswer())) saved.set(false); + onCancelAction(event); + } + + @FXML + protected void onCancelAction(ActionEvent event) { + ((Stage) ((Node) event.getSource()) + .getScene().getWindow()) + .close(); + } +} diff --git a/src/main/java/es/kauron/jstudy/controller/SettingsController.java b/src/main/java/es/kauron/jstudy/controller/SettingsController.java index eb719a1..fa53ac5 100644 --- a/src/main/java/es/kauron/jstudy/controller/SettingsController.java +++ b/src/main/java/es/kauron/jstudy/controller/SettingsController.java @@ -1,26 +1,24 @@ package es.kauron.jstudy.controller; -import es.kauron.jstudy.model.AppPrefs; +import com.jfoenix.controls.JFXCheckBox; +import es.kauron.jstudy.model.AppConfig; import javafx.fxml.FXML; import javafx.fxml.Initializable; -import javafx.scene.control.CheckBox; import java.net.URL; import java.util.ResourceBundle; public class SettingsController implements Initializable { @FXML - private CheckBox repeatMistakes, showFeedback, repeatImmediately, lockTabsOnTest; + private JFXCheckBox repeatMistakes, showFeedback; @Override public void initialize(URL location, ResourceBundle resources) { - repeatImmediately.disableProperty().bind(repeatMistakes.selectedProperty().not()); - repeatImmediately.selectedProperty().bindBidirectional(AppPrefs.repeatImmediately); - repeatMistakes.selectedProperty().bindBidirectional(AppPrefs.repeatWrong); - showFeedback.selectedProperty().bindBidirectional(AppPrefs.showFeedback); - lockTabsOnTest.selectedProperty().bindBidirectional(AppPrefs.lockTabsOnTest); - repeatMistakes.selectedProperty().addListener((obj, o, n) -> { - if (!n) repeatImmediately.setSelected(false); - }); + repeatMistakes.setSelected(AppConfig.repeatWrong); + repeatMistakes.selectedProperty().addListener((observable, old, value) -> AppConfig.repeatWrong = value); + showFeedback.setSelected(AppConfig.showFeedback); + showFeedback.selectedProperty().addListener((observable, old, value) -> AppConfig.showFeedback = value); } + + } diff --git a/src/main/java/es/kauron/jstudy/controller/StatsController.java b/src/main/java/es/kauron/jstudy/controller/StatsController.java deleted file mode 100644 index bd24a6b..0000000 --- a/src/main/java/es/kauron/jstudy/controller/StatsController.java +++ /dev/null @@ -1,42 +0,0 @@ -package es.kauron.jstudy.controller; - -import es.kauron.jstudy.model.AnsweredItem; -import javafx.beans.binding.Bindings; -import javafx.collections.FXCollections; -import javafx.fxml.FXML; -import javafx.fxml.Initializable; -import javafx.scene.control.TableColumn; -import javafx.scene.control.TableRow; -import javafx.scene.control.TableView; - -import java.net.URL; -import java.util.List; -import java.util.ResourceBundle; - -public class StatsController implements Initializable { - @FXML - protected TableView table; - - @FXML - protected TableColumn numCol, questionCol, answerCol, userAnswerCol, timeCol; - - @Override - public void initialize(URL location, ResourceBundle resources) { - numCol.setCellValueFactory(e -> e.getValue().indexProperty.asString()); - questionCol.setCellValueFactory(e -> e.getValue().item.questionProperty()); - answerCol.setCellValueFactory(e -> e.getValue().item.answerProperty()); - userAnswerCol.setCellValueFactory(e -> e.getValue().answerProperty); - timeCol.setCellValueFactory(e -> Bindings.format("%.3f", e.getValue().timeProperty.divide(1e9))); - } - - public void setData(List answers) { - table.setItems(FXCollections.observableArrayList(answers)); - // Set wrong answers in bold - table.setRowFactory(param -> { - TableRow row = new TableRow<>(); - row.itemProperty().addListener((obj, o, n) -> - row.setStyle(n == null || n.isRight() ? "" : "-fx-font-weight: bold")); - return row; - }); - } -} diff --git a/src/main/java/es/kauron/jstudy/controller/TableController.java b/src/main/java/es/kauron/jstudy/controller/TableController.java index 4d7b529..5865126 100644 --- a/src/main/java/es/kauron/jstudy/controller/TableController.java +++ b/src/main/java/es/kauron/jstudy/controller/TableController.java @@ -1,286 +1,153 @@ package es.kauron.jstudy.controller; -import es.kauron.jstudy.model.AppPrefs; +import es.kauron.jstudy.Main; import es.kauron.jstudy.model.TestItem; -import es.kauron.jstudy.util.DraggableRowFactory; -import javafx.beans.binding.Bindings; -import javafx.beans.property.*; +import javafx.beans.property.BooleanProperty; +import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; -import javafx.collections.transformation.FilteredList; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.*; -import javafx.scene.input.KeyCode; -import javafx.scene.input.KeyEvent; -import javafx.scene.input.MouseEvent; +import javafx.fxml.FXMLLoader; +import javafx.fxml.Initializable; +import javafx.scene.Parent; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.SelectionMode; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; import javafx.stage.FileChooser; +import javafx.stage.Modality; +import javafx.stage.Stage; import java.io.File; +import java.io.IOException; import java.net.URL; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import java.util.List; +import java.util.ResourceBundle; -public class TableController extends UndoController { +public class TableController implements Initializable { @FXML private TableView table; @FXML - private TextField newQuestionField, newAnswerField, searchField; - @FXML - private Button addButton, testButton; - @FXML private TableColumn answerCol, questionCol; + @FXML + private Button editButton, duplicateButton, swapButton, testSelectionButton, deleteButton, saveButton; - private FilteredList filtered; private ObservableList data; private Controller parent; private File file; - StringProperty name; - final BooleanProperty saved = new SimpleBooleanProperty(); - private final ObjectProperty editing = new SimpleObjectProperty<>(null); + protected BooleanProperty saved = new SimpleBooleanProperty(); @Override public void initialize(URL url, ResourceBundle resourceBundle) { - addButton.textProperty().bind(Bindings.when(addButton.disableProperty()) - .then("Question repeated") - .otherwise(Bindings.when(editing.isNull()) - .then("_Add item") - .otherwise("_Save item"))); - addButton.getTooltip().textProperty().bind(Bindings.when(editing.isNull()) - .then("Add an entry to the table") - .otherwise("Save changes in the selected entry")); - // Add context menu to Table - MenuItem mEdit = new MenuItem("_Edit"); - mEdit.setOnAction(this::onEditAction); - MenuItem mDel = new MenuItem("_Delete"); - mDel.setOnAction(this::onDeleteAction); - MenuItem mDup = new MenuItem("D_uplicate"); - mDup.setOnAction(this::onDuplicateAction); - mDup.disableProperty().bind(mDel.disableProperty()); - MenuItem mSwap = new MenuItem("_Swap"); - mSwap.setOnAction(this::onSwapAction); - mSwap.disableProperty().bind(mDel.disableProperty()); - MenuItem mTest = new MenuItem("_Test selected"); - mTest.setOnAction(this::onTestSelectionAction); - mTest.disableProperty().bind(mDel.disableProperty()); - MenuItem mMove = new MenuItem("_Move"); - mMove.setOnAction(this::onMoveData); - mMove.disableProperty().bind(mDel.disableProperty()); - MenuItem mCopy = new MenuItem("_Copy"); - mCopy.setOnAction(this::onMoveData); - mCopy.disableProperty().bind(mDel.disableProperty()); - mEdit.setDisable(true); - mDel.setDisable(true); - table.setContextMenu(new ContextMenu(mEdit, mDel, mDup, mSwap, new SeparatorMenuItem(), - mTest, mCopy, mMove)); - table.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); answerCol.setCellValueFactory(e -> e.getValue().answerProperty()); questionCol.setCellValueFactory(e -> e.getValue().questionProperty()); table.getSelectionModel().getSelectedIndices().addListener((ListChangeListener) obs -> { - mEdit.setDisable(obs.getList().size() != 1); - mDel.setDisable(obs.getList().size() == 0); - }); - searchField.textProperty().addListener((obj, o, n) -> - filtered.setPredicate((item) -> item.getQuestion().contains(n) || item.getAnswer().contains(n))); - newQuestionField.textProperty().addListener((obj, o, n) -> { - for (TestItem item : data) { - if (item == editing.get()) continue; - if (item.getQuestion().equals(n.trim())) { - addButton.setDisable(true); - return; - } - } - addButton.setDisable(false); + editButton.setDisable(obs.getList().size() != 1); + swapButton.setDisable(obs.getList().size() < 1); + deleteButton.setDisable(obs.getList().size() < 1); + duplicateButton.setDisable(obs.getList().size() < 1); + testSelectionButton.setDisable(obs.getList().size() < 1); }); + saveButton.disableProperty().bind(saved); } - void setData(String name, List list, Controller controller, File file) { - this.name = new SimpleStringProperty(name); + void setData(List list, Controller controller, File file) { this.data = FXCollections.observableArrayList(list); - this.filtered = data.filtered((item) -> true); this.parent = controller; - table.setRowFactory(new DraggableRowFactory<>(data)::generator); - table.setItems(filtered); - filtered.addListener((ListChangeListener) c -> - testButton.setDisable(filtered.size() == 0)); - testButton.setDisable(filtered.size() == 0); + table.setItems(data); this.file = file; saved.set(file != null); } - void appendData(List list) { - if (list.size() > 0) { - saved.set(false); - List> actions = new ArrayList<>(list.size()); - for (TestItem i : list) - actions.add(new AddAction<>(i, data)); - Collections.reverse(actions); - doIt(new CollectionAction<>(actions)); - } - } - - List getData() {return new ArrayList<>(data);} - String getName() {return name.get();} - - void onMoveData(ActionEvent event) { - List items = table.getSelectionModel().getSelectedItems(); - if (items.size() == 0) return; - if (!parent.appendItemsToTab(items, this)) - return; - if (((MenuItem) event.getTarget()).getText().contains("Move")) { - onDeleteAction(event); - } - } - + @FXML protected void onSaveAction(ActionEvent event) { - while (file == null) { + if (file == null) { FileChooser chooser = new FileChooser(); chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("JStudy file", "*.jsdb")); - if (AppPrefs.lastDir != null) chooser.setInitialDirectory(AppPrefs.lastDir); - chooser.setInitialFileName(name.get()); file = chooser.showSaveDialog(table.getScene().getWindow()); - if (!file.getName().endsWith(".jsdb")) - file = new File(file.getPath() + ".jsdb"); - if (file != null) { - AppPrefs.lastDir = file.getParentFile(); - name.set(file.getName().substring(0, file.getName().lastIndexOf('.'))); - } } + if (file == null) return; TestItem.saveTo(file, data); saved.set(true); } @FXML protected void onAddAction(ActionEvent event) { - if (newQuestionField.getText().trim().isEmpty() && newAnswerField.getText().trim().isEmpty()) { - newQuestionField.requestFocus(); - return; - } - Action action; - if (editing.get() == null) { - TestItem item = new TestItem(newQuestionField.getText().trim(), newAnswerField.getText().trim()); - action = new AddAction<>(item, data); - saved.set(false); - } else { - action = new EditItemAction(editing.get(), newQuestionField.getText(), newAnswerField.getText()); - } - doIt(action); - onCancelAction(event); - } + try { + FXMLLoader cargador = new FXMLLoader(Main.class.getResource("view/edit.fxml")); + Parent pRoot = cargador.load(); - protected void onEditAction(ActionEvent event) { - ObservableList list = table.getSelectionModel().getSelectedItems(); - if (list.size() != 1) return; - editing.set(list.get(0)); - newQuestionField.setText(list.get(0).getQuestion()); - newAnswerField.setText(list.get(0).getAnswer()); - saved.set(false); - newQuestionField.requestFocus(); + ((EditController) cargador.getController()).setList(data, saved); + + Stage stage = new Stage(); + stage.setTitle("New entry"); + stage.setScene(new Scene(pRoot)); + stage.initModality(Modality.APPLICATION_MODAL); + stage.showAndWait(); + } catch (IOException e) { + e.printStackTrace(); + } } @FXML - protected void onCancelAction(ActionEvent event) { - if (editing.get() != null) - editing.set(null); - newQuestionField.setText(""); - newAnswerField.setText(""); - newQuestionField.requestFocus(); + protected void onEditAction(ActionEvent event) { + ObservableList list = table.getSelectionModel().getSelectedIndices(); + if (list.size() != 1) return; + int index = list.get(0); + try { + FXMLLoader cargador = new FXMLLoader(Main.class.getResource("view/edit.fxml")); + Parent root = cargador.load(); + + ((EditController) cargador.getController()).setList(table.getItems(), index, saved); + + Stage stage = new Stage(); + stage.setTitle("Editing entry..."); + stage.setScene(new Scene(root)); + stage.initModality(Modality.APPLICATION_MODAL); + stage.showAndWait(); + } catch (IOException e) { + e.printStackTrace(); + } } + @FXML protected void onSwapAction(ActionEvent event) { if (table.getSelectionModel().getSelectedIndices().size() > 0) saved.set(false); - Collection> actionList = new ArrayList<>(); for (TestItem item : table.getSelectionModel().getSelectedItems()) { - actionList.add(Action.Reversible.genAction(item, () -> { - String question = item.getQuestion(); - item.questionProperty().setValue(item.getAnswer()); - item.answerProperty().setValue(question); - })); + String question = item.getQuestion(); + item.questionProperty().set(item.getAnswer()); + item.answerProperty().set(question); } - doIt(new CollectionAction<>(actionList)); table.requestFocus(); } + @FXML protected void onDuplicateAction(ActionEvent event) { if (table.getSelectionModel().getSelectedIndices().size() > 0) saved.set(false); - Collection> actionList = new ArrayList<>(); - for (int i : table.getSelectionModel().getSelectedIndices()) { - TestItem item = new TestItem(filtered.get(i)); - Pattern p = Pattern.compile("^(.*) (\\d*)$"); - String base = item.getQuestion(); - int n = 2; - Matcher m = p.matcher(base); - if (m.find()) { - n = Integer.parseInt(m.group(2)) + 1; - base = m.group(1); - } - while (isAQuestion(base + " " + n)) - n++; - item.questionProperty().setValue(base + " " + n); - actionList.add(new AddAction<>(item, data)); - } - doIt(new CollectionAction<>(actionList)); + for (int i : table.getSelectionModel().getSelectedIndices()) + table.getItems().add(new TestItem(table.getItems().get(i))); table.requestFocus(); } - private boolean isAQuestion(String q) { - for (TestItem t : data) - if (t.getQuestion().equals(q)) - return true; - return false; - } - + @FXML protected void onDeleteAction(ActionEvent event) { if (table.getSelectionModel().getSelectedIndices().size() > 0) saved.set(false); - Collection> actionList = new ArrayList<>(); - for (TestItem i : table.getSelectionModel().getSelectedItems()) - actionList.add(Action.invert(new AddAction<>(i, data, data.indexOf(i)))); - doIt(new CollectionAction<>(actionList)); + for (int i : table.getSelectionModel().getSelectedIndices()) + table.getItems().remove(i); table.requestFocus(); } + @FXML protected void onTestSelectionAction(ActionEvent event) { parent.newTest(table.getSelectionModel().getSelectedItems()); } @FXML protected void onTestAction(ActionEvent event) { - parent.newTest(filtered); - } - - @FXML - protected void onTableKeyEvent(KeyEvent event) { - if (event.getCode().equals(KeyCode.DELETE)) { - onDeleteAction(null); - } - } - - private final Timer timer = new Timer(); - private TimerTask timerTask = null; - @FXML - protected void onTableMouseClicked(MouseEvent event) { - if (timerTask == null) { - timerTask = new TimerTask() { - @Override - public void run() { - timerTask = null; - } - }; - timer.schedule(timerTask, 200); - } else { - if (timerTask.cancel()) - onEditAction(null); - timerTask = null; - } - } - - void stopTimer() { - timer.cancel(); - timer.purge(); - if (timerTask != null) - timerTask.cancel(); + parent.newTest(data); } } diff --git a/src/main/java/es/kauron/jstudy/controller/TestController.java b/src/main/java/es/kauron/jstudy/controller/TestController.java index 9b0e580..accae3e 100644 --- a/src/main/java/es/kauron/jstudy/controller/TestController.java +++ b/src/main/java/es/kauron/jstudy/controller/TestController.java @@ -1,154 +1,95 @@ package es.kauron.jstudy.controller; -import es.kauron.jstudy.model.AnsweredItem; -import es.kauron.jstudy.model.AppPrefs; +import com.jfoenix.controls.JFXTextField; +import es.kauron.jstudy.model.AppConfig; import es.kauron.jstudy.model.TestItem; -import es.kauron.jstudy.util.Clock; -import javafx.beans.binding.Bindings; -import javafx.beans.property.*; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.Initializable; -import javafx.scene.control.*; -import javafx.scene.layout.Pane; +import javafx.geometry.Insets; +import javafx.scene.control.Label; +import javafx.scene.control.ProgressBar; +import javafx.scene.layout.HBox; import java.net.URL; -import java.util.ArrayList; import java.util.List; import java.util.ResourceBundle; public class TestController implements Initializable { - private static final TestItem ending = new TestItem("That's it!", ""); - @FXML private Label question, prevQuestion, prevAnswer, correctAnswer, progressLabel, correctLabel; @FXML - private TextField answer; + private JFXTextField answer; @FXML private ProgressBar progress; @FXML - private Pane feedback, buttonBox; - @FXML - private Button skipButton; - @FXML - private CheckBox pauseCheckBox; + private HBox feedback; - private final SimpleBooleanProperty correctingError = new SimpleBooleanProperty(false); private List list; - private final IntegerProperty errors = new SimpleIntegerProperty(0); - private final ObjectProperty item = new SimpleObjectProperty<>(); - private final IntegerProperty done = new SimpleIntegerProperty(0); - private final List answers = new ArrayList<>(); - private long timeQuestionStarted = 0; - private Controller controller; - // Time accounting - private final Clock clock = new Clock(); + private int total, current = -1; + private int done = 0, errors = 0; @Override public void initialize(URL url, ResourceBundle resourceBundle) { - skipButton.disableProperty().bind(correctingError); - feedback.visibleProperty().bind(AppPrefs.showFeedback); - answer.disableProperty().bind(pauseCheckBox.selectedProperty()); - buttonBox.disableProperty().bind(pauseCheckBox.selectedProperty()); - pauseCheckBox.selectedProperty().addListener((obj, o, n) -> { - if (n) clock.pause(); - else clock.play(); - }); } - void setData(List list, Controller controller) { - this.controller = controller; + void setList(List list) { this.list = list; - int total = list.size(); - progressLabel.textProperty().bind(Bindings.format( - String.format("%%.2f%%%% %%d / %d %%d mistakes %%s", total), - done.multiply(100.0).divide(total), done, - errors, clock.timeProperty())); - progress.progressProperty().bind(done.divide((double) total)); - item.addListener((obj, o, n) -> { - if (o != null) { - prevQuestion.setText(o.getQuestion()); - correctAnswer.setText(o.getAnswer()); - } - question.setText(n.getQuestion()); - }); - clock.play(); + total = list.size(); + progress.setProgress(0); + progressLabel.setText("0/" + total); onSkipAction(null); } @FXML private void onNextAction(ActionEvent event) { - // Do not accept empty responses - if (answer.getText().trim().isEmpty()) return; - // Record the answer - long timeElapsed = System.nanoTime() - timeQuestionStarted; - AnsweredItem ai = new AnsweredItem(item.get(), answers.size() + 1, answer.getText().trim(), timeElapsed); - answers.add(ai); + prevQuestion.setText(list.get(current).getQuestion()); prevAnswer.setText(answer.getText()); + correctAnswer.setText(list.get(current).getAnswer()); - correctAnswer.setVisible(!ai.isRight()); - correctLabel.setVisible(!ai.isRight()); + boolean right = list.get(current).getAnswer().equals(answer.getText()); + correctAnswer.setVisible(!right); + correctLabel.setVisible(!right); - if (!ai.isRight()) { - errors.set(errors.get() + 1); + if (!right) { + errors++; prevAnswer.setStyle("-fx-text-fill: #C40000;"); } else { prevAnswer.setStyle("-fx-text-fill: #00C400;"); } // Remove the question from the pool if the question was correctly answered or there is no repetition - if (ai.isRight() || !AppPrefs.repeatWrong.get()) { - if (!correctingError.get()) - done.set(done.get() + 1); - correctingError.set(!ai.isRight() && AppPrefs.repeatImmediately.get()); - list.remove(item.get()); + if (right || !AppConfig.repeatWrong) { + list.remove(current); + progress.setProgress(++done/(double)total); + progressLabel.setText(done + "/" + total); if (list.size() == 0) { - onEndAction(null); + onEndAction(event); return; } - chooseQuestion(); - } else if (AppPrefs.repeatImmediately.get()) { - item.set(new TestItem(item.get())); - if (!correctingError.get()) { - correctingError.set(true); - list.add(item.get()); - } - } else { - chooseQuestion(); } - answer.setText(""); - answer.requestFocus(); - timeQuestionStarted = System.nanoTime(); - } - - private void chooseQuestion() { - answer.setText(""); - TestItem next; - do - next = list.get((int) (Math.random() * list.size())); - while (list.size() > 1 && item.get() == next); - item.set(next); + onSkipAction(event); } @FXML private void onSkipAction(ActionEvent event) { - chooseQuestion(); answer.setText(""); + int previous = current; + while (list.size() > 1 && current == previous) + current = (int) (Math.random() * list.size()); + question.setText(list.get(current).getQuestion()); answer.requestFocus(); - timeQuestionStarted = System.nanoTime(); } @FXML private void onEndAction(ActionEvent event) { answer.setText(""); - item.set(ending); - pauseCheckBox.setSelected(true); - pauseCheckBox.setDisable(true); - clock.stop(); - controller.createStatsTab(answers); - } - - void stopTimer() { - clock.stop(); + answer.setDisable(true); + question.setText("That's it!"); + feedback.getChildren().clear(); + feedback.setSpacing(5); + feedback.setPadding(new Insets(5, 5, 5, 5)); + feedback.getChildren().add(new Label("Mistakes: " + errors)); + feedback.getChildren().add(new Label(String.format("Mark: %.2f%%", (total - errors) / (double) total * 100))); } } diff --git a/src/main/java/es/kauron/jstudy/controller/UndoController.java b/src/main/java/es/kauron/jstudy/controller/UndoController.java deleted file mode 100644 index 93ddc22..0000000 --- a/src/main/java/es/kauron/jstudy/controller/UndoController.java +++ /dev/null @@ -1,164 +0,0 @@ -package es.kauron.jstudy.controller; - -import es.kauron.jstudy.model.TestItem; -import javafx.beans.property.BooleanProperty; -import javafx.beans.property.SimpleBooleanProperty; -import javafx.fxml.Initializable; - -import java.util.Collection; -import java.util.List; -import java.util.Stack; - -public abstract class UndoController implements Initializable { - private Stack> undoStack = new Stack<>(); - private Stack> redoStack = new Stack<>(); - public BooleanProperty undoProperty = new SimpleBooleanProperty(false); - public BooleanProperty redoProperty = new SimpleBooleanProperty(false); - - public void doIt(Action action) { - action.action(); - redoStack.clear(); - redoProperty.set(false); - if (undoStack.empty()) undoProperty.set(true); - undoStack.push(action); - undoProperty.set(true); - } - - public void undo() { - Action a = undoStack.pop(); - a.reverse(); - if (undoStack.empty()) - undoProperty.set(false); - if (redoStack.empty()) - redoProperty.set(true); - redoStack.push(a); - } - - public void redo() { - Action a = redoStack.pop(); - a.action(); - if (redoStack.empty()) - redoProperty.set(false); - if (undoStack.empty()) - undoProperty.set(true); - undoStack.push(a); - } - - public interface Call { - void call(); - } - - public abstract static class Action { - protected final A item; - - public Action(A item) { - this.item = item; - } - - public abstract void action(); - public abstract void reverse(); - - public static Action invert(Action action) { - return new Action(action.item) { - @Override - public void action() { - action.reverse(); - } - - @Override - public void reverse() { - action.action(); - } - }; - } - - public static Action genAction(E item, Call doit, Call undoit) { - return new Action(item) { - @Override - public void action() { doit.call(); } - @Override - public void reverse() { undoit.call(); } - }; - } - - public abstract static class Reversible extends Action { - public Reversible(R item) { - super(item); - } - - @Override - public void reverse() { - action(); - } - - public static Action genAction(R item, Call doit) { - return new Reversible(item) { - @Override - public void action() { doit.call(); } - }; - } - } - } - - public static class AddAction extends Action { - private final List list; - private final int index; - - public AddAction(N item, List list) { - this(item, list, list.size()); - } - - public AddAction(N item, List list, int index) { - super(item); - this.list = list; - this.index = index; - } - - @Override - public void action() { - list.add(index, item); - } - - @Override - public void reverse() { - list.remove(item); - } - } - - public static class CollectionAction extends Action>> { - public CollectionAction(Collection> item) { - super(item); - } - - @Override - public void action() { - for (Action a : item) - a.action(); - } - - @Override - public void reverse() { - for (Action a : item) - a.reverse(); - } - } - - public static class EditItemAction extends Action.Reversible { - private String question, answer; - public EditItemAction(TestItem item, String newQuestion, String newAnswer) { - super(item); - this.question = newQuestion; - this.answer = newAnswer; - } - - @Override - public void action() { - String q = item.getQuestion(); - String a = item.getAnswer(); - item.questionProperty().setValue(question); - item.answerProperty().setValue(answer); - question = q; - answer = a; - } - } -} diff --git a/src/main/java/es/kauron/jstudy/model/AnsweredItem.java b/src/main/java/es/kauron/jstudy/model/AnsweredItem.java deleted file mode 100644 index 502f973..0000000 --- a/src/main/java/es/kauron/jstudy/model/AnsweredItem.java +++ /dev/null @@ -1,24 +0,0 @@ -package es.kauron.jstudy.model; - -import javafx.beans.property.ReadOnlyIntegerProperty; -import javafx.beans.property.ReadOnlyIntegerWrapper; -import javafx.beans.property.ReadOnlyLongWrapper; -import javafx.beans.property.ReadOnlyStringWrapper; - -public class AnsweredItem { - public final ReadOnlyStringWrapper answerProperty; - public final ReadOnlyLongWrapper timeProperty; - public final ReadOnlyIntegerProperty indexProperty; - public final TestItem item; - - public AnsweredItem(TestItem item, int index, String answer, long timeNano) { - this.item = item; - this.indexProperty = new ReadOnlyIntegerWrapper(index); - this.answerProperty = new ReadOnlyStringWrapper(answer); - this.timeProperty = new ReadOnlyLongWrapper(timeNano); - } - - public boolean isRight() { - return item.getAnswer().equals(answerProperty.get()); - } -} diff --git a/src/main/java/es/kauron/jstudy/model/AppConfig.java b/src/main/java/es/kauron/jstudy/model/AppConfig.java new file mode 100644 index 0000000..c086e48 --- /dev/null +++ b/src/main/java/es/kauron/jstudy/model/AppConfig.java @@ -0,0 +1,48 @@ +package es.kauron.jstudy.model; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.PrintWriter; +import java.util.Scanner; + +public class AppConfig { + private static final String FILE = "./config.ini"; + public static boolean repeatWrong, showFeedback; + + public static void save() { + try { + PrintWriter pw = new PrintWriter(new File(FILE)); + pw.println("repeatWrong=" + repeatWrong); + pw.println("showFeedback=" + showFeedback); + pw.flush(); + pw.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + } + + public static void load() { + File file = new File(FILE); + if (!file.exists()) { + repeatWrong = true; + showFeedback = true; + } else + try { + Scanner in = new Scanner(new File(FILE)); + while (in.hasNextLine()) { + String line = in.nextLine(); + String value = line.substring(line.indexOf('=') + 1); + if (line.matches("repeatWrong=.*")) + repeatWrong = Boolean.parseBoolean(value); + else if (line.matches("showFeedback=.*")) + showFeedback = Boolean.parseBoolean(value); + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + } + + public static String printValues() { + return String.format("repeatWrong=%b\nshowFeedback=%b", repeatWrong, showFeedback); + } +} diff --git a/src/main/java/es/kauron/jstudy/model/AppPrefs.java b/src/main/java/es/kauron/jstudy/model/AppPrefs.java deleted file mode 100644 index 6343b7f..0000000 --- a/src/main/java/es/kauron/jstudy/model/AppPrefs.java +++ /dev/null @@ -1,59 +0,0 @@ -package es.kauron.jstudy.model; - -import es.kauron.jstudy.Main; -import javafx.beans.property.SimpleBooleanProperty; - -import java.io.File; -import java.util.Scanner; -import java.util.prefs.BackingStoreException; -import java.util.prefs.Preferences; - -public class AppPrefs { - private static final Preferences prefs = Preferences.userNodeForPackage(Main.class); - public static final BooleanPref repeatWrong = new BooleanPref(false, "repeatWrong"); - public static final BooleanPref showFeedback = new BooleanPref(true, "showFeedback"); - public static final BooleanPref repeatImmediately = new BooleanPref(false, "repeatImmediately"); - public static final BooleanPref lockTabsOnTest = new BooleanPref(false, "lockTabsOnTest"); - public static File lastDir; - - static { - // Load data (booleanprefs are loaded automatically) - String dirPath = prefs.get("lastDir", ""); - if (!dirPath.isEmpty()) lastDir = new File(dirPath); - } - - private static void flushPrefs() { - try { - prefs.flush(); - } catch (BackingStoreException e) { - e.printStackTrace(); - } - } - - public static void save() { - prefs.put("lastDir", lastDir == null ? "" : lastDir.getAbsolutePath()); - flushPrefs(); - } - - public static String getVersion() { - String v = new Scanner(AppPrefs.class.getResourceAsStream("/version.txt")).nextLine(); - assert v.matches("\\d\\.\\d\\.\\d"); - return v; - } - - public static class BooleanPref extends SimpleBooleanProperty { - private final String name; - - BooleanPref(boolean defValue, String name) { - super(defValue); - this.name = name; - set(prefs.getBoolean(name, defValue)); - addListener((obj, o, n) -> this.save()); - } - - void save() { - prefs.putBoolean(name, get()); - flushPrefs(); - } - } -} diff --git a/src/main/java/es/kauron/jstudy/model/TestItem.java b/src/main/java/es/kauron/jstudy/model/TestItem.java index 344af3d..88fa56f 100644 --- a/src/main/java/es/kauron/jstudy/model/TestItem.java +++ b/src/main/java/es/kauron/jstudy/model/TestItem.java @@ -4,7 +4,6 @@ import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import java.io.*; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.InputMismatchException; import java.util.List; @@ -13,10 +12,9 @@ import java.util.Scanner; public class TestItem { public static final String TAB = "\t", COLONS = "::", SEMICOLON = ";", COMMA = ","; - private final StringProperty question; - private final StringProperty answer; + private StringProperty question, answer; - private TestItem(SimpleStringProperty question, SimpleStringProperty answer) { + public TestItem(SimpleStringProperty question, SimpleStringProperty answer) { this.question = question; this.answer = answer; } @@ -26,7 +24,7 @@ public class TestItem { } public TestItem(String question, String answer) { - this(new SimpleStringProperty(question), new SimpleStringProperty(answer)); + this(new SimpleStringProperty(new String(question)), new SimpleStringProperty(new String(answer))); } public String getQuestion() { @@ -49,13 +47,18 @@ public class TestItem { return !question.get().isEmpty() && !answer.get().isEmpty(); } + public boolean checkAnswer(String answer, boolean sensible) { + return sensible ? getAnswer().equals(answer) : getAnswer().equalsIgnoreCase(answer); + } + public static void saveTo(File file, List data) { - try (OutputStreamWriter writer = new OutputStreamWriter( - new FileOutputStream(file), StandardCharsets.UTF_8.newEncoder())) { + try { + OutputStreamWriter writer = new FileWriter(file); for (TestItem item : data) { writer.write(item.getQuestion() + "::" + item.getAnswer() + "\n"); } writer.flush(); + writer.close(); } catch (IOException e) { e.printStackTrace(); } @@ -63,10 +66,18 @@ public class TestItem { public static List loadFrom(File file, String separator) { List list = new ArrayList<>(); - String encoding = "UTF-8"; - if (separator.equals(COMMA) || separator.equals(SEMICOLON) || separator.equals(TAB)) - encoding = "ISO-8859-1"; - try (Scanner in = new Scanner(new FileInputStream(file), encoding)) { + try { + Scanner in; + switch (separator) { + case COMMA: + case SEMICOLON: + case TAB: + in = new Scanner(new FileInputStream(file), "ISO-8859-1"); + break; + default: + in = new Scanner(file); + break; + } while (in.hasNextLine()) { String line = in.nextLine(); if (!line.matches("..*" + separator + "..*")) continue; @@ -78,10 +89,13 @@ public class TestItem { answer = answer.substring(0, index); if (answer.isEmpty()) continue; list.add(new TestItem(question, answer)); + System.err.println(question + " :: " + answer); } + in.close(); } catch (FileNotFoundException | InputMismatchException e) { e.printStackTrace(); } return list; } + } diff --git a/src/main/java/es/kauron/jstudy/util/Clock.java b/src/main/java/es/kauron/jstudy/util/Clock.java deleted file mode 100644 index 6cd58e0..0000000 --- a/src/main/java/es/kauron/jstudy/util/Clock.java +++ /dev/null @@ -1,51 +0,0 @@ -package es.kauron.jstudy.util; - -import javafx.application.Platform; -import javafx.beans.property.SimpleStringProperty; -import javafx.beans.property.StringProperty; - -import java.util.Timer; -import java.util.TimerTask; - -public class Clock { - private static final short SEC_TO_MIN = 60; - private short seconds = 0; - private final Timer timer = new Timer(); - private TimerTask task; - private final StringProperty time = new SimpleStringProperty(); - - public Clock() { - setObservable(); - } - - public StringProperty timeProperty() { - return time; - } - - public void play() { - if (task != null) task.cancel(); - task = new TimerTask() { - @Override - public void run() { - seconds++; - Platform.runLater(() -> setObservable()); - } - }; - timer.schedule(task, 0, 1000); - } - - public void pause() { - if (task != null) - task.cancel(); - task = null; - } - - public void stop() { - timer.cancel(); - timer.purge(); - } - - private void setObservable() { - time.set(String.format("%02d:%02d", seconds / SEC_TO_MIN, seconds % SEC_TO_MIN)); - } -} diff --git a/src/main/java/es/kauron/jstudy/util/DraggableRowFactory.java b/src/main/java/es/kauron/jstudy/util/DraggableRowFactory.java deleted file mode 100644 index 9d237bc..0000000 --- a/src/main/java/es/kauron/jstudy/util/DraggableRowFactory.java +++ /dev/null @@ -1,93 +0,0 @@ -package es.kauron.jstudy.util; - -import javafx.collections.ObservableList; -import javafx.scene.control.TableRow; -import javafx.scene.control.TableView; -import javafx.scene.input.ClipboardContent; -import javafx.scene.input.DataFormat; -import javafx.scene.input.Dragboard; -import javafx.scene.input.TransferMode; - -import java.util.ArrayList; -import java.util.List; - -// Adapted from https://stackoverflow.com/a/52437193 -public class DraggableRowFactory { - private static final DataFormat SERIALIZED_MIME_TYPE = new DataFormat("application/x-java-serialized-object"); - - private final ObservableList data; - private final List dragging = new ArrayList<>(); - - public DraggableRowFactory(ObservableList data) { - this.data = data; - } - - public TableRow generator(TableView table) { - TableRow row = new TableRow<>(); - row.setOnDragDetected((event) -> { - if (!row.isEmpty() && table.getItems().size() == data.size()) { - Integer index = row.getIndex(); - dragging.clear(); - dragging.addAll(table.getSelectionModel().getSelectedItems()); - Dragboard db = row.startDragAndDrop(TransferMode.MOVE); - ClipboardContent cc = new ClipboardContent(); - cc.put(SERIALIZED_MIME_TYPE, index); - db.setContent(cc); - event.consume(); - } - }); - row.setOnDragOver((event) -> { - Dragboard db = event.getDragboard(); - if (db.hasContent(SERIALIZED_MIME_TYPE)) { - if (row.getIndex() != (Integer) db.getContent(SERIALIZED_MIME_TYPE)) { - event.acceptTransferModes(TransferMode.COPY_OR_MOVE); - event.consume(); - } - } - }); - row.setOnDragDropped((event) -> { - Dragboard db = event.getDragboard(); - if (!db.hasContent(SERIALIZED_MIME_TYPE)) - return; - int dropIndex; - S item = null; - if (row.isEmpty()) { - dropIndex = table.getItems().size(); - } else { - dropIndex = row.getIndex(); - item = table.getItems().get(dropIndex); - } - int delta = 0; - if (item != null) { - while (dragging.contains(item)) { - delta = 1; - --dropIndex; - if (dropIndex < 0) { - item = null; - dropIndex = 0; - break; - } - item = table.getItems().get(dropIndex); - } - } - data.removeAll(dragging); - if (item != null) - dropIndex = table.getItems().indexOf(item) + delta; - else if (dropIndex != 0) - dropIndex = table.getItems().size(); - - table.getSelectionModel().clearSelection(); - - for (S s : dragging) { - data.add(dropIndex, s); - table.getSelectionModel().select(dropIndex); - dropIndex++; - } - - event.setDropCompleted(true); - dragging.clear(); - event.consume(); - }); - return row; - } -} diff --git a/src/main/main.iml b/src/main/main.iml index 7533b96..935392e 100644 --- a/src/main/main.iml +++ b/src/main/main.iml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/src/main/resources-filtered/version.txt b/src/main/resources-filtered/version.txt deleted file mode 100644 index e78e522..0000000 --- a/src/main/resources-filtered/version.txt +++ /dev/null @@ -1 +0,0 @@ -${version} \ No newline at end of file diff --git a/src/main/resources/es/kauron/jstudy/css/test.css b/src/main/resources/es/kauron/jstudy/css/test.css index bca46b8..235fe8a 100644 --- a/src/main/resources/es/kauron/jstudy/css/test.css +++ b/src/main/resources/es/kauron/jstudy/css/test.css @@ -1,7 +1,3 @@ .answer { -fx-font-weight: bold; -} - -.feedbackText { - -fx-font-size: 20; } \ No newline at end of file diff --git a/src/main/resources/es/kauron/jstudy/img/icon2.png b/src/main/resources/es/kauron/jstudy/img/icon2.png deleted file mode 100644 index 115c622..0000000 Binary files a/src/main/resources/es/kauron/jstudy/img/icon2.png and /dev/null differ diff --git a/src/main/resources/es/kauron/jstudy/view/edit.fxml b/src/main/resources/es/kauron/jstudy/view/edit.fxml new file mode 100644 index 0000000..80f7efa --- /dev/null +++ b/src/main/resources/es/kauron/jstudy/view/edit.fxml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/src/main/resources/es/kauron/jstudy/view/settings.fxml b/src/main/resources/es/kauron/jstudy/view/settings.fxml index 6397683..a0f191c 100644 --- a/src/main/resources/es/kauron/jstudy/view/settings.fxml +++ b/src/main/resources/es/kauron/jstudy/view/settings.fxml @@ -1,17 +1,14 @@ + - - - - - - - - - - - + + + + + + + + diff --git a/src/main/resources/es/kauron/jstudy/view/stats.fxml b/src/main/resources/es/kauron/jstudy/view/stats.fxml deleted file mode 100644 index a4d5d73..0000000 --- a/src/main/resources/es/kauron/jstudy/view/stats.fxml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/es/kauron/jstudy/view/table.fxml b/src/main/resources/es/kauron/jstudy/view/table.fxml index 88cb258..ef9ccd7 100644 --- a/src/main/resources/es/kauron/jstudy/view/table.fxml +++ b/src/main/resources/es/kauron/jstudy/view/table.fxml @@ -2,50 +2,107 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/es/kauron/jstudy/view/test.fxml b/src/main/resources/es/kauron/jstudy/view/test.fxml index e6cdd49..6c791a2 100644 --- a/src/main/resources/es/kauron/jstudy/view/test.fxml +++ b/src/main/resources/es/kauron/jstudy/view/test.fxml @@ -1,76 +1,77 @@ + + - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -