diff --git a/.classpath b/.classpath index 3dbcf24..148593c 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,6 @@ - @@ -13,6 +12,6 @@ - + diff --git a/.project b/.project index 11c1ea6..3248a11 100644 --- a/.project +++ b/.project @@ -21,10 +21,5 @@ 2 C:/Users/pabr6/eclipse-workspace/cXML - - resources - 2 - C:/Users/pabr6/git/analyseWriter/MEPTL/src/resources - diff --git a/analyseWriter.jar b/analyseWriter.jar index 9786792..4b7a992 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index a09484f..ed2d451 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,4 +1,4 @@ +/evaluer/ /fenetres/ /list/ -/MEPTL/ -/evaluer/ +/resources/ diff --git a/bin/doc1.html b/bin/doc1.html deleted file mode 100644 index 4dc4933..0000000 --- a/bin/doc1.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - -

-Documentation analyseWriter

- - \ No newline at end of file diff --git a/bin/documentation.png b/bin/documentation.png index 9b7ccd1..26bccaa 100644 Binary files a/bin/documentation.png and b/bin/documentation.png differ diff --git a/bin/documentation.svg b/bin/documentation.svg index 0c4799b..8ce21c2 100644 --- a/bin/documentation.svg +++ b/bin/documentation.svg @@ -1,10 +1,10 @@ + inkscape:snap-smooth-nodes="true" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1"> + position="-0.26024984,-3.5581931" + inkscape:locked="false" /> + id="guide3385" + inkscape:locked="false" /> + id="guide3467" + inkscape:locked="false" /> + id="guide3469" + inkscape:locked="false" /> + id="guide1694" + inkscape:locked="false" /> + id="guide1696" + inkscape:locked="false" /> + id="guide1869" + inkscape:locked="false" /> + id="guide1909" + inkscape:locked="false" /> + id="guide2101" + inkscape:locked="false" /> @@ -249,51 +260,88 @@ inkscape:groupmode="layer" inkscape:label="Calque 1" transform="translate(-1.1803834,-2.0081471)"> + - + id="g4404" + style="stroke-width:0.825615" + transform="matrix(1.2112183,0,0,1.2112183,-0.2135221,-2.2397824)"> - - - - + id="g4409" + style="stroke-width:0.825615"> + + - - DOC + + + DOC + + + + + + + + + + diff --git a/bin/documentationmax.png b/bin/documentationmax.png index 1f80535..cf0dae9 100644 Binary files a/bin/documentationmax.png and b/bin/documentationmax.png differ diff --git a/bin/documentationmini.png b/bin/documentationmini.png index 234b511..00c240a 100644 Binary files a/bin/documentationmini.png and b/bin/documentationmini.png differ diff --git a/bin/fenetres/about$1.class b/bin/fenetres/about$1.class index fc72bdc..1aebd1e 100644 Binary files a/bin/fenetres/about$1.class and b/bin/fenetres/about$1.class differ diff --git a/bin/fenetres/about.class b/bin/fenetres/about.class index e88ebb9..e7de4f7 100644 Binary files a/bin/fenetres/about.class and b/bin/fenetres/about.class differ diff --git a/bin/fenetres/create$1.class b/bin/fenetres/create$1.class index 2b631ba..e2b42d7 100644 Binary files a/bin/fenetres/create$1.class and b/bin/fenetres/create$1.class differ diff --git a/bin/fenetres/create$10.class b/bin/fenetres/create$10.class index d0b33c9..63e98db 100644 Binary files a/bin/fenetres/create$10.class and b/bin/fenetres/create$10.class differ diff --git a/bin/fenetres/create$11.class b/bin/fenetres/create$11.class index 199c039..74afba8 100644 Binary files a/bin/fenetres/create$11.class and b/bin/fenetres/create$11.class differ diff --git a/bin/fenetres/create$12.class b/bin/fenetres/create$12.class index 391f6a7..c850e97 100644 Binary files a/bin/fenetres/create$12.class and b/bin/fenetres/create$12.class differ diff --git a/bin/fenetres/create$13.class b/bin/fenetres/create$13.class index f84a9cc..cbcb5ee 100644 Binary files a/bin/fenetres/create$13.class and b/bin/fenetres/create$13.class differ diff --git a/bin/fenetres/create$14.class b/bin/fenetres/create$14.class index 7f8753d..a0c6338 100644 Binary files a/bin/fenetres/create$14.class and b/bin/fenetres/create$14.class differ diff --git a/bin/fenetres/create$2.class b/bin/fenetres/create$2.class index a922f67..83f52e7 100644 Binary files a/bin/fenetres/create$2.class and b/bin/fenetres/create$2.class differ diff --git a/bin/fenetres/create$3.class b/bin/fenetres/create$3.class index eca9116..a101582 100644 Binary files a/bin/fenetres/create$3.class and b/bin/fenetres/create$3.class differ diff --git a/bin/fenetres/create$4.class b/bin/fenetres/create$4.class index 656ed44..bc41f3d 100644 Binary files a/bin/fenetres/create$4.class and b/bin/fenetres/create$4.class differ diff --git a/bin/fenetres/create$5.class b/bin/fenetres/create$5.class index 21ee09b..da347e3 100644 Binary files a/bin/fenetres/create$5.class and b/bin/fenetres/create$5.class differ diff --git a/bin/fenetres/create$6.class b/bin/fenetres/create$6.class index 8965ebb..35e06bb 100644 Binary files a/bin/fenetres/create$6.class and b/bin/fenetres/create$6.class differ diff --git a/bin/fenetres/create$7.class b/bin/fenetres/create$7.class index c239a8f..99265a2 100644 Binary files a/bin/fenetres/create$7.class and b/bin/fenetres/create$7.class differ diff --git a/bin/fenetres/create$8.class b/bin/fenetres/create$8.class index 5e4b791..b179b06 100644 Binary files a/bin/fenetres/create$8.class and b/bin/fenetres/create$8.class differ diff --git a/bin/fenetres/create$9.class b/bin/fenetres/create$9.class index 636dcb5..dbe105d 100644 Binary files a/bin/fenetres/create$9.class and b/bin/fenetres/create$9.class differ diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class index 4232509..bb321ba 100644 Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ diff --git a/bin/fenetres/create_act/actDocumentation.class b/bin/fenetres/create_act/actDocumentation.class index 290fc2a..299082e 100644 Binary files a/bin/fenetres/create_act/actDocumentation.class and b/bin/fenetres/create_act/actDocumentation.class differ diff --git a/bin/fenetres/create_act/actEvaluer.class b/bin/fenetres/create_act/actEvaluer.class index cad4a62..5222dd5 100644 Binary files a/bin/fenetres/create_act/actEvaluer.class and b/bin/fenetres/create_act/actEvaluer.class differ diff --git a/bin/fenetres/create_act/actTousLesNodesEvaluer.class b/bin/fenetres/create_act/actTousLesNodesEvaluer.class index a89431b..fb72ee9 100644 Binary files a/bin/fenetres/create_act/actTousLesNodesEvaluer.class and b/bin/fenetres/create_act/actTousLesNodesEvaluer.class differ diff --git a/bin/fenetres/create_act/actTutoriels.class b/bin/fenetres/create_act/actTutoriels.class index 576374f..53299d9 100644 Binary files a/bin/fenetres/create_act/actTutoriels.class and b/bin/fenetres/create_act/actTutoriels.class differ diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class index da741ce..e2233a1 100644 Binary files a/bin/fenetres/evaluate$1.class and b/bin/fenetres/evaluate$1.class differ diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class index 243b22a..a462d10 100644 Binary files a/bin/fenetres/evaluate$10.class and b/bin/fenetres/evaluate$10.class differ diff --git a/bin/fenetres/evaluate$11.class b/bin/fenetres/evaluate$11.class index a90cd6a..3101370 100644 Binary files a/bin/fenetres/evaluate$11.class and b/bin/fenetres/evaluate$11.class differ diff --git a/bin/fenetres/evaluate$12.class b/bin/fenetres/evaluate$12.class index 86d3a1e..5301123 100644 Binary files a/bin/fenetres/evaluate$12.class and b/bin/fenetres/evaluate$12.class differ diff --git a/bin/fenetres/evaluate$13.class b/bin/fenetres/evaluate$13.class index cdcbdd1..72d378b 100644 Binary files a/bin/fenetres/evaluate$13.class and b/bin/fenetres/evaluate$13.class differ diff --git a/bin/fenetres/evaluate$14.class b/bin/fenetres/evaluate$14.class index e8ca281..0b72e3a 100644 Binary files a/bin/fenetres/evaluate$14.class and b/bin/fenetres/evaluate$14.class differ diff --git a/bin/fenetres/evaluate$15.class b/bin/fenetres/evaluate$15.class index 219d944..90df1d5 100644 Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ diff --git a/bin/fenetres/evaluate$16.class b/bin/fenetres/evaluate$16.class index 82849ee..7593c14 100644 Binary files a/bin/fenetres/evaluate$16.class and b/bin/fenetres/evaluate$16.class differ diff --git a/bin/fenetres/evaluate$17.class b/bin/fenetres/evaluate$17.class index 6fc17d2..48519bb 100644 Binary files a/bin/fenetres/evaluate$17.class and b/bin/fenetres/evaluate$17.class differ diff --git a/bin/fenetres/evaluate$18.class b/bin/fenetres/evaluate$18.class index 6a84ffd..5e3e6fb 100644 Binary files a/bin/fenetres/evaluate$18.class and b/bin/fenetres/evaluate$18.class differ diff --git a/bin/fenetres/evaluate$19.class b/bin/fenetres/evaluate$19.class index 15ef0be..0e2e305 100644 Binary files a/bin/fenetres/evaluate$19.class and b/bin/fenetres/evaluate$19.class differ diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class index 7ac5229..a41483d 100644 Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ diff --git a/bin/fenetres/evaluate$20.class b/bin/fenetres/evaluate$20.class index 79776f4..2d2490b 100644 Binary files a/bin/fenetres/evaluate$20.class and b/bin/fenetres/evaluate$20.class differ diff --git a/bin/fenetres/evaluate$21.class b/bin/fenetres/evaluate$21.class index 47279f6..236e51a 100644 Binary files a/bin/fenetres/evaluate$21.class and b/bin/fenetres/evaluate$21.class differ diff --git a/bin/fenetres/evaluate$22.class b/bin/fenetres/evaluate$22.class index b964b69..f6e2788 100644 Binary files a/bin/fenetres/evaluate$22.class and b/bin/fenetres/evaluate$22.class differ diff --git a/bin/fenetres/evaluate$23.class b/bin/fenetres/evaluate$23.class index f9592b2..099330d 100644 Binary files a/bin/fenetres/evaluate$23.class and b/bin/fenetres/evaluate$23.class differ diff --git a/bin/fenetres/evaluate$24.class b/bin/fenetres/evaluate$24.class index 0130c3e..80be2b8 100644 Binary files a/bin/fenetres/evaluate$24.class and b/bin/fenetres/evaluate$24.class differ diff --git a/bin/fenetres/evaluate$25.class b/bin/fenetres/evaluate$25.class index 654fdf4..834ca5a 100644 Binary files a/bin/fenetres/evaluate$25.class and b/bin/fenetres/evaluate$25.class differ diff --git a/bin/fenetres/evaluate$26.class b/bin/fenetres/evaluate$26.class index ff593bd..2afd5af 100644 Binary files a/bin/fenetres/evaluate$26.class and b/bin/fenetres/evaluate$26.class differ diff --git a/bin/fenetres/evaluate$27.class b/bin/fenetres/evaluate$27.class index 7d22231..1a5e60d 100644 Binary files a/bin/fenetres/evaluate$27.class and b/bin/fenetres/evaluate$27.class differ diff --git a/bin/fenetres/evaluate$28.class b/bin/fenetres/evaluate$28.class index d45e498..04fa9c5 100644 Binary files a/bin/fenetres/evaluate$28.class and b/bin/fenetres/evaluate$28.class differ diff --git a/bin/fenetres/evaluate$29.class b/bin/fenetres/evaluate$29.class index 15c6f7c..782ca13 100644 Binary files a/bin/fenetres/evaluate$29.class and b/bin/fenetres/evaluate$29.class differ diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class index 30c9ab9..4f221da 100644 Binary files a/bin/fenetres/evaluate$3.class and b/bin/fenetres/evaluate$3.class differ diff --git a/bin/fenetres/evaluate$30.class b/bin/fenetres/evaluate$30.class index 9a6cf3c..f391f86 100644 Binary files a/bin/fenetres/evaluate$30.class and b/bin/fenetres/evaluate$30.class differ diff --git a/bin/fenetres/evaluate$31.class b/bin/fenetres/evaluate$31.class index 583751c..a8393db 100644 Binary files a/bin/fenetres/evaluate$31.class and b/bin/fenetres/evaluate$31.class differ diff --git a/bin/fenetres/evaluate$32.class b/bin/fenetres/evaluate$32.class index 18ab59d..c3e4b98 100644 Binary files a/bin/fenetres/evaluate$32.class and b/bin/fenetres/evaluate$32.class differ diff --git a/bin/fenetres/evaluate$33.class b/bin/fenetres/evaluate$33.class deleted file mode 100644 index adb429f..0000000 Binary files a/bin/fenetres/evaluate$33.class and /dev/null differ diff --git a/bin/fenetres/evaluate$34.class b/bin/fenetres/evaluate$34.class deleted file mode 100644 index 4f0185e..0000000 Binary files a/bin/fenetres/evaluate$34.class and /dev/null differ diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class index b542cef..ddb9eb0 100644 Binary files a/bin/fenetres/evaluate$4.class and b/bin/fenetres/evaluate$4.class differ diff --git a/bin/fenetres/evaluate$5.class b/bin/fenetres/evaluate$5.class index 206adac..260dd11 100644 Binary files a/bin/fenetres/evaluate$5.class and b/bin/fenetres/evaluate$5.class differ diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class index b7dfc46..595e912 100644 Binary files a/bin/fenetres/evaluate$6.class and b/bin/fenetres/evaluate$6.class differ diff --git a/bin/fenetres/evaluate$7.class b/bin/fenetres/evaluate$7.class index 0f463dd..5a7fd81 100644 Binary files a/bin/fenetres/evaluate$7.class and b/bin/fenetres/evaluate$7.class differ diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class index eb979bc..013faaa 100644 Binary files a/bin/fenetres/evaluate$8.class and b/bin/fenetres/evaluate$8.class differ diff --git a/bin/fenetres/evaluate$9.class b/bin/fenetres/evaluate$9.class index da2babf..ca74618 100644 Binary files a/bin/fenetres/evaluate$9.class and b/bin/fenetres/evaluate$9.class differ diff --git a/bin/fenetres/evaluate.class b/bin/fenetres/evaluate.class index f8d7e1f..75e82f4 100644 Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ diff --git a/bin/fenetres/mainApp$2.class b/bin/fenetres/mainApp$2.class index d79db37..f4e3c29 100644 Binary files a/bin/fenetres/mainApp$2.class and b/bin/fenetres/mainApp$2.class differ diff --git a/bin/fenetres/mainApp.class b/bin/fenetres/mainApp.class index 7ff3d23..45af095 100644 Binary files a/bin/fenetres/mainApp.class and b/bin/fenetres/mainApp.class differ diff --git a/bin/licence.txt b/bin/licence.txt deleted file mode 100644 index 80e659d..0000000 --- a/bin/licence.txt +++ /dev/null @@ -1,674 +0,0 @@ -GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 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 General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/bin/resources/documentation.png b/bin/resources/documentation.png index 9b7ccd1..26bccaa 100644 Binary files a/bin/resources/documentation.png and b/bin/resources/documentation.png differ diff --git a/bin/resources/documentationmini.png b/bin/resources/documentationmini.png index 234b511..00c240a 100644 Binary files a/bin/resources/documentationmini.png and b/bin/resources/documentationmini.png differ diff --git a/icons/documentation.png b/icons/documentation.png index 9b7ccd1..26bccaa 100644 Binary files a/icons/documentation.png and b/icons/documentation.png differ diff --git a/icons/documentation.svg b/icons/documentation.svg index 0c4799b..8ce21c2 100644 --- a/icons/documentation.svg +++ b/icons/documentation.svg @@ -1,10 +1,10 @@ + inkscape:snap-smooth-nodes="true" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1"> + position="-0.26024984,-3.5581931" + inkscape:locked="false" /> + id="guide3385" + inkscape:locked="false" /> + id="guide3467" + inkscape:locked="false" /> + id="guide3469" + inkscape:locked="false" /> + id="guide1694" + inkscape:locked="false" /> + id="guide1696" + inkscape:locked="false" /> + id="guide1869" + inkscape:locked="false" /> + id="guide1909" + inkscape:locked="false" /> + id="guide2101" + inkscape:locked="false" /> @@ -249,51 +260,88 @@ inkscape:groupmode="layer" inkscape:label="Calque 1" transform="translate(-1.1803834,-2.0081471)"> + - + id="g4404" + style="stroke-width:0.825615" + transform="matrix(1.2112183,0,0,1.2112183,-0.2135221,-2.2397824)"> - - - - + id="g4409" + style="stroke-width:0.825615"> + + - - DOC + + + DOC + + + + + + + + + + diff --git a/icons/documentationmax.png b/icons/documentationmax.png index 1f80535..cf0dae9 100644 Binary files a/icons/documentationmax.png and b/icons/documentationmax.png differ diff --git a/icons/documentationmini.png b/icons/documentationmini.png index 234b511..00c240a 100644 Binary files a/icons/documentationmini.png and b/icons/documentationmini.png differ diff --git a/icons/odreparagraphe.png b/icons/odreparagraphe.png new file mode 100644 index 0000000..555d876 Binary files /dev/null and b/icons/odreparagraphe.png differ diff --git a/icons/odreparagraphemini.png b/icons/odreparagraphemini.png new file mode 100644 index 0000000..c4a8735 Binary files /dev/null and b/icons/odreparagraphemini.png differ diff --git a/icons/ordreparagraphe.svg b/icons/ordreparagraphe.svg new file mode 100644 index 0000000..b0908e4 --- /dev/null +++ b/icons/ordreparagraphe.svg @@ -0,0 +1,102 @@ + +image/svg+xml diff --git a/icons/versevaluate.png b/icons/versevaluate.png new file mode 100644 index 0000000..2158f06 Binary files /dev/null and b/icons/versevaluate.png differ diff --git a/icons/versevaluate.svg b/icons/versevaluate.svg new file mode 100644 index 0000000..eb506f5 --- /dev/null +++ b/icons/versevaluate.svg @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/versevaluatemini.png b/icons/versevaluatemini.png new file mode 100644 index 0000000..379c72c Binary files /dev/null and b/icons/versevaluatemini.png differ diff --git a/src/fenetres/about.java b/src/fenetres/about.java index 8c99861..f1dc96e 100644 --- a/src/fenetres/about.java +++ b/src/fenetres/about.java @@ -66,13 +66,13 @@ public final class about extends JFrame { lblNewLabelAnnee.setBounds(20, 120, 240, 20); contentPane.add(lblNewLabelAnnee); - JLabel lblCredit = new JLabel("Crédit"); + JLabel lblCredit = new JLabel("Crédit"); lblCredit.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 14)); lblCredit.setBounds(20, 268, 60, 20); getContentPane().add(lblCredit); - JLabel lblNewLabelAuteur = new JLabel("Auteur : P. Rodriguez"); + JLabel lblNewLabelAuteur = new JLabel("Auteur : Pablo Rodriguez"); lblNewLabelAuteur.setFont(new Font("Tahoma", Font.PLAIN, 14)); lblNewLabelAuteur.setBounds(20, 286, 240, 20); contentPane.add(lblNewLabelAuteur); @@ -92,10 +92,11 @@ public final class about extends JFrame { JLabel lblLicence = new JLabel("Licence : GNU GLP 3.0 "); lblLicence.setFont(new Font("Tahoma", Font.PLAIN, 14)); - lblLicence.setBounds(20, 330, 296, 35); + lblLicence.setBounds(305, 261, 187, 35); getContentPane().add(lblLicence); - JButton btnNewButton = new JButton("

Vérifier la version
Accès à la documentation

"); + JButton btnNewButton = new JButton("

Vérifier s'il y a
une nouvelle version

"); + btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 14)); btnNewButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -108,9 +109,15 @@ public final class about extends JFrame { } }); - btnNewButton.setBounds(290, 104, 202, 50); + btnNewButton.setBounds(270, 100, 222, 72); getContentPane().add(btnNewButton); + JLabel lblGPL3 = new JLabel(""); + lblGPL3.setHorizontalAlignment(SwingConstants.CENTER); + lblGPL3.setIcon(new ImageIcon(about.class.getResource("/resources/GPLv3.png"))); + lblGPL3.setBounds(315, 283, 139, 70); + getContentPane().add(lblGPL3); + } @@ -122,5 +129,4 @@ public final class about extends JFrame { instance.setVisible(true); return instance; } - } diff --git a/src/fenetres/create.java b/src/fenetres/create.java index 0c341f9..30b3dca 100644 --- a/src/fenetres/create.java +++ b/src/fenetres/create.java @@ -62,6 +62,8 @@ import fenetres.create_act.actEvalNumeroAbsoluePageNon; import fenetres.create_act.actEvalNumeroAbsoluePageOui; import fenetres.create_act.actEvalNumeroPageNon; import fenetres.create_act.actEvalNumeroPageOui; +import fenetres.create_act.actEvalOrdreParagrapheNon; +import fenetres.create_act.actEvalOrdreParagrapheOui; import fenetres.create_act.actEvalPiedPageActive; import fenetres.create_act.actEvalPiedPageActiveNon; import fenetres.create_act.actEvalPiedPagePasActive; @@ -79,6 +81,7 @@ import fenetres.create_act.actEvaluerTousLesStylesParagraphesTrue; import fenetres.create_act.actExit; import fenetres.create_act.actExpandAll; import fenetres.create_act.actExpandNode; +import fenetres.create_act.actLicence; import fenetres.create_act.actNewFichierAnalyse; import fenetres.create_act.actNodeFichier; import fenetres.create_act.actOpen; @@ -447,11 +450,16 @@ public final class create extends JFrame { mnEvaluerStylesParagraphes.add( new actEvaluerTousLesStylesParagraphesTrue()); //Menu OU - JMenu mnOu = new JMenu("Insérer un node OU."); + JMenu mnOu = new JMenu("Insérer un node OU"); mnOu.setIcon(new ImageIcon(create.class.getResource("/resources/oumini.png"))); mnOu.add( new actOu()); - + //Menu ordreParagraphe + JMenu mnOrdreParagraphe = new JMenu("Ordre des paragraphe"); + mnOrdreParagraphe.setIcon(new ImageIcon(create.class.getResource("/resources/ordreparagraphemini.png"))); + mnOrdreParagraphe.add(new actEvalOrdreParagrapheOui()); + mnOrdreParagraphe.add(new actEvalOrdreParagrapheNon()); + //*************************** //** Menu node niveau = 1 *** @@ -476,8 +484,12 @@ public final class create extends JFrame { if(nod.getLevel()==1 ) { mnPopupTree.addSeparator(); mnPopupTree.add(mnNiveau1); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnOu); + if(nod.getNomElt().equals("structurepage")){ + mnPopupTree.addSeparator(); + mnPopupTree.add(mnOu); + mnPopupTree.addSeparator(); + mnPopupTree.add(mnOrdreParagraphe); + } } //Pour les nodes de niveau supérieur à 1 @@ -649,11 +661,15 @@ public final class create extends JFrame { menuBar.add(mnuExercice); // Définition du menu déroulant "Help" et de son contenu - JMenu mnuHelp = new JMenu( "Aide" ); + JMenu mnuHelp = new JMenu( "Aides" ); mnuHelp.setMnemonic( 'H' ); - mnuHelp.add( new actAPropos()); + mnuHelp.addSeparator(); mnuHelp.add( new actDocumentation()); + mnuHelp.addSeparator(); + mnuHelp.add( new actTutoriels()); + mnuHelp.addSeparator(); + mnuHelp.add( new actLicence()); menuBar.add( mnuHelp ); @@ -689,7 +705,7 @@ public final class create extends JFrame { public void actionPerformed(ActionEvent e) { } }); - buttonEvaluate.setIcon(new ImageIcon(create.class.getResource("/resources/evaluate.png"))); + buttonEvaluate.setIcon(new ImageIcon(create.class.getResource("/resources/versevaluate.png"))); toolBarPrincipal.addSeparator(); @@ -800,7 +816,7 @@ public final class create extends JFrame { JButton btnNewButton = toolBarPrincipal.add( new actTutoriels()); - btnNewButton.setIcon(new ImageIcon(create.class.getResource("/resources/tutoriel.png"))); + btnNewButton.setIcon(new ImageIcon(create.class.getResource("/resources/documentation.png"))); btnNewButton.setHideActionText(true); toolBarPrincipal.add(btnNewButton); diff --git a/src/fenetres/create_act/actDocumentation.java b/src/fenetres/create_act/actDocumentation.java index 05036c0..e464bcc 100644 --- a/src/fenetres/create_act/actDocumentation.java +++ b/src/fenetres/create_act/actDocumentation.java @@ -31,7 +31,8 @@ public class actDocumentation extends AbstractAction{ public void actionPerformed(ActionEvent e) { Desktop d = Desktop.getDesktop(); try { - d.open(new File(create.class.getResource("/resources/documentation.pdf").getPath())); + String url = "https://sites.google.com/view/analyseWriter"; + java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); } catch (IOException e1) { e1.printStackTrace(); } diff --git a/src/fenetres/create_act/actEvalOrdreParagrapheNon.java b/src/fenetres/create_act/actEvalOrdreParagrapheNon.java new file mode 100644 index 0000000..8183d96 --- /dev/null +++ b/src/fenetres/create_act/actEvalOrdreParagrapheNon.java @@ -0,0 +1,24 @@ +package fenetres.create_act; + +import java.awt.event.ActionEvent; + +import javax.swing.AbstractAction; +import javax.swing.Action; + +public class actEvalOrdreParagrapheNon extends AbstractAction{ + + /** + * + */ + private static final long serialVersionUID = 1L; + { + putValue( Action.NAME, "Supprimer évaluer l'ordre des paragraphes" ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'ordre des paragraphes" ); + } + @Override + public void actionPerformed(ActionEvent e) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/fenetres/create_act/actEvalOrdreParagrapheOui.java b/src/fenetres/create_act/actEvalOrdreParagrapheOui.java new file mode 100644 index 0000000..23260bc --- /dev/null +++ b/src/fenetres/create_act/actEvalOrdreParagrapheOui.java @@ -0,0 +1,24 @@ +package fenetres.create_act; + +import java.awt.event.ActionEvent; + +import javax.swing.AbstractAction; +import javax.swing.Action; + +public class actEvalOrdreParagrapheOui extends AbstractAction{ + + /** + * + */ + private static final long serialVersionUID = 1L; + { + putValue( Action.NAME, "Oui, combien de point?" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer l'ordre des paragraphes" ); + } + @Override + public void actionPerformed(ActionEvent e) { + + + } + +} diff --git a/src/fenetres/create_act/actEvaluer.java b/src/fenetres/create_act/actEvaluer.java index 6063a49..4248573 100644 --- a/src/fenetres/create_act/actEvaluer.java +++ b/src/fenetres/create_act/actEvaluer.java @@ -19,7 +19,7 @@ public class actEvaluer extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Evaluer" ); - putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/evaluate.png") ) ); + putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/resources/evaluate.png") ) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_E ); putValue( Action.SHORT_DESCRIPTION, "Evaluer un node (CTRL+E)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_DOWN_MASK) ); diff --git a/src/fenetres/create_act/actLicence.java b/src/fenetres/create_act/actLicence.java new file mode 100644 index 0000000..4920730 --- /dev/null +++ b/src/fenetres/create_act/actLicence.java @@ -0,0 +1,32 @@ +package fenetres.create_act; + +import java.awt.event.ActionEvent; +import java.io.IOException; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.ImageIcon; + + +public class actLicence extends AbstractAction{ + + /** + * + */ + private static final long serialVersionUID = 1L; + { + putValue( Action.NAME, "Licence" ); + putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/resources/GPLv3mini.png") ) ); + putValue( Action.SHORT_DESCRIPTION, "Affiche la page de la licence" ); + } + @Override + public void actionPerformed(ActionEvent e) { + try { + String url = "https://www.gnu.org/licenses/gpl-3.0.html"; + java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + +} diff --git a/src/fenetres/create_act/actTousLesNodesEvaluer.java b/src/fenetres/create_act/actTousLesNodesEvaluer.java index 604a5fd..cd952e0 100644 --- a/src/fenetres/create_act/actTousLesNodesEvaluer.java +++ b/src/fenetres/create_act/actTousLesNodesEvaluer.java @@ -24,9 +24,11 @@ public class actTousLesNodesEvaluer extends AbstractAction{ public void actionPerformed(ActionEvent e) { if(fenetres.create.getTglbtnTousLesNodes().isSelected()) { try { + commandes.sujetSauvegarde = commandes.sujet.clone(); commandes.sujet.supprimeTousLesNodesEvaluerFalseOuNull(); commandes.fichierAnalyseValide=false; + fenetres.create.getTextNodeSelect().setContentType("text/html"); fenetres.create.getTextNodeSelect().setText("

Affiche uniquement les nodes évalués par l'application.

" + "

Le chemin vers chaque node évalué est constitué de node évalué.
" diff --git a/src/fenetres/create_act/actTutoriels.java b/src/fenetres/create_act/actTutoriels.java index 7253d92..7affa0d 100644 --- a/src/fenetres/create_act/actTutoriels.java +++ b/src/fenetres/create_act/actTutoriels.java @@ -24,7 +24,7 @@ public class actTutoriels extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { try { - String url = "https://www.youtube.com/channel/UCBSfItcCVnbRJdQbVE9ppjQ"; + String url = "https://www.youtube.com/@analysewriter7611"; java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); } catch (java.io.IOException e1) { diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java index 2174fc4..1caf323 100644 --- a/src/fenetres/evaluate.java +++ b/src/fenetres/evaluate.java @@ -19,6 +19,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -38,7 +39,11 @@ import MEPTL.meptl; import cXML.Run; import cXML.node; import fenetres.create_act.actAbout; +import fenetres.create_act.actDocumentation; +import fenetres.create_act.actLicence; +import fenetres.create_act.actTutoriels; import net.miginfocom.swing.MigLayout; +import fenetres.create_act.actLicence; public class evaluate extends JFrame { @@ -68,8 +73,6 @@ public class evaluate extends JFrame { private JCheckBox chckbxNewLogo; private JCheckBox chckbxNoDetail; private afficheText txtpnmessages; - - /** * Create the frame. @@ -375,13 +378,15 @@ public class evaluate extends JFrame { mnMenu_Evaluation.addSeparator(); mnMenu_Evaluation.add(actVerifHistorique); - JMenu mnMenu_Informations = new JMenu("Informations"); + JMenu mnMenu_Informations = new JMenu("Aides"); menuBar.add(mnMenu_Informations); - mnMenu_Informations.add(actTutoriels); - mnMenu_Informations.addSeparator(); mnMenu_Informations.add( new actAbout() ); mnMenu_Informations.addSeparator(); - mnMenu_Informations.add(actDocumentation); + mnMenu_Informations.add(new actDocumentation()); + mnMenu_Informations.addSeparator(); + mnMenu_Informations.add(new actTutoriels()); + mnMenu_Informations.addSeparator(); + mnMenu_Informations.add( new actLicence()); } @@ -485,8 +490,8 @@ public class evaluate extends JFrame { btnAbout.setHideActionText(true); toolBar.add(btnAbout); - JButton btnTutoriels = toolBar.add(actTutoriels); - btnTutoriels.setIcon(new ImageIcon(evaluate.class.getResource("/resources/tutoriel.png"))); + JButton btnTutoriels = toolBar.add(new actDocumentation()); + btnTutoriels.setIcon(new ImageIcon(evaluate.class.getResource("/resources/documentation.png"))); toolBar.add(btnTutoriels); toolBar.addSeparator(); @@ -896,57 +901,9 @@ public class evaluate extends JFrame { - /** - * Affiche les tutoriels sur Youtube.
- */ - private AbstractAction actTutoriels = new AbstractAction() { - - private static final long serialVersionUID = 1L; - - { - putValue( Action.NAME, "Tutoriels" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/tutorielmini.png"))); - putValue(Action.LARGE_ICON_KEY, new ImageIcon(create.class.getResource("/resources/tutoriel.png"))); - putValue( Action.SHORT_DESCRIPTION, "Tutoriels" ); - } - - @Override public void actionPerformed( ActionEvent e ) { - try { - String url = "https://www.youtube.com/channel/UCBSfItcCVnbRJdQbVE9ppjQ"; - java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); - } - catch (java.io.IOException e1) { - System.out.println(e1.getMessage()); - } - System.out.println( "Affiche les tutoriels." ); - } - }; + - - /** - * Affiche les tutoriels sur Youtube.
- */ - private AbstractAction actDocumentation = new AbstractAction() { - - private static final long serialVersionUID = 1L; - - { - putValue( Action.NAME, "Documentation analyseWriter" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/documentationmini.png"))); - putValue(Action.LARGE_ICON_KEY, new ImageIcon(create.class.getResource("/resources/documentation.png"))); - putValue( Action.SHORT_DESCRIPTION, "Tutoriels" ); - } - - @Override public void actionPerformed( ActionEvent e ) { - - - - - }; - - }; - /** * Affiche le code XMl du fichier d'analyse */ diff --git a/src/fenetres/mainApp.java b/src/fenetres/mainApp.java index 7aa121f..a02e9df 100644 --- a/src/fenetres/mainApp.java +++ b/src/fenetres/mainApp.java @@ -92,7 +92,7 @@ public class mainApp extends JFrame implements ActionListener{ lblNewLabel.setBounds(10, 25, 470, 74); frmEvalwriter.getContentPane().add(lblNewLabel); - JButton btnNewButton = new JButton("Version & Documentation"); + JButton btnNewButton = new JButton("Verif. version"); btnNewButton.setHorizontalAlignment(SwingConstants.LEFT); btnNewButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -104,11 +104,11 @@ public class mainApp extends JFrame implements ActionListener{ btnNewButton.setBounds(34, 270, 200, 60); frmEvalwriter.getContentPane().add(btnNewButton); - JButton btnTutoriels = new JButton("Tutoriels"); + JButton btnTutoriels = new JButton("Documentations"); btnTutoriels.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { - String url = "https://www.youtube.com/channel/UCBSfItcCVnbRJdQbVE9ppjQ"; + String url = "https://sites.google.com/view/analyseWriter"; java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); } catch (java.io.IOException e1) { @@ -117,7 +117,7 @@ public class mainApp extends JFrame implements ActionListener{ System.out.println( "Affiche les tutoriels." ); } }); - btnTutoriels.setIcon(new ImageIcon(mainApp.class.getResource("/resources/tutoriel.png"))); + btnTutoriels.setIcon(new ImageIcon(mainApp.class.getResource("/resources/documentation.png"))); btnTutoriels.setHorizontalAlignment(SwingConstants.LEFT); btnTutoriels.setFont(new Font("Arial", Font.PLAIN, 14)); btnTutoriels.setBounds(254, 270, 200, 60); diff --git a/src/resources/GPLv3.png b/src/resources/GPLv3.png new file mode 100644 index 0000000..55287db Binary files /dev/null and b/src/resources/GPLv3.png differ diff --git a/src/resources/GPLv3mini.png b/src/resources/GPLv3mini.png new file mode 100644 index 0000000..bd974ed Binary files /dev/null and b/src/resources/GPLv3mini.png differ diff --git a/src/resources/documentation.png b/src/resources/documentation.png index 9b7ccd1..26bccaa 100644 Binary files a/src/resources/documentation.png and b/src/resources/documentation.png differ diff --git a/src/resources/documentationmax.png b/src/resources/documentationmax.png new file mode 100644 index 0000000..cf0dae9 Binary files /dev/null and b/src/resources/documentationmax.png differ diff --git a/src/resources/documentationmini.png b/src/resources/documentationmini.png index 234b511..00c240a 100644 Binary files a/src/resources/documentationmini.png and b/src/resources/documentationmini.png differ diff --git a/src/resources/ordreparagraphe.png b/src/resources/ordreparagraphe.png new file mode 100644 index 0000000..555d876 Binary files /dev/null and b/src/resources/ordreparagraphe.png differ diff --git a/src/resources/ordreparagraphemini.png b/src/resources/ordreparagraphemini.png new file mode 100644 index 0000000..c4a8735 Binary files /dev/null and b/src/resources/ordreparagraphemini.png differ diff --git a/src/resources/versevaluate.png b/src/resources/versevaluate.png new file mode 100644 index 0000000..2158f06 Binary files /dev/null and b/src/resources/versevaluate.png differ diff --git a/src/resources/versevaluatemini.png b/src/resources/versevaluatemini.png new file mode 100644 index 0000000..379c72c Binary files /dev/null and b/src/resources/versevaluatemini.png differ