diff --git a/analyseWriter.jar b/analyseWriter.jar index 7a6c0c4..473c933 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 2a33792..67493bc 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,18 +1,3 @@ -/app/ /MEPTL/ +/app/ /calcul/ -/couleur.png -/couleur.svg -/couleurmini.png -/similitude.png -/similitude.svg -/similitudemini.png -/traduction.png -/traduction.svg -/traductionmini.png -/triche.png -/triche.svg -/trichemini.png -/zip.png -/zip.svg -/zipmini.png diff --git a/bin/app/create$10.class b/bin/app/create$10.class index f486fe2..bff57fd 100644 Binary files a/bin/app/create$10.class and b/bin/app/create$10.class differ diff --git a/bin/app/create$11.class b/bin/app/create$11.class index b5f9d9d..eb8c029 100644 Binary files a/bin/app/create$11.class and b/bin/app/create$11.class differ diff --git a/bin/app/create$12.class b/bin/app/create$12.class index e62f6a7..9d5aba5 100644 Binary files a/bin/app/create$12.class and b/bin/app/create$12.class differ diff --git a/bin/app/create$13.class b/bin/app/create$13.class index 7f76345..a1c10b6 100644 Binary files a/bin/app/create$13.class and b/bin/app/create$13.class differ diff --git a/bin/app/create$14.class b/bin/app/create$14.class index 2e42c3b..8b37558 100644 Binary files a/bin/app/create$14.class and b/bin/app/create$14.class differ diff --git a/bin/app/create$15.class b/bin/app/create$15.class index 75cddd0..dd68cdf 100644 Binary files a/bin/app/create$15.class and b/bin/app/create$15.class differ diff --git a/bin/app/create$16.class b/bin/app/create$16.class index 116e37e..c7496c0 100644 Binary files a/bin/app/create$16.class and b/bin/app/create$16.class differ diff --git a/bin/app/create$17.class b/bin/app/create$17.class index 1bba496..e144bf3 100644 Binary files a/bin/app/create$17.class and b/bin/app/create$17.class differ diff --git a/bin/app/create$18.class b/bin/app/create$18.class index a028349..d47f54c 100644 Binary files a/bin/app/create$18.class and b/bin/app/create$18.class differ diff --git a/bin/app/create$19.class b/bin/app/create$19.class index f5dfb60..e314fba 100644 Binary files a/bin/app/create$19.class and b/bin/app/create$19.class differ diff --git a/bin/app/create$20.class b/bin/app/create$20.class index f49f1bd..ffd3dfe 100644 Binary files a/bin/app/create$20.class and b/bin/app/create$20.class differ diff --git a/bin/app/create$21.class b/bin/app/create$21.class index 7c068fc..d2bdb8a 100644 Binary files a/bin/app/create$21.class and b/bin/app/create$21.class differ diff --git a/bin/app/create$22.class b/bin/app/create$22.class index 12ac989..79820eb 100644 Binary files a/bin/app/create$22.class and b/bin/app/create$22.class differ diff --git a/bin/app/create$23.class b/bin/app/create$23.class index ab9bfb4..1c801e9 100644 Binary files a/bin/app/create$23.class and b/bin/app/create$23.class differ diff --git a/bin/app/create$24.class b/bin/app/create$24.class index 0164ba7..cbe8de4 100644 Binary files a/bin/app/create$24.class and b/bin/app/create$24.class differ diff --git a/bin/app/create$25.class b/bin/app/create$25.class index 80565dc..6271a39 100644 Binary files a/bin/app/create$25.class and b/bin/app/create$25.class differ diff --git a/bin/app/create$26.class b/bin/app/create$26.class index 2b6ac72..9cf8879 100644 Binary files a/bin/app/create$26.class and b/bin/app/create$26.class differ diff --git a/bin/app/create$27.class b/bin/app/create$27.class index b383713..1cd5e5f 100644 Binary files a/bin/app/create$27.class and b/bin/app/create$27.class differ diff --git a/bin/app/create$28.class b/bin/app/create$28.class index 73715c6..71fa1c2 100644 Binary files a/bin/app/create$28.class and b/bin/app/create$28.class differ diff --git a/bin/app/create$29.class b/bin/app/create$29.class index 408bcb5..fdbc13d 100644 Binary files a/bin/app/create$29.class and b/bin/app/create$29.class differ diff --git a/bin/app/create$30.class b/bin/app/create$30.class index e025c4e..a5e241f 100644 Binary files a/bin/app/create$30.class and b/bin/app/create$30.class differ diff --git a/bin/app/create$31.class b/bin/app/create$31.class index 744c9ab..46fbda3 100644 Binary files a/bin/app/create$31.class and b/bin/app/create$31.class differ diff --git a/bin/app/create$32.class b/bin/app/create$32.class index de94d2a..0f6e43e 100644 Binary files a/bin/app/create$32.class and b/bin/app/create$32.class differ diff --git a/bin/app/create$33.class b/bin/app/create$33.class index 2762b1c..d4bd972 100644 Binary files a/bin/app/create$33.class and b/bin/app/create$33.class differ diff --git a/bin/app/create$34.class b/bin/app/create$34.class index c375a52..0ee41bb 100644 Binary files a/bin/app/create$34.class and b/bin/app/create$34.class differ diff --git a/bin/app/create$35.class b/bin/app/create$35.class index 7d17987..b97d4c1 100644 Binary files a/bin/app/create$35.class and b/bin/app/create$35.class differ diff --git a/bin/app/create$36.class b/bin/app/create$36.class index a2894db..ebbf91b 100644 Binary files a/bin/app/create$36.class and b/bin/app/create$36.class differ diff --git a/bin/app/create$37.class b/bin/app/create$37.class index c6fc0ab..2f7efe5 100644 Binary files a/bin/app/create$37.class and b/bin/app/create$37.class differ diff --git a/bin/app/create$38.class b/bin/app/create$38.class index d3cc997..ded676a 100644 Binary files a/bin/app/create$38.class and b/bin/app/create$38.class differ diff --git a/bin/app/create$39.class b/bin/app/create$39.class index ee5929b..18a2b01 100644 Binary files a/bin/app/create$39.class and b/bin/app/create$39.class differ diff --git a/bin/app/create$4.class b/bin/app/create$4.class index 2b6232c..1af0574 100644 Binary files a/bin/app/create$4.class and b/bin/app/create$4.class differ diff --git a/bin/app/create$40.class b/bin/app/create$40.class index 69820dd..d29a3eb 100644 Binary files a/bin/app/create$40.class and b/bin/app/create$40.class differ diff --git a/bin/app/create$41.class b/bin/app/create$41.class index 847a661..e8a7bc3 100644 Binary files a/bin/app/create$41.class and b/bin/app/create$41.class differ diff --git a/bin/app/create$42.class b/bin/app/create$42.class index 59092e7..413b38c 100644 Binary files a/bin/app/create$42.class and b/bin/app/create$42.class differ diff --git a/bin/app/create$43.class b/bin/app/create$43.class index 964605d..38d5491 100644 Binary files a/bin/app/create$43.class and b/bin/app/create$43.class differ diff --git a/bin/app/create$44.class b/bin/app/create$44.class index aefb27e..2e0c4eb 100644 Binary files a/bin/app/create$44.class and b/bin/app/create$44.class differ diff --git a/bin/app/create$45.class b/bin/app/create$45.class index 70d00c2..6ff6e2f 100644 Binary files a/bin/app/create$45.class and b/bin/app/create$45.class differ diff --git a/bin/app/create$46.class b/bin/app/create$46.class index f65a361..4fbaa20 100644 Binary files a/bin/app/create$46.class and b/bin/app/create$46.class differ diff --git a/bin/app/create$47.class b/bin/app/create$47.class index f6ad207..d4a54b0 100644 Binary files a/bin/app/create$47.class and b/bin/app/create$47.class differ diff --git a/bin/app/create$48.class b/bin/app/create$48.class index 75139de..3fac1bd 100644 Binary files a/bin/app/create$48.class and b/bin/app/create$48.class differ diff --git a/bin/app/create$49.class b/bin/app/create$49.class index ec28858..868035d 100644 Binary files a/bin/app/create$49.class and b/bin/app/create$49.class differ diff --git a/bin/app/create$5.class b/bin/app/create$5.class index 3ea0656..be881d2 100644 Binary files a/bin/app/create$5.class and b/bin/app/create$5.class differ diff --git a/bin/app/create$50.class b/bin/app/create$50.class index 1ba7e2e..9f9a573 100644 Binary files a/bin/app/create$50.class and b/bin/app/create$50.class differ diff --git a/bin/app/create$51.class b/bin/app/create$51.class index 9cc00ba..abb8089 100644 Binary files a/bin/app/create$51.class and b/bin/app/create$51.class differ diff --git a/bin/app/create$52.class b/bin/app/create$52.class index 284ab80..13e162d 100644 Binary files a/bin/app/create$52.class and b/bin/app/create$52.class differ diff --git a/bin/app/create$53.class b/bin/app/create$53.class index 82ea548..44798a6 100644 Binary files a/bin/app/create$53.class and b/bin/app/create$53.class differ diff --git a/bin/app/create$54.class b/bin/app/create$54.class index c559abc..2785a58 100644 Binary files a/bin/app/create$54.class and b/bin/app/create$54.class differ diff --git a/bin/app/create$55.class b/bin/app/create$55.class index 270835b..0d059b1 100644 Binary files a/bin/app/create$55.class and b/bin/app/create$55.class differ diff --git a/bin/app/create$56.class b/bin/app/create$56.class index 7b02c89..3e3c797 100644 Binary files a/bin/app/create$56.class and b/bin/app/create$56.class differ diff --git a/bin/app/create$57.class b/bin/app/create$57.class index 2ccc331..fd5356c 100644 Binary files a/bin/app/create$57.class and b/bin/app/create$57.class differ diff --git a/bin/app/create$6.class b/bin/app/create$6.class index d554e37..4d09d26 100644 Binary files a/bin/app/create$6.class and b/bin/app/create$6.class differ diff --git a/bin/app/create$7.class b/bin/app/create$7.class index 716679b..0da8876 100644 Binary files a/bin/app/create$7.class and b/bin/app/create$7.class differ diff --git a/bin/app/create$8.class b/bin/app/create$8.class index ddba536..bc5d64b 100644 Binary files a/bin/app/create$8.class and b/bin/app/create$8.class differ diff --git a/bin/app/create$9.class b/bin/app/create$9.class index d5b9bf9..ceacc6b 100644 Binary files a/bin/app/create$9.class and b/bin/app/create$9.class differ diff --git a/bin/app/create.class b/bin/app/create.class index e3bbca4..b7bd5c2 100644 Binary files a/bin/app/create.class and b/bin/app/create.class differ diff --git a/bin/app/filechooserXML.class b/bin/app/filechooserXML.class index 72ace3a..9321d60 100644 Binary files a/bin/app/filechooserXML.class and b/bin/app/filechooserXML.class differ diff --git a/bin/couleur.png b/bin/couleur.png new file mode 100644 index 0000000..6762b3d Binary files /dev/null and b/bin/couleur.png differ diff --git a/bin/couleur.svg b/bin/couleur.svg new file mode 100644 index 0000000..6fe6464 --- /dev/null +++ b/bin/couleur.svg @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/bin/couleurmini.png b/bin/couleurmini.png new file mode 100644 index 0000000..5e82950 Binary files /dev/null and b/bin/couleurmini.png differ diff --git a/bin/similitude.png b/bin/similitude.png new file mode 100644 index 0000000..6b2887e Binary files /dev/null and b/bin/similitude.png differ diff --git a/bin/similitude.svg b/bin/similitude.svg new file mode 100644 index 0000000..42d53ce --- /dev/null +++ b/bin/similitude.svg @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + A a + + + + + diff --git a/bin/similitudemini.png b/bin/similitudemini.png new file mode 100644 index 0000000..89e7c70 Binary files /dev/null and b/bin/similitudemini.png differ diff --git a/bin/traduction.png b/bin/traduction.png new file mode 100644 index 0000000..e58237e Binary files /dev/null and b/bin/traduction.png differ diff --git a/bin/traduction.svg b/bin/traduction.svg new file mode 100644 index 0000000..a9ec84d --- /dev/null +++ b/bin/traduction.svg @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + XML + + + A + + + + + diff --git a/bin/traductionmini.png b/bin/traductionmini.png new file mode 100644 index 0000000..d9a0805 Binary files /dev/null and b/bin/traductionmini.png differ diff --git a/bin/triche.png b/bin/triche.png new file mode 100644 index 0000000..f649dca Binary files /dev/null and b/bin/triche.png differ diff --git a/bin/triche.svg b/bin/triche.svg new file mode 100644 index 0000000..6c7f0c0 --- /dev/null +++ b/bin/triche.svg @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/bin/trichemini.png b/bin/trichemini.png new file mode 100644 index 0000000..4ff1d60 Binary files /dev/null and b/bin/trichemini.png differ diff --git a/bin/zip.png b/bin/zip.png new file mode 100644 index 0000000..a196233 Binary files /dev/null and b/bin/zip.png differ diff --git a/bin/zip.svg b/bin/zip.svg new file mode 100644 index 0000000..383e495 --- /dev/null +++ b/bin/zip.svg @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + ZIP + + + diff --git a/bin/zipmini.png b/bin/zipmini.png new file mode 100644 index 0000000..516c7ab Binary files /dev/null and b/bin/zipmini.png differ diff --git a/src/app/create.java b/src/app/create.java index 252772d..4766f1b 100644 --- a/src/app/create.java +++ b/src/app/create.java @@ -694,7 +694,7 @@ public class create extends JFrame { }; /** - * + * Affiche la fenêtre setting (une seule instance) */ private AbstractAction actSetting = new AbstractAction() { @@ -710,16 +710,14 @@ public class create extends JFrame { @Override public void actionPerformed( ActionEvent e ) { if(commandes.sujet.getNomElt().equals("fichier")) { -// new setting(); - setting.getInstance(); - + //Ouvre une seule instance de la fenêtre setting. + setting.getInstance(); } - System.out.println( "ouvre la fenêtre setting" ); } }; /** - * + * Affiche la fenêtre attribut. Il peut y avoir plusieurs instances. */ private AbstractAction actAttribut = new AbstractAction() { @@ -2303,6 +2301,8 @@ public class create extends JFrame { commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-start"); commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-end"); + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); + commandes.sujetSauvegarde = commandes.sujet.clone(); diff --git a/src/app/filechooserXML.java b/src/app/filechooserXML.java index c72286a..99eb85d 100644 --- a/src/app/filechooserXML.java +++ b/src/app/filechooserXML.java @@ -77,6 +77,7 @@ public class filechooserXML extends JFileChooser { commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-start"); //historique des modification commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-end"); + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); commandes.sujetSauvegarde = commandes.sujet.clone();