diff --git a/analyseWriter.jar b/analyseWriter.jar index 54a2c33..0c31fd2 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 6c2d537..a09484f 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,14 +1,4 @@ /fenetres/ -/resources/ +/list/ /MEPTL/ /evaluer/ -/sautmultiple.png -/sautmultiple.svg -/sautmultiplemini.png -/versfichierAnalyse.png -/versfichierAnalyseModifmax.svg -/list/ -/feedbackmini.png -/marquenode.png -/marquenode.svg -/marquenodemini.png diff --git a/bin/MEPTL/HTML.class b/bin/MEPTL/HTML.class index 809ca6e..01f4b7d 100644 Binary files a/bin/MEPTL/HTML.class and b/bin/MEPTL/HTML.class differ diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class index b5371c4..b1784e0 100644 Binary files a/bin/MEPTL/meptl.class and b/bin/MEPTL/meptl.class differ diff --git a/bin/MEPTL/rechercherUnNodeStudent.class b/bin/MEPTL/rechercherUnNodeStudent.class index 7169a50..ae6d772 100644 Binary files a/bin/MEPTL/rechercherUnNodeStudent.class and b/bin/MEPTL/rechercherUnNodeStudent.class differ diff --git a/bin/evaluer/analyseLesNodesEnfants.class b/bin/evaluer/analyseLesNodesEnfants.class index 3992c37..56a2547 100644 Binary files a/bin/evaluer/analyseLesNodesEnfants.class and b/bin/evaluer/analyseLesNodesEnfants.class differ diff --git a/bin/false.png b/bin/false.png new file mode 100644 index 0000000..6395d7f Binary files /dev/null and b/bin/false.png differ diff --git a/bin/false.svg b/bin/false.svg new file mode 100644 index 0000000..50cc618 --- /dev/null +++ b/bin/false.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/falsemini.png b/bin/falsemini.png new file mode 100644 index 0000000..e4dedb4 Binary files /dev/null and b/bin/falsemini.png differ diff --git a/bin/feedbackmini.png b/bin/feedbackmini.png new file mode 100644 index 0000000..9c56f06 Binary files /dev/null and b/bin/feedbackmini.png differ diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class index d3a84c5..35811b5 100644 Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ diff --git a/bin/fenetres/createPopupMenu.class b/bin/fenetres/createPopupMenu.class index d326015..c092809 100644 Binary files a/bin/fenetres/createPopupMenu.class and b/bin/fenetres/createPopupMenu.class differ diff --git a/bin/fenetres/create_act/actAddMenuFalse.class b/bin/fenetres/create_act/actAddMenuFalse.class index 7a9e31e..ee61e01 100644 Binary files a/bin/fenetres/create_act/actAddMenuFalse.class and b/bin/fenetres/create_act/actAddMenuFalse.class differ diff --git a/bin/fenetres/create_act/actAddMenuTrue.class b/bin/fenetres/create_act/actAddMenuTrue.class index ddd0aa5..69adbad 100644 Binary files a/bin/fenetres/create_act/actAddMenuTrue.class and b/bin/fenetres/create_act/actAddMenuTrue.class differ diff --git a/bin/fenetres/create_act/actEvalEnteteActive.class b/bin/fenetres/create_act/actEvalEnteteActive.class index 5249cf9..b6f6bc0 100644 Binary files a/bin/fenetres/create_act/actEvalEnteteActive.class and b/bin/fenetres/create_act/actEvalEnteteActive.class differ diff --git a/bin/fenetres/create_act/actEvalEnteteActiveNon.class b/bin/fenetres/create_act/actEvalEnteteActiveNon.class index 23e091a..9415a79 100644 Binary files a/bin/fenetres/create_act/actEvalEnteteActiveNon.class and b/bin/fenetres/create_act/actEvalEnteteActiveNon.class differ diff --git a/bin/fenetres/create_act/actEvalEntetePasActive.class b/bin/fenetres/create_act/actEvalEntetePasActive.class index ea7e94c..0ed4390 100644 Binary files a/bin/fenetres/create_act/actEvalEntetePasActive.class and b/bin/fenetres/create_act/actEvalEntetePasActive.class differ diff --git a/bin/fenetres/create_act/actEvalEntetePasActiveNon.class b/bin/fenetres/create_act/actEvalEntetePasActiveNon.class index 36c6de9..a3e6a91 100644 Binary files a/bin/fenetres/create_act/actEvalEntetePasActiveNon.class and b/bin/fenetres/create_act/actEvalEntetePasActiveNon.class differ diff --git a/bin/fenetres/create_act/actEvalNameNodeNon.class b/bin/fenetres/create_act/actEvalNameNodeNon.class index 605af2f..cf8a46e 100644 Binary files a/bin/fenetres/create_act/actEvalNameNodeNon.class and b/bin/fenetres/create_act/actEvalNameNodeNon.class differ diff --git a/bin/fenetres/create_act/actEvalNameNodeOui.class b/bin/fenetres/create_act/actEvalNameNodeOui.class index 6f94ab7..cbe5b0b 100644 Binary files a/bin/fenetres/create_act/actEvalNameNodeOui.class and b/bin/fenetres/create_act/actEvalNameNodeOui.class differ diff --git a/bin/fenetres/create_act/actEvalNamePageNon.class b/bin/fenetres/create_act/actEvalNamePageNon.class index 72a1589..e973d63 100644 Binary files a/bin/fenetres/create_act/actEvalNamePageNon.class and b/bin/fenetres/create_act/actEvalNamePageNon.class differ diff --git a/bin/fenetres/create_act/actEvalNamePageOui.class b/bin/fenetres/create_act/actEvalNamePageOui.class index 9a359d6..0317431 100644 Binary files a/bin/fenetres/create_act/actEvalNamePageOui.class and b/bin/fenetres/create_act/actEvalNamePageOui.class differ diff --git a/bin/fenetres/create_act/actEvalNameSequenceNon.class b/bin/fenetres/create_act/actEvalNameSequenceNon.class index f026367..c720d08 100644 Binary files a/bin/fenetres/create_act/actEvalNameSequenceNon.class and b/bin/fenetres/create_act/actEvalNameSequenceNon.class differ diff --git a/bin/fenetres/create_act/actEvalNameSequenceOui.class b/bin/fenetres/create_act/actEvalNameSequenceOui.class index 64f8715..20bcdfd 100644 Binary files a/bin/fenetres/create_act/actEvalNameSequenceOui.class and b/bin/fenetres/create_act/actEvalNameSequenceOui.class differ diff --git a/bin/fenetres/create_act/actEvalNumeroAbsoluePageNon.class b/bin/fenetres/create_act/actEvalNumeroAbsoluePageNon.class index 15e7fb6..48701e8 100644 Binary files a/bin/fenetres/create_act/actEvalNumeroAbsoluePageNon.class and b/bin/fenetres/create_act/actEvalNumeroAbsoluePageNon.class differ diff --git a/bin/fenetres/create_act/actEvalNumeroAbsoluePageOui.class b/bin/fenetres/create_act/actEvalNumeroAbsoluePageOui.class index 96f8664..6ad1088 100644 Binary files a/bin/fenetres/create_act/actEvalNumeroAbsoluePageOui.class and b/bin/fenetres/create_act/actEvalNumeroAbsoluePageOui.class differ diff --git a/bin/fenetres/create_act/actEvalNumeroPageNon.class b/bin/fenetres/create_act/actEvalNumeroPageNon.class index 76a5134..73570ef 100644 Binary files a/bin/fenetres/create_act/actEvalNumeroPageNon.class and b/bin/fenetres/create_act/actEvalNumeroPageNon.class differ diff --git a/bin/fenetres/create_act/actEvalNumeroPageOui.class b/bin/fenetres/create_act/actEvalNumeroPageOui.class index 3195eeb..3dd9021 100644 Binary files a/bin/fenetres/create_act/actEvalNumeroPageOui.class and b/bin/fenetres/create_act/actEvalNumeroPageOui.class differ diff --git a/bin/fenetres/create_act/actEvalPiedPageActive.class b/bin/fenetres/create_act/actEvalPiedPageActive.class index 89b2e3c..50b81b3 100644 Binary files a/bin/fenetres/create_act/actEvalPiedPageActive.class and b/bin/fenetres/create_act/actEvalPiedPageActive.class differ diff --git a/bin/fenetres/create_act/actEvalPiedPageActiveNon.class b/bin/fenetres/create_act/actEvalPiedPageActiveNon.class index af03422..612a78e 100644 Binary files a/bin/fenetres/create_act/actEvalPiedPageActiveNon.class and b/bin/fenetres/create_act/actEvalPiedPageActiveNon.class differ diff --git a/bin/fenetres/create_act/actEvalPiedPagePasActive.class b/bin/fenetres/create_act/actEvalPiedPagePasActive.class index 6031917..1b7e2ba 100644 Binary files a/bin/fenetres/create_act/actEvalPiedPagePasActive.class and b/bin/fenetres/create_act/actEvalPiedPagePasActive.class differ diff --git a/bin/fenetres/create_act/actEvalPiedPagePasActiveNon.class b/bin/fenetres/create_act/actEvalPiedPagePasActiveNon.class index 0efbded..8371487 100644 Binary files a/bin/fenetres/create_act/actEvalPiedPagePasActiveNon.class and b/bin/fenetres/create_act/actEvalPiedPagePasActiveNon.class differ diff --git a/bin/fenetres/create_act/actEvalPlacementParagrapheNon.class b/bin/fenetres/create_act/actEvalPlacementParagrapheNon.class index 5727f79..215c9f4 100644 Binary files a/bin/fenetres/create_act/actEvalPlacementParagrapheNon.class and b/bin/fenetres/create_act/actEvalPlacementParagrapheNon.class differ diff --git a/bin/fenetres/create_act/actEvalPlacementParagrapheOui.class b/bin/fenetres/create_act/actEvalPlacementParagrapheOui.class index 7b0ffe1..c065dd8 100644 Binary files a/bin/fenetres/create_act/actEvalPlacementParagrapheOui.class and b/bin/fenetres/create_act/actEvalPlacementParagrapheOui.class differ diff --git a/bin/fenetres/create_act/actEvalTextUserDefinedNon.class b/bin/fenetres/create_act/actEvalTextUserDefinedNon.class index 44b3670..1e958c3 100644 Binary files a/bin/fenetres/create_act/actEvalTextUserDefinedNon.class and b/bin/fenetres/create_act/actEvalTextUserDefinedNon.class differ diff --git a/bin/fenetres/create_act/actEvalTextUserDefinedOui.class b/bin/fenetres/create_act/actEvalTextUserDefinedOui.class index 33fec4a..75fb8bb 100644 Binary files a/bin/fenetres/create_act/actEvalTextUserDefinedOui.class and b/bin/fenetres/create_act/actEvalTextUserDefinedOui.class differ diff --git a/bin/fenetres/create_act/actEvaluerStyleFalse.class b/bin/fenetres/create_act/actEvaluerStyleFalse.class index e75d88e..13964e2 100644 Binary files a/bin/fenetres/create_act/actEvaluerStyleFalse.class and b/bin/fenetres/create_act/actEvaluerStyleFalse.class differ diff --git a/bin/fenetres/create_act/actEvaluerStyleTrue.class b/bin/fenetres/create_act/actEvaluerStyleTrue.class index 20caf95..7eb1a1e 100644 Binary files a/bin/fenetres/create_act/actEvaluerStyleTrue.class and b/bin/fenetres/create_act/actEvaluerStyleTrue.class differ diff --git a/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.class b/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.class index d3ee13d..b5629ba 100644 Binary files a/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.class and b/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.class differ diff --git a/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.class b/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.class index 3281bb0..2803361 100644 Binary files a/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.class and b/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.class differ diff --git a/bin/fenetres/create_act/actRechercheAnchorPageNumberFalse.class b/bin/fenetres/create_act/actRechercheAnchorPageNumberFalse.class index 6b99a00..708cbc8 100644 Binary files a/bin/fenetres/create_act/actRechercheAnchorPageNumberFalse.class and b/bin/fenetres/create_act/actRechercheAnchorPageNumberFalse.class differ diff --git a/bin/fenetres/create_act/actRechercheAnchorPageNumberTrue.class b/bin/fenetres/create_act/actRechercheAnchorPageNumberTrue.class index 2dcf7bb..79b6f2a 100644 Binary files a/bin/fenetres/create_act/actRechercheAnchorPageNumberTrue.class and b/bin/fenetres/create_act/actRechercheAnchorPageNumberTrue.class differ diff --git a/bin/fenetres/create_act/actRechercheContenuPlusProcheVoisinfalse.class b/bin/fenetres/create_act/actRechercheContenuPlusProcheVoisinfalse.class index 75d4428..ff88c1d 100644 Binary files a/bin/fenetres/create_act/actRechercheContenuPlusProcheVoisinfalse.class and b/bin/fenetres/create_act/actRechercheContenuPlusProcheVoisinfalse.class differ diff --git a/bin/fenetres/create_act/actRechercheContenuPlusProcheVoisintrue.class b/bin/fenetres/create_act/actRechercheContenuPlusProcheVoisintrue.class index 24199bc..23e099a 100644 Binary files a/bin/fenetres/create_act/actRechercheContenuPlusProcheVoisintrue.class and b/bin/fenetres/create_act/actRechercheContenuPlusProcheVoisintrue.class differ diff --git a/bin/fenetres/create_act/actRechercheContenufalse.class b/bin/fenetres/create_act/actRechercheContenufalse.class index c58c6e7..00d82f8 100644 Binary files a/bin/fenetres/create_act/actRechercheContenufalse.class and b/bin/fenetres/create_act/actRechercheContenufalse.class differ diff --git a/bin/fenetres/create_act/actRechercheContenutrue.class b/bin/fenetres/create_act/actRechercheContenutrue.class index 4de57fa..fc639c4 100644 Binary files a/bin/fenetres/create_act/actRechercheContenutrue.class and b/bin/fenetres/create_act/actRechercheContenutrue.class differ diff --git a/bin/fenetres/create_act/actRechercheIndexfalse.class b/bin/fenetres/create_act/actRechercheIndexfalse.class index 8ed09b3..afb18dd 100644 Binary files a/bin/fenetres/create_act/actRechercheIndexfalse.class and b/bin/fenetres/create_act/actRechercheIndexfalse.class differ diff --git a/bin/fenetres/create_act/actRechercheIndextrue.class b/bin/fenetres/create_act/actRechercheIndextrue.class index 839f2dd..4d61c8d 100644 Binary files a/bin/fenetres/create_act/actRechercheIndextrue.class and b/bin/fenetres/create_act/actRechercheIndextrue.class differ diff --git a/bin/fenetres/create_act/actsautfalse.class b/bin/fenetres/create_act/actsautfalse.class index a6d5220..f381ef5 100644 Binary files a/bin/fenetres/create_act/actsautfalse.class and b/bin/fenetres/create_act/actsautfalse.class differ diff --git a/bin/fenetres/create_act/actsautmultiplefalse.class b/bin/fenetres/create_act/actsautmultiplefalse.class index 0495d2e..0ae7008 100644 Binary files a/bin/fenetres/create_act/actsautmultiplefalse.class and b/bin/fenetres/create_act/actsautmultiplefalse.class differ diff --git a/bin/fenetres/create_act/actsautmultipletrue.class b/bin/fenetres/create_act/actsautmultipletrue.class index b89f1d6..55d25a9 100644 Binary files a/bin/fenetres/create_act/actsautmultipletrue.class and b/bin/fenetres/create_act/actsautmultipletrue.class differ diff --git a/bin/fenetres/create_act/actsauttrue.class b/bin/fenetres/create_act/actsauttrue.class index 0b6bbdd..986695d 100644 Binary files a/bin/fenetres/create_act/actsauttrue.class and b/bin/fenetres/create_act/actsauttrue.class differ diff --git a/bin/fenetres/create_act/ou.png b/bin/fenetres/create_act/ou.png deleted file mode 100644 index a81162e..0000000 Binary files a/bin/fenetres/create_act/ou.png and /dev/null differ diff --git a/bin/fenetres/create_act/oumini.png b/bin/fenetres/create_act/oumini.png deleted file mode 100644 index 5d659bf..0000000 Binary files a/bin/fenetres/create_act/oumini.png and /dev/null differ diff --git a/bin/marquenode.png b/bin/marquenode.png new file mode 100644 index 0000000..e3859b4 Binary files /dev/null and b/bin/marquenode.png differ diff --git a/bin/marquenode.svg b/bin/marquenode.svg new file mode 100644 index 0000000..f69be0e --- /dev/null +++ b/bin/marquenode.svg @@ -0,0 +1,158 @@ + + + + diff --git a/bin/marquenodemini.png b/bin/marquenodemini.png new file mode 100644 index 0000000..a00c15b Binary files /dev/null and b/bin/marquenodemini.png differ diff --git a/bin/resources/evaluer.png b/bin/resources/evaluer.png new file mode 100644 index 0000000..e06ad32 Binary files /dev/null and b/bin/resources/evaluer.png differ diff --git a/bin/resources/evaluermini.png b/bin/resources/evaluermini.png new file mode 100644 index 0000000..59d6087 Binary files /dev/null and b/bin/resources/evaluermini.png differ diff --git a/bin/resources/false.png b/bin/resources/false.png new file mode 100644 index 0000000..6395d7f Binary files /dev/null and b/bin/resources/false.png differ diff --git a/bin/resources/falsemini.png b/bin/resources/falsemini.png new file mode 100644 index 0000000..e4dedb4 Binary files /dev/null and b/bin/resources/falsemini.png differ diff --git a/bin/resources/feedback.png b/bin/resources/feedback.png new file mode 100644 index 0000000..bcd32ac Binary files /dev/null and b/bin/resources/feedback.png differ diff --git a/bin/resources/feedbackmini.png b/bin/resources/feedbackmini.png new file mode 100644 index 0000000..9c56f06 Binary files /dev/null and b/bin/resources/feedbackmini.png differ diff --git a/bin/resources/marquenode.png b/bin/resources/marquenode.png new file mode 100644 index 0000000..e3859b4 Binary files /dev/null and b/bin/resources/marquenode.png differ diff --git a/bin/resources/marquenodemini.png b/bin/resources/marquenodemini.png new file mode 100644 index 0000000..a00c15b Binary files /dev/null and b/bin/resources/marquenodemini.png differ diff --git a/bin/resources/true.png b/bin/resources/true.png new file mode 100644 index 0000000..7a6ec56 Binary files /dev/null and b/bin/resources/true.png differ diff --git a/bin/resources/truemini.png b/bin/resources/truemini.png new file mode 100644 index 0000000..950e16a Binary files /dev/null and b/bin/resources/truemini.png differ diff --git a/bin/resources/versfichierAnalyse.png b/bin/resources/versfichierAnalyse.png new file mode 100644 index 0000000..d18c146 Binary files /dev/null and b/bin/resources/versfichierAnalyse.png differ diff --git a/bin/sautmultiple.png b/bin/sautmultiple.png new file mode 100644 index 0000000..3849e48 Binary files /dev/null and b/bin/sautmultiple.png differ diff --git a/bin/sautmultiple.svg b/bin/sautmultiple.svg new file mode 100644 index 0000000..81f52f9 --- /dev/null +++ b/bin/sautmultiple.svg @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/sautmultiplemini.png b/bin/sautmultiplemini.png new file mode 100644 index 0000000..d64a6e1 Binary files /dev/null and b/bin/sautmultiplemini.png differ diff --git a/bin/true.png b/bin/true.png new file mode 100644 index 0000000..7a6ec56 Binary files /dev/null and b/bin/true.png differ diff --git a/bin/true.svg b/bin/true.svg new file mode 100644 index 0000000..ed0bf46 --- /dev/null +++ b/bin/true.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/truemini.png b/bin/truemini.png new file mode 100644 index 0000000..950e16a Binary files /dev/null and b/bin/truemini.png differ diff --git a/bin/versfichierAnalyse.png b/bin/versfichierAnalyse.png new file mode 100644 index 0000000..d18c146 Binary files /dev/null and b/bin/versfichierAnalyse.png differ diff --git a/bin/versfichierAnalyseModifmax.svg b/bin/versfichierAnalyseModifmax.svg new file mode 100644 index 0000000..c3264ab --- /dev/null +++ b/bin/versfichierAnalyseModifmax.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + XML + + + + + + + + + + + + + diff --git a/icons/evaluer.png b/icons/evaluer.png new file mode 100644 index 0000000..e06ad32 Binary files /dev/null and b/icons/evaluer.png differ diff --git a/icons/evaluer.svg b/icons/evaluer.svg new file mode 100644 index 0000000..195f890 --- /dev/null +++ b/icons/evaluer.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + diff --git a/icons/evaluermini.png b/icons/evaluermini.png new file mode 100644 index 0000000..59d6087 Binary files /dev/null and b/icons/evaluermini.png differ diff --git a/icons/false.png b/icons/false.png new file mode 100644 index 0000000..6395d7f Binary files /dev/null and b/icons/false.png differ diff --git a/icons/false.svg b/icons/false.svg new file mode 100644 index 0000000..50cc618 --- /dev/null +++ b/icons/false.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/falsemini.png b/icons/falsemini.png new file mode 100644 index 0000000..e4dedb4 Binary files /dev/null and b/icons/falsemini.png differ diff --git a/icons/true.png b/icons/true.png new file mode 100644 index 0000000..7a6ec56 Binary files /dev/null and b/icons/true.png differ diff --git a/icons/true.svg b/icons/true.svg new file mode 100644 index 0000000..ed0bf46 --- /dev/null +++ b/icons/true.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/truemini.png b/icons/truemini.png new file mode 100644 index 0000000..950e16a Binary files /dev/null and b/icons/truemini.png differ diff --git a/src/MEPTL/HTML.java b/src/MEPTL/HTML.java index c6fa36b..2db93ee 100644 --- a/src/MEPTL/HTML.java +++ b/src/MEPTL/HTML.java @@ -114,6 +114,11 @@ public class HTML { return "

" + titre+"

\r"; } + //Saut pour les marques nodes + public static String SautP11(String titre) { + return "

" + titre+" ** supprimer la méthode marquage des nodes avant de fournir le feedback aux étudiants **

\r"; + } + /** * Un saut de ligne * @return @@ -386,7 +391,7 @@ public static String TablePointsSyntheseStyle2(String titre,double prop, String code = code + HTML.SautLigne(); } if(nodeAna.getAttributs().get("marquenode")!=null) if(!nodeAna.getAttributs().get("marquenode").isEmpty()){ - code = code + HTML.SautLigne()+ HTML.SautP8(nodeAna.getAttributs().get("marquenode") + HTML.SautLigne()); + code = code + HTML.SautLigne()+ HTML.SautP11(nodeAna.getAttributs().get("marquenode") + HTML.SautLigne()); } if(nodeAna.getAttributs().get("titre")!=null) if(!nodeAna.getAttributs().get("titre").isEmpty()){ if(nodeAna.getAttributs().get("proportioncorrect")!=null)if(!nodeAna.getAttributs().get("proportioncorrect").equals("NaN"))if(nodeAna.getAttributs().get("id")!=null) code = code + HTML.SautLigne()+ HTML.H1(nodeAna.getAttributs().get("titre"),nodeAna.getAttributs().get("id")) + HTML.SautLigne(); ; @@ -5858,6 +5863,7 @@ public static String TablePointsSyntheseStyle2(String titre,double prop, String + "p.p8{font-size:14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 110%; background: transparent; margin-left: 8pt; margin-right: 10px;}" + "p.p9{font-size:16pt;margin-bottom: 12px;text-align: left; margin-top: 0cm; line-height: 110%; background: transparent; margin-left: 40pt; margin-right: 0cm;text-decoration: underline overline wavy blue;text-shadow: 0px 1px #101010;}" + "p.p10{font-size:12pt;margin-bottom: 12px;text-align: left; margin-top: 0cm; line-height: 110%; background: transparent; margin-left: 30pt; margin-right: 0cm;text-decoration: underline overline wavy red;}" + + "p.p11{font-size:14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 105%; background: yellow; margin-left: 8pt; margin-right: 10px;}" + ".commentaire{margin-left: 0px; margin-bottom: 24px; margin-top: 24px;font-size:1.4rem}" + "p.p2{margin-left: 0px; margin-bottom: 0cm; margin-top: 4px; line-height: 115%}" + "p.p3{margin-left: 20px; line-height: 100%; border: 1px solid black; background-color: lightcyan; margin-right: 10px; }" diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java index 0f4c518..9df26a2 100644 --- a/src/MEPTL/meptl.java +++ b/src/MEPTL/meptl.java @@ -1176,10 +1176,42 @@ public class meptl { fichier.getNodes().add(nodhistorique); + fichier = attributLesParentsAuxNodes(fichier); + return fichier; } + /** + * Trouve le node parent de chaque node.
+ * @param suitenodes + * @return + */ + public static node attributLesParentsAuxNodes(node nod){ + for(int i = 0 ; i + * @param nod + * @return + */ + private static node PlaceLePere(node nod) { + for(int i = 0 ; i @@ -1930,7 +1962,7 @@ public class meptl { */ public static node addSaut(node nodSujet, node nodanalyse) { if(nodSujet.getAttributs().get("saut")!=null) { - if(nodSujet.getAttributs().get("saut").equalsIgnoreCase("true")) { + if(nodSujet.getAttributs().get("saut").equals("true")) { node N = new node(); N.setNomElt("saut"); //N.getAttributs().put("titre", ""); diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/MEPTL/rechercherUnNodeStudent.java index 925b25c..1d2a2ed 100644 --- a/src/MEPTL/rechercherUnNodeStudent.java +++ b/src/MEPTL/rechercherUnNodeStudent.java @@ -227,7 +227,7 @@ public class rechercherUnNodeStudent { } /** - * + * Retourne le node Student en recherchant par le contenu textuel.
* @param nameNode * @param nodSujet * @param nod0Student @@ -239,33 +239,45 @@ public class rechercherUnNodeStudent { private static node findNodeByContenuTextuel(String nameNode, node nodSujet,node nod0Student, node nod1Student, node nod2Student, Run a) { node nodStudent = null; if(nodSujet.retourneLesContenusEnfants("").length()<1) return null; + String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants("")); + Pattern p = Pattern.compile("^text:p|^text:h|^text:span|^text:list"); - Matcher m = p.matcher(nodSujet.getNomElt()); + Matcher m = p.matcher(nameNode); if(m.find()) { - if(!nodSujet.retourneLesContenusEnfants("").isEmpty()) { - String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants("")); - if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNameNodeByFindContentExactly(nod2Student.getNodes(), valueAttribut, nodSujet.getNomElt()); - if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNameNodeByFindContentExactly(nod1Student.getNodes(), valueAttribut, nodSujet.getNomElt()); - if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNameNodeByFindContentExactly(nod0Student.getNodes(), valueAttribut, nodSujet.getNomElt()); - } - } - if(nodStudent!=null) return nodStudent; -// System.out.println("n'a pas trouvé par la méthode contenu rigoureusement exact"); - if(nodSujet.getAttributs().get("recherche_contenu_exact")!=null) { - if(nodSujet.getAttributs().get("recherche_contenu_exact").equals("true")) { - if(!nodSujet.retourneLesContenusEnfants("").isEmpty()) { - String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants("")); - if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContentExact(nod2Student.getNodes(), valueAttribut, nodSujet.getNomElt()); - if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContentExact(nod1Student.getNodes(), valueAttribut, nodSujet.getNomElt()); - if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContentExact(nod0Student.getNodes(), valueAttribut, nodSujet.getNomElt()); + if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNameNodeByFindContentExactly(nod2Student.getNodes(), valueAttribut, nameNode); + if(nod2Student!=null) if(nodStudent==null) { + ArrayList tousLesfreres = nod2Student.retourneTousLesFreres(); + for(int i = 0 ; i < tousLesfreres.size();i++) { + if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNameNodeByFindContentExactly(tousLesfreres.get(i).getNodes(), valueAttribut, nameNode); + } + } + if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNameNodeByFindContentExactly(nod1Student.getNodes(), valueAttribut, nameNode); + if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNameNodeByFindContentExactly(nod0Student.getNodes(), valueAttribut, nameNode); + + if(nodStudent!=null) return nodStudent; + + if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContentExact(nod2Student.getNodes(), valueAttribut, nameNode); + if(nod2Student!=null) if(nodStudent==null) { + ArrayList tousLesfreres = nod2Student.retourneTousLesFreres(); + for(int i = 0 ; i < tousLesfreres.size();i++) { + if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContentExact(tousLesfreres.get(i).getNodes(), valueAttribut, nameNode); } } + if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContentExact(nod1Student.getNodes(), valueAttribut, nameNode); + if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContentExact(nod0Student.getNodes(), valueAttribut, nameNode); + + if(nodStudent!=null) return nodStudent; + + if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod2Student.getNodes(), valueAttribut, nameNode,0.75,null); + if(nod2Student!=null) if(nodStudent==null) { + ArrayList tousLesfreres = nod2Student.retourneTousLesFreres(); + for(int i = 0 ; i < tousLesfreres.size();i++) { + if(tousLesfreres.get(i)!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(tousLesfreres.get(i).getNodes(), nameNode,valueAttribut,0.75,null); + } + } + if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod1Student.getNodes(), valueAttribut, nameNode,0.75,null); + if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod0Student.getNodes(), valueAttribut, nameNode,0.75,null); } - if(nodStudent!=null) return nodStudent; -// System.out.println("** n'a pas trouvé par la méthode contenu exact sans casse et trim() **"); -// System.out.println(nodSujet.retourneLesContenusEnfants("")); -// System.out.println(); - nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.75); return nodStudent; } @@ -281,13 +293,14 @@ public class rechercherUnNodeStudent { * @param a * @return */ + @SuppressWarnings("unused") private static node findNodeParContenuPlusProcheVoisinSim(String nameNode, node nodSujet,node nod0Student, node nod1Student, node nod2Student, Run a , double sim) { node nodStudent = null; if(!nodSujet.retourneLesContenusEnfants("").isEmpty()) { String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants("")); - if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod0Student.getNodes(), valueAttribut, nodSujet.getNomElt(),sim,null); - if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod1Student.getNodes(), valueAttribut, nodSujet.getNomElt(),sim,null); if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod2Student.getNodes(), valueAttribut, nodSujet.getNomElt(),sim,null); + if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod1Student.getNodes(), valueAttribut, nodSujet.getNomElt(),sim,null); + if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod0Student.getNodes(), valueAttribut, nodSujet.getNomElt(),sim,null); } return nodStudent; } @@ -308,9 +321,9 @@ public class rechercherUnNodeStudent { if(nodSujet.getAttributs().get("recherche_contenu_plus_proche_voisin").equals("true")) { if(!nodSujet.retourneLesContenusEnfants("").isEmpty()) { String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants("")); - if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod0Student.getNodes(), valueAttribut, nodSujet.getNomElt(),0.5,null); - if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod1Student.getNodes(), valueAttribut, nodSujet.getNomElt(),0.5,null); if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod2Student.getNodes(), valueAttribut, nodSujet.getNomElt(),0.5,null); + if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod1Student.getNodes(), valueAttribut, nodSujet.getNomElt(),0.5,null); + if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeByContentPlusProche(nod0Student.getNodes(), valueAttribut, nodSujet.getNomElt(),0.5,null); } } return nodStudent; diff --git a/src/evaluer/analyseLesNodesEnfants.java b/src/evaluer/analyseLesNodesEnfants.java index 3ce48c0..67470a5 100644 --- a/src/evaluer/analyseLesNodesEnfants.java +++ b/src/evaluer/analyseLesNodesEnfants.java @@ -72,19 +72,13 @@ public class analyseLesNodesEnfants { if(nodEnfantSujet.getAttributs().get("evaluer")!=null) { if(nodEnfantSujet.getAttributs().get("evaluer").equals("true")) { if(nod2Student!=null) { - if(nod2Student.containElementByName(nameNode)) { - nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); - } + nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); } if(nodStudentCorrespondantAuNodSujet==null && nod1Student!=null ) { - if(nod1Student.containElementByName(nameNode)) { - nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); - } + nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); } if(nodStudentCorrespondantAuNodSujet==null && nodStudent!=null) { - if(nodStudent.containElementByName(nameNode)) { - nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); - } + nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); } } } diff --git a/src/fenetres/create.java b/src/fenetres/create.java index f360f82..bbbd39a 100644 --- a/src/fenetres/create.java +++ b/src/fenetres/create.java @@ -608,8 +608,6 @@ public final class create extends JFrame { node1 = new DefaultMutableTreeNode(nod.getNodes().get(i)); addNodeMutable(nod.getNodes().get(i), node1); parent.add(node1); - - } } } diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java index cf18610..5902bc0 100644 --- a/src/fenetres/createPopupMenu.java +++ b/src/fenetres/createPopupMenu.java @@ -159,6 +159,7 @@ if(nod!=null) { */ private JMenu mnEvaluer() { JMenu mnEvaluer = new JMenu("Evaluer"); + mnEvaluer.setIcon( new ImageIcon(create.class.getResource("/resources/evaluermini.png"))); mnEvaluer.add(new actEvalueTrue()); mnEvaluer.add(new actEvalueFalse()); return mnEvaluer; @@ -281,7 +282,6 @@ if(nod!=null) { JMenu mnRechercheIndex = new JMenu("Recherche par l'index"); mnRechercheIndex.setIcon(new ImageIcon(create.class.getResource("/resources/rechercheindexmini.png"))); mnRechercheIndex.add( new actRechercheIndextrue()) ; - mnRechercheIndex.addSeparator(); mnRechercheIndex.add(new actRechercheIndexfalse()); return mnRechercheIndex; } @@ -295,7 +295,6 @@ if(nod!=null) { JMenu mnRechercheContenu = new JMenu("Recherche par le contenu exact"); mnRechercheContenu.setIcon(new ImageIcon(create.class.getResource("/resources/recherchecontenumini.png"))); mnRechercheContenu.add( new actRechercheContenutrue()); - mnRechercheContenu.addSeparator(); mnRechercheContenu.add( new actRechercheContenufalse()); return mnRechercheContenu; } @@ -308,7 +307,6 @@ if(nod!=null) { JMenu mnRechercheContenuPlusProcheVoisin2 = new JMenu("Recherche par le plus proche voisin"); mnRechercheContenuPlusProcheVoisin2.setIcon(new ImageIcon(create.class.getResource("/resources/recherchecontenuplusprochevoisinmini.png"))); mnRechercheContenuPlusProcheVoisin2.add( new actRechercheContenuPlusProcheVoisintrue()); - mnRechercheContenuPlusProcheVoisin2.addSeparator(); mnRechercheContenuPlusProcheVoisin2.add(new actRechercheContenuPlusProcheVoisinfalse()); return mnRechercheContenuPlusProcheVoisin2; } @@ -321,7 +319,6 @@ if(nod!=null) { JMenu mnAnalyseStyle = new JMenu("Evaluer le style"); mnAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstylemini.png"))); mnAnalyseStyle.add(new actEvaluerStyleTrue()); - mnAnalyseStyle.addSeparator(); mnAnalyseStyle.add( new actEvaluerStyleFalse()); return mnAnalyseStyle; } @@ -550,7 +547,6 @@ if(nod!=null) { JMenu mnMarqueNode = new JMenu("Marque le node évalué dans le feedback"); mnMarqueNode.setIcon( new ImageIcon(create.class.getResource("/resources/marquenodemini.png"))); mnMarqueNode.add(new actmarquenodetrue()); - mnMarqueNode.addSeparator(); mnMarqueNode.add(new actmarquenodefalse()); return mnMarqueNode; } diff --git a/src/fenetres/create_act/actAddMenuFalse.java b/src/fenetres/create_act/actAddMenuFalse.java index 57ab5c5..edefbe5 100644 --- a/src/fenetres/create_act/actAddMenuFalse.java +++ b/src/fenetres/create_act/actAddMenuFalse.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actAddMenuFalse extends AbstractAction{ @@ -16,7 +18,8 @@ public class actAddMenuFalse extends AbstractAction{ { putValue( Action.NAME, "false" ); - putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override diff --git a/src/fenetres/create_act/actAddMenuTrue.java b/src/fenetres/create_act/actAddMenuTrue.java index 4bb96d1..5860cae 100644 --- a/src/fenetres/create_act/actAddMenuTrue.java +++ b/src/fenetres/create_act/actAddMenuTrue.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actAddMenuTrue extends AbstractAction{ @@ -16,7 +18,8 @@ public class actAddMenuTrue extends AbstractAction{ { putValue( Action.NAME, "true" ); - putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override diff --git a/src/fenetres/create_act/actEvalEnteteActive.java b/src/fenetres/create_act/actEvalEnteteActive.java index e7b3e77..88bc636 100644 --- a/src/fenetres/create_act/actEvalEnteteActive.java +++ b/src/fenetres/create_act/actEvalEnteteActive.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalEnteteActive extends AbstractAction{ @@ -17,7 +19,8 @@ public class actEvalEnteteActive extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence d'attribut du node" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence d'attribut du node" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalEnteteActiveNon.java b/src/fenetres/create_act/actEvalEnteteActiveNon.java index 0664939..c3ecdb3 100644 --- a/src/fenetres/create_act/actEvalEnteteActiveNon.java +++ b/src/fenetres/create_act/actEvalEnteteActiveNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalEnteteActiveNon extends AbstractAction{ @@ -15,7 +17,8 @@ public class actEvalEnteteActiveNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime evaluation entête active" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence d'attribut du node." ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence d'attribut du node." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalEntetePasActive.java b/src/fenetres/create_act/actEvalEntetePasActive.java index 48712ff..84f6e43 100644 --- a/src/fenetres/create_act/actEvalEntetePasActive.java +++ b/src/fenetres/create_act/actEvalEntetePasActive.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalEntetePasActive extends AbstractAction{ @@ -17,7 +19,8 @@ public class actEvalEntetePasActive extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer l'absence d'attribut du node" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer l'absence d'attribut du node" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalEntetePasActiveNon.java b/src/fenetres/create_act/actEvalEntetePasActiveNon.java index bb1573a..f06a560 100644 --- a/src/fenetres/create_act/actEvalEntetePasActiveNon.java +++ b/src/fenetres/create_act/actEvalEntetePasActiveNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalEntetePasActiveNon extends AbstractAction{ @@ -15,7 +17,8 @@ public class actEvalEntetePasActiveNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime evaluation entête pas active" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'absence d'attribut du node." ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'absence d'attribut du node." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNameNodeNon.java b/src/fenetres/create_act/actEvalNameNodeNon.java index 69c05da..51d59ad 100644 --- a/src/fenetres/create_act/actEvalNameNodeNon.java +++ b/src/fenetres/create_act/actEvalNameNodeNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalNameNodeNon extends AbstractAction{ @@ -15,7 +17,8 @@ public class actEvalNameNodeNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime l'évaluation de la présence du node" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence du node" ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence du node" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNameNodeOui.java b/src/fenetres/create_act/actEvalNameNodeOui.java index db56047..b845e5c 100644 --- a/src/fenetres/create_act/actEvalNameNodeOui.java +++ b/src/fenetres/create_act/actEvalNameNodeOui.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalNameNodeOui extends AbstractAction{ @@ -17,7 +19,8 @@ public class actEvalNameNodeOui extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence de ce node" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence de ce node" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNamePageNon.java b/src/fenetres/create_act/actEvalNamePageNon.java index 70e50dd..67518cd 100644 --- a/src/fenetres/create_act/actEvalNamePageNon.java +++ b/src/fenetres/create_act/actEvalNamePageNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalNamePageNon extends AbstractAction{ @@ -15,7 +17,8 @@ public class actEvalNamePageNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime évaluer le nom de la page" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du nom de la page." ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du nom de la page." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNamePageOui.java b/src/fenetres/create_act/actEvalNamePageOui.java index b1cb2fc..0e6363a 100644 --- a/src/fenetres/create_act/actEvalNamePageOui.java +++ b/src/fenetres/create_act/actEvalNamePageOui.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalNamePageOui extends AbstractAction{ @@ -18,6 +20,7 @@ public class actEvalNamePageOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer le nom de la page" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNameSequenceNon.java b/src/fenetres/create_act/actEvalNameSequenceNon.java index 1d127c2..5c17115 100644 --- a/src/fenetres/create_act/actEvalNameSequenceNon.java +++ b/src/fenetres/create_act/actEvalNameSequenceNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalNameSequenceNon extends AbstractAction{ @@ -16,6 +18,7 @@ public class actEvalNameSequenceNon extends AbstractAction{ { putValue( Action.NAME, "Supprime évaluer le nom de la séquence" ); putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du nom de la séquence." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNameSequenceOui.java b/src/fenetres/create_act/actEvalNameSequenceOui.java index bf24590..25757f2 100644 --- a/src/fenetres/create_act/actEvalNameSequenceOui.java +++ b/src/fenetres/create_act/actEvalNameSequenceOui.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalNameSequenceOui extends AbstractAction{ @@ -18,6 +20,7 @@ public class actEvalNameSequenceOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer le nom de la séquence" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNumeroAbsoluePageNon.java b/src/fenetres/create_act/actEvalNumeroAbsoluePageNon.java index 42adbdf..258297b 100644 --- a/src/fenetres/create_act/actEvalNumeroAbsoluePageNon.java +++ b/src/fenetres/create_act/actEvalNumeroAbsoluePageNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalNumeroAbsoluePageNon extends AbstractAction{ @@ -15,7 +17,8 @@ public class actEvalNumeroAbsoluePageNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime évaluer le numéro absolue de la page" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du numéro absolue de la page." ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du numéro absolue de la page." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNumeroAbsoluePageOui.java b/src/fenetres/create_act/actEvalNumeroAbsoluePageOui.java index 5426374..d3e5bd3 100644 --- a/src/fenetres/create_act/actEvalNumeroAbsoluePageOui.java +++ b/src/fenetres/create_act/actEvalNumeroAbsoluePageOui.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalNumeroAbsoluePageOui extends AbstractAction{ @@ -17,7 +19,9 @@ public class actEvalNumeroAbsoluePageOui extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer le numéro absolue de la page" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer le numéro absolue de la page" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNumeroPageNon.java b/src/fenetres/create_act/actEvalNumeroPageNon.java index 3811a7a..0d41d90 100644 --- a/src/fenetres/create_act/actEvalNumeroPageNon.java +++ b/src/fenetres/create_act/actEvalNumeroPageNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalNumeroPageNon extends AbstractAction{ @@ -15,7 +17,8 @@ public class actEvalNumeroPageNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime évaluer le numéro de la page" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du numéro de la page." ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du numéro de la page." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalNumeroPageOui.java b/src/fenetres/create_act/actEvalNumeroPageOui.java index 6852793..2856dd4 100644 --- a/src/fenetres/create_act/actEvalNumeroPageOui.java +++ b/src/fenetres/create_act/actEvalNumeroPageOui.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalNumeroPageOui extends AbstractAction{ @@ -17,7 +19,8 @@ public class actEvalNumeroPageOui extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer le numéro de la page" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer le numéro de la page" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalPiedPageActive.java b/src/fenetres/create_act/actEvalPiedPageActive.java index f41d3a5..1490d5c 100644 --- a/src/fenetres/create_act/actEvalPiedPageActive.java +++ b/src/fenetres/create_act/actEvalPiedPageActive.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalPiedPageActive extends AbstractAction{ @@ -17,7 +19,8 @@ public class actEvalPiedPageActive extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence d'attribut du node" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence d'attribut du node" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalPiedPageActiveNon.java b/src/fenetres/create_act/actEvalPiedPageActiveNon.java index 2919409..dcfcac8 100644 --- a/src/fenetres/create_act/actEvalPiedPageActiveNon.java +++ b/src/fenetres/create_act/actEvalPiedPageActiveNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalPiedPageActiveNon extends AbstractAction{ @@ -15,7 +17,9 @@ public class actEvalPiedPageActiveNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime pied page active" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence d'attribut du node." ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence d'attribut du node." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalPiedPagePasActive.java b/src/fenetres/create_act/actEvalPiedPagePasActive.java index b7ab37a..f232f37 100644 --- a/src/fenetres/create_act/actEvalPiedPagePasActive.java +++ b/src/fenetres/create_act/actEvalPiedPagePasActive.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalPiedPagePasActive extends AbstractAction{ @@ -17,7 +19,8 @@ public class actEvalPiedPagePasActive extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer l'absence d'attribut du node" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer l'absence d'attribut du node" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalPiedPagePasActiveNon.java b/src/fenetres/create_act/actEvalPiedPagePasActiveNon.java index fde1a31..7be8f03 100644 --- a/src/fenetres/create_act/actEvalPiedPagePasActiveNon.java +++ b/src/fenetres/create_act/actEvalPiedPagePasActiveNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalPiedPagePasActiveNon extends AbstractAction{ @@ -15,7 +17,8 @@ public class actEvalPiedPagePasActiveNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime pied page pas active" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'absence d'attribut du node." ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'absence d'attribut du node." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalPlacementParagrapheNon.java b/src/fenetres/create_act/actEvalPlacementParagrapheNon.java index 681945d..0f5a274 100644 --- a/src/fenetres/create_act/actEvalPlacementParagrapheNon.java +++ b/src/fenetres/create_act/actEvalPlacementParagrapheNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; import list.listeDesNodesEvalPlacement; public class actEvalPlacementParagrapheNon extends AbstractAction{ @@ -16,7 +18,8 @@ public class actEvalPlacementParagrapheNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprimer évaluer le placement du paragraphes" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du placement du paragraphes" ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du placement du paragraphes" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalPlacementParagrapheOui.java b/src/fenetres/create_act/actEvalPlacementParagrapheOui.java index fd7294d..1e9c12c 100644 --- a/src/fenetres/create_act/actEvalPlacementParagrapheOui.java +++ b/src/fenetres/create_act/actEvalPlacementParagrapheOui.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; import list.listeDesNodesEvalPlacement; public class actEvalPlacementParagrapheOui extends AbstractAction{ @@ -18,7 +20,8 @@ public class actEvalPlacementParagrapheOui extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer le placement du paragraphe" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer le placement du paragraphe"); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalTextUserDefinedNon.java b/src/fenetres/create_act/actEvalTextUserDefinedNon.java index 2e0f95d..bcd006b 100644 --- a/src/fenetres/create_act/actEvalTextUserDefinedNon.java +++ b/src/fenetres/create_act/actEvalTextUserDefinedNon.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actEvalTextUserDefinedNon extends AbstractAction{ @@ -15,7 +17,8 @@ public class actEvalTextUserDefinedNon extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Supprime évaluer la valeur de la propriété personnalisé" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la valeur personnalisé." ); + putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la valeur personnalisé."); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvalTextUserDefinedOui.java b/src/fenetres/create_act/actEvalTextUserDefinedOui.java index 65bcd44..0bd836c 100644 --- a/src/fenetres/create_act/actEvalTextUserDefinedOui.java +++ b/src/fenetres/create_act/actEvalTextUserDefinedOui.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import cXML.node; import fenetres.baliseStyle; +import fenetres.create; public class actEvalTextUserDefinedOui extends AbstractAction{ @@ -17,7 +19,8 @@ public class actEvalTextUserDefinedOui extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Oui, combien de point?" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer la valeur de la propriété personnalisé" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer la valeur de la propriété personnalisé"); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvaluerStyleFalse.java b/src/fenetres/create_act/actEvaluerStyleFalse.java index 77d4291..344d1a3 100644 --- a/src/fenetres/create_act/actEvaluerStyleFalse.java +++ b/src/fenetres/create_act/actEvaluerStyleFalse.java @@ -4,9 +4,11 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import MEPTL.commandes; import cXML.node; +import fenetres.create; import list.listeNodeFormatageDirectDeWriter; public class actEvaluerStyleFalse extends AbstractAction{ @@ -17,7 +19,8 @@ public class actEvaluerStyleFalse extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "N'évaluer pas le style." ); - putValue( Action.SHORT_DESCRIPTION, "N'évaluer pas le style:name de ce node dans le fichier de l'étudiant" ); + putValue( Action.SHORT_DESCRIPTION, "N'évaluer pas le style:name de ce node dans le fichier de l'étudiant" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvaluerStyleTrue.java b/src/fenetres/create_act/actEvaluerStyleTrue.java index 4f608a4..2ffb7fa 100644 --- a/src/fenetres/create_act/actEvaluerStyleTrue.java +++ b/src/fenetres/create_act/actEvaluerStyleTrue.java @@ -4,12 +4,14 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import MEPTL.commandes; import cXML.node; +import fenetres.create; public class actEvaluerStyleTrue extends AbstractAction{ @@ -19,7 +21,8 @@ public class actEvaluerStyleTrue extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Evaluer le style." ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer le style:name de ce node dans le fichier de l'étudiant" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer le style:name de ce node dans le fichier de l'étudiant"); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.java b/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.java index d8494f2..e195c92 100644 --- a/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.java +++ b/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.java @@ -4,6 +4,7 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; @@ -11,11 +12,13 @@ import javax.swing.tree.TreePath; import MEPTL.commandes; import cXML.node; +import fenetres.create; public class actEvaluerTousLesStylesParagraphesFalse extends AbstractAction{ { putValue( Action.NAME, "Supprime la méthode analyseStyle de tous les paragraphes ou les titres." ); - putValue( Action.SHORT_DESCRIPTION, "Retire analyseStyle de tous les nodes text:p ou text:h" ); + putValue( Action.SHORT_DESCRIPTION, "Retire analyseStyle de tous les nodes text:p ou text:h" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } /** * diff --git a/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.java b/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.java index 0c3faa6..cd2da36 100644 --- a/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.java +++ b/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.java @@ -4,12 +4,14 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import MEPTL.commandes; import cXML.node; +import fenetres.create; public class actEvaluerTousLesStylesParagraphesTrue extends AbstractAction{ @@ -19,7 +21,8 @@ public class actEvaluerTousLesStylesParagraphesTrue extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Evaluer à travers analyseStyle tous les paragraphes ou les titres." ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer tous les style:name des paragraphes text:p ou text:h" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer tous les style:name des paragraphes text:p ou text:h" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actRechercheAnchorPageNumberFalse.java b/src/fenetres/create_act/actRechercheAnchorPageNumberFalse.java index 1d66db5..c3b399a 100644 --- a/src/fenetres/create_act/actRechercheAnchorPageNumberFalse.java +++ b/src/fenetres/create_act/actRechercheAnchorPageNumberFalse.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actRechercheAnchorPageNumberFalse extends AbstractAction{ @@ -15,7 +17,8 @@ public class actRechercheAnchorPageNumberFalse extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "false" ); - putValue( Action.SHORT_DESCRIPTION, "Ne recherche pas l'image par le numéro de la page." ); + putValue( Action.SHORT_DESCRIPTION, "Ne recherche pas l'image par le numéro de la page." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actRechercheAnchorPageNumberTrue.java b/src/fenetres/create_act/actRechercheAnchorPageNumberTrue.java index cde03ae..e13bfef 100644 --- a/src/fenetres/create_act/actRechercheAnchorPageNumberTrue.java +++ b/src/fenetres/create_act/actRechercheAnchorPageNumberTrue.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actRechercheAnchorPageNumberTrue extends AbstractAction{ @@ -16,7 +18,8 @@ public class actRechercheAnchorPageNumberTrue extends AbstractAction{ { putValue( Action.NAME, "true" ); putValue( Action.SHORT_DESCRIPTION, "Recherche l'image par le numéro de la page dans le node dans le fichier de l'étudiant." ); - } + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); + } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); diff --git a/src/fenetres/create_act/actRechercheContenuPlusProcheVoisinfalse.java b/src/fenetres/create_act/actRechercheContenuPlusProcheVoisinfalse.java index b8c046e..6e329fc 100644 --- a/src/fenetres/create_act/actRechercheContenuPlusProcheVoisinfalse.java +++ b/src/fenetres/create_act/actRechercheContenuPlusProcheVoisinfalse.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actRechercheContenuPlusProcheVoisinfalse extends AbstractAction{ @@ -15,7 +17,8 @@ public class actRechercheContenuPlusProcheVoisinfalse extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Plus proche voisin : false" ); - putValue( Action.SHORT_DESCRIPTION, "Ne recherche pas par le contenu du plus proche voisin." ); + putValue( Action.SHORT_DESCRIPTION, "Ne recherche pas par le contenu du plus proche voisin." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actRechercheContenuPlusProcheVoisintrue.java b/src/fenetres/create_act/actRechercheContenuPlusProcheVoisintrue.java index af29362..00e7056 100644 --- a/src/fenetres/create_act/actRechercheContenuPlusProcheVoisintrue.java +++ b/src/fenetres/create_act/actRechercheContenuPlusProcheVoisintrue.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actRechercheContenuPlusProcheVoisintrue extends AbstractAction{ @@ -15,7 +17,8 @@ public class actRechercheContenuPlusProcheVoisintrue extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "true" ); - putValue( Action.SHORT_DESCRIPTION, "Recherche par le contenu du plus proche voisin." ); + putValue( Action.SHORT_DESCRIPTION, "Recherche par le contenu du plus proche voisin."); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actRechercheContenufalse.java b/src/fenetres/create_act/actRechercheContenufalse.java index 014e96d..fa3d3e3 100644 --- a/src/fenetres/create_act/actRechercheContenufalse.java +++ b/src/fenetres/create_act/actRechercheContenufalse.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actRechercheContenufalse extends AbstractAction{ @@ -16,7 +18,8 @@ public class actRechercheContenufalse extends AbstractAction{ { putValue( Action.NAME, "false" ); putValue( Action.SHORT_DESCRIPTION, "Ne recherche pas par le contenu exact le node dans le fichier de l'étudiant." ); - } + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); + } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); diff --git a/src/fenetres/create_act/actRechercheContenutrue.java b/src/fenetres/create_act/actRechercheContenutrue.java index 76c25f8..3e8fd54 100644 --- a/src/fenetres/create_act/actRechercheContenutrue.java +++ b/src/fenetres/create_act/actRechercheContenutrue.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actRechercheContenutrue extends AbstractAction{ @@ -16,6 +18,7 @@ public class actRechercheContenutrue extends AbstractAction{ { putValue( Action.NAME, "Recherche par le contenu du node : true" ); putValue( Action.SHORT_DESCRIPTION, "Recherche par le contenu le node dans le fichier de l'étudiant." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actRechercheIndexfalse.java b/src/fenetres/create_act/actRechercheIndexfalse.java index cead908..2cefbe4 100644 --- a/src/fenetres/create_act/actRechercheIndexfalse.java +++ b/src/fenetres/create_act/actRechercheIndexfalse.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actRechercheIndexfalse extends AbstractAction{ @@ -15,7 +17,8 @@ public class actRechercheIndexfalse extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Ne recherche par l'index du node : false" ); - putValue( Action.SHORT_DESCRIPTION, "Ne recherche pas par l'index le node dans le fichier de l'étudiant." ); + putValue( Action.SHORT_DESCRIPTION, "Ne recherche pas par l'index le node dans le fichier de l'étudiant." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actRechercheIndextrue.java b/src/fenetres/create_act/actRechercheIndextrue.java index 6287d3b..fe278ff 100644 --- a/src/fenetres/create_act/actRechercheIndextrue.java +++ b/src/fenetres/create_act/actRechercheIndextrue.java @@ -4,8 +4,10 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actRechercheIndextrue extends AbstractAction{ @@ -15,7 +17,8 @@ public class actRechercheIndextrue extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Recherche par l'index du node : true" ); - putValue( Action.SHORT_DESCRIPTION, "Recherche par index le node dans le fichier de l'étudiant." ); + putValue( Action.SHORT_DESCRIPTION, "Recherche par index le node dans le fichier de l'étudiant." ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actmarquenodefalse.java b/src/fenetres/create_act/actmarquenodefalse.java index b56db52..05eb15f 100644 --- a/src/fenetres/create_act/actmarquenodefalse.java +++ b/src/fenetres/create_act/actmarquenodefalse.java @@ -4,13 +4,16 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actmarquenodefalse extends AbstractAction{ { putValue( Action.NAME, "false" ); - putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } /** * diff --git a/src/fenetres/create_act/actmarquenodetrue.java b/src/fenetres/create_act/actmarquenodetrue.java index faffcd6..cb10e7c 100644 --- a/src/fenetres/create_act/actmarquenodetrue.java +++ b/src/fenetres/create_act/actmarquenodetrue.java @@ -4,13 +4,16 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actmarquenodetrue extends AbstractAction{ { putValue( Action.NAME, "true" ); - putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } /** * diff --git a/src/fenetres/create_act/actsautfalse.java b/src/fenetres/create_act/actsautfalse.java index 2215125..ff2847a 100644 --- a/src/fenetres/create_act/actsautfalse.java +++ b/src/fenetres/create_act/actsautfalse.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import javax.swing.tree.TreeNode; import cXML.node; +import fenetres.create; public class actsautfalse extends AbstractAction{ @@ -17,7 +19,8 @@ public class actsautfalse extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "false" ); - putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/actsautmultiplefalse.java b/src/fenetres/create_act/actsautmultiplefalse.java index eb5a1a2..83d7d78 100644 --- a/src/fenetres/create_act/actsautmultiplefalse.java +++ b/src/fenetres/create_act/actsautmultiplefalse.java @@ -4,13 +4,16 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actsautmultiplefalse extends AbstractAction{ { putValue( Action.NAME, "false" ); - putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); } /** * diff --git a/src/fenetres/create_act/actsautmultipletrue.java b/src/fenetres/create_act/actsautmultipletrue.java index 16dec5a..89fb3e2 100644 --- a/src/fenetres/create_act/actsautmultipletrue.java +++ b/src/fenetres/create_act/actsautmultipletrue.java @@ -4,13 +4,16 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import cXML.node; +import fenetres.create; public class actsautmultipletrue extends AbstractAction{ { putValue( Action.NAME, "true" ); - putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } /** * diff --git a/src/fenetres/create_act/actsauttrue.java b/src/fenetres/create_act/actsauttrue.java index c8f795b..160e204 100644 --- a/src/fenetres/create_act/actsauttrue.java +++ b/src/fenetres/create_act/actsauttrue.java @@ -4,10 +4,12 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.ImageIcon; import javax.swing.JOptionPane; import javax.swing.tree.TreeNode; import cXML.node; +import fenetres.create; public class actsauttrue extends AbstractAction{ @@ -17,7 +19,8 @@ public class actsauttrue extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "true" ); - putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/fenetres/create_act/ou.png b/src/fenetres/create_act/ou.png deleted file mode 100644 index a81162e..0000000 Binary files a/src/fenetres/create_act/ou.png and /dev/null differ diff --git a/src/fenetres/create_act/oumini.png b/src/fenetres/create_act/oumini.png deleted file mode 100644 index 5d659bf..0000000 Binary files a/src/fenetres/create_act/oumini.png and /dev/null differ diff --git a/src/resources/evaluer.png b/src/resources/evaluer.png new file mode 100644 index 0000000..e06ad32 Binary files /dev/null and b/src/resources/evaluer.png differ diff --git a/src/resources/evaluermini.png b/src/resources/evaluermini.png new file mode 100644 index 0000000..59d6087 Binary files /dev/null and b/src/resources/evaluermini.png differ diff --git a/src/resources/false.png b/src/resources/false.png new file mode 100644 index 0000000..6395d7f Binary files /dev/null and b/src/resources/false.png differ diff --git a/src/resources/falsemini.png b/src/resources/falsemini.png new file mode 100644 index 0000000..e4dedb4 Binary files /dev/null and b/src/resources/falsemini.png differ diff --git a/src/resources/true.png b/src/resources/true.png new file mode 100644 index 0000000..7a6ec56 Binary files /dev/null and b/src/resources/true.png differ diff --git a/src/resources/truemini.png b/src/resources/truemini.png new file mode 100644 index 0000000..950e16a Binary files /dev/null and b/src/resources/truemini.png differ