From 3b67990a38146cdb273e34b507ea0bbcea207be0 Mon Sep 17 00:00:00 2001 From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com> Date: Fri, 9 Dec 2022 21:07:55 +0100 Subject: [PATCH] MAJ V4.3.2 --- bin/.gitignore | 1 + bin/MEPTL/ecritureSujet.class | Bin 11064 -> 10523 bytes bin/fenetres/create$1.class | Bin 1458 -> 1458 bytes bin/fenetres/create$10.class | Bin 688 -> 688 bytes bin/fenetres/create$11.class | Bin 688 -> 688 bytes bin/fenetres/create$12.class | Bin 688 -> 688 bytes bin/fenetres/create$13.class | Bin 688 -> 688 bytes bin/fenetres/create$14.class | Bin 653 -> 653 bytes bin/fenetres/create$2.class | Bin 1458 -> 1458 bytes bin/fenetres/create$3.class | Bin 1454 -> 1454 bytes bin/fenetres/create$4.class | Bin 1299 -> 1306 bytes bin/fenetres/create$5.class | Bin 884 -> 884 bytes bin/fenetres/create$6.class | Bin 651 -> 651 bytes bin/fenetres/create$7.class | Bin 651 -> 651 bytes bin/fenetres/create$8.class | Bin 651 -> 651 bytes bin/fenetres/create$9.class | Bin 651 -> 651 bytes bin/fenetres/create.class | Bin 24635 -> 15662 bytes bin/fenetres/evaluate$1.class | Bin 1650 -> 1650 bytes bin/fenetres/evaluate$10.class | Bin 1056 -> 1056 bytes bin/fenetres/evaluate$11.class | Bin 1813 -> 1813 bytes bin/fenetres/evaluate$12.class | Bin 2135 -> 2135 bytes bin/fenetres/evaluate$13.class | Bin 1518 -> 1518 bytes bin/fenetres/evaluate$14.class | Bin 4225 -> 4225 bytes bin/fenetres/evaluate$15.class | Bin 2127 -> 2127 bytes bin/fenetres/evaluate$16.class | Bin 871 -> 871 bytes bin/fenetres/evaluate$17.class | Bin 892 -> 892 bytes bin/fenetres/evaluate$18.class | Bin 876 -> 876 bytes bin/fenetres/evaluate$19.class | Bin 871 -> 871 bytes bin/fenetres/evaluate$2.class | Bin 1750 -> 1750 bytes bin/fenetres/evaluate$20.class | Bin 867 -> 867 bytes bin/fenetres/evaluate$21.class | Bin 877 -> 877 bytes bin/fenetres/evaluate$22.class | Bin 873 -> 873 bytes bin/fenetres/evaluate$23.class | Bin 867 -> 867 bytes bin/fenetres/evaluate$24.class | Bin 869 -> 869 bytes bin/fenetres/evaluate$25.class | Bin 898 -> 898 bytes bin/fenetres/evaluate$26.class | Bin 665 -> 665 bytes bin/fenetres/evaluate$27.class | Bin 665 -> 665 bytes bin/fenetres/evaluate$28.class | Bin 665 -> 665 bytes bin/fenetres/evaluate$29.class | Bin 665 -> 665 bytes bin/fenetres/evaluate$3.class | Bin 3167 -> 3167 bytes bin/fenetres/evaluate$30.class | Bin 665 -> 665 bytes bin/fenetres/evaluate$31.class | Bin 665 -> 665 bytes bin/fenetres/evaluate$32.class | Bin 665 -> 665 bytes bin/fenetres/evaluate$4.class | Bin 2560 -> 2560 bytes bin/fenetres/evaluate$5.class | Bin 2899 -> 2899 bytes bin/fenetres/evaluate$6.class | Bin 3901 -> 3901 bytes bin/fenetres/evaluate$7.class | Bin 1995 -> 1995 bytes bin/fenetres/evaluate$8.class | Bin 1572 -> 1572 bytes bin/fenetres/evaluate$9.class | Bin 1306 -> 1306 bytes bin/fenetres/evaluate.class | Bin 15622 -> 15622 bytes bin/list/descriptionNode.class | Bin 14475 -> 14808 bytes ...WriterPasEvaluableAvecCodeEvaluateur.class | Bin 753 -> 785 bytes bin/list/listeEvalNameNode.class | Bin 677 -> 677 bytes bin/list/listeNodeAnalyseWriter.class | Bin 1270 -> 1310 bytes src/MEPTL/ecritureSujet.java | 68 +- src/fenetres/attributs.java | 4 +- src/fenetres/create.java | 377 +---------- src/fenetres/createPopupMenu.java | 612 ++++++++++++++++++ src/fenetres/evaluate.java | 2 - src/list/descriptionNode.java | 4 + ...tWriterPasEvaluableAvecCodeEvaluateur.java | 4 +- src/list/listeDesNodesAllContent.java | 20 + src/list/listeDesNodesAnalyseStyle.java | 17 + src/list/listeDesNodesAvecEvalNameNode.java | 19 + src/list/listeDesNodesAvecOU.java | 16 + ...listeDesNodesPourEvaluationEntetePage.java | 14 + src/list/listeDesNodesPourEvaluerPage.java | 11 + .../listeDesNodesPourEvaluerPiedDePage.java | 12 + src/list/listeDesNodesRechercheByContenu.java | 32 + src/list/listeDesNotesAEvaluer.java | 17 + src/list/listeEvalNameNode.java | 2 - src/list/listeNodeAnalyseWriter.java | 2 + src/resources/recherche.png | Bin 0 -> 945 bytes src/resources/recherchemini.png | Bin 0 -> 527 bytes 74 files changed, 800 insertions(+), 434 deletions(-) create mode 100644 src/fenetres/createPopupMenu.java create mode 100644 src/list/listeDesNodesAllContent.java create mode 100644 src/list/listeDesNodesAnalyseStyle.java create mode 100644 src/list/listeDesNodesAvecEvalNameNode.java create mode 100644 src/list/listeDesNodesAvecOU.java create mode 100644 src/list/listeDesNodesPourEvaluationEntetePage.java create mode 100644 src/list/listeDesNodesPourEvaluerPage.java create mode 100644 src/list/listeDesNodesPourEvaluerPiedDePage.java create mode 100644 src/list/listeDesNodesRechercheByContenu.java create mode 100644 src/list/listeDesNotesAEvaluer.java create mode 100644 src/resources/recherche.png create mode 100644 src/resources/recherchemini.png diff --git a/bin/.gitignore b/bin/.gitignore index ed2d451..4884a08 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -2,3 +2,4 @@ /fenetres/ /list/ /resources/ +/MEPTL/ diff --git a/bin/MEPTL/ecritureSujet.class b/bin/MEPTL/ecritureSujet.class index 0ab7989db378963075b10fd088886a06d79f94af..2f74ad5a5cc1a32f368f771221cd4cad1dc13706 100644 GIT binary patch delta 2967 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 FJpfLJ4UYf- delta 49 zcmdnQy@`7RH>(u0GXp2H2ZJE9Cxbe(7lRSAH-icoQau#vMZAZ05FXN0RR91 diff --git a/bin/fenetres/create$2.class b/bin/fenetres/create$2.class index 83f52e767eb6036c275b254abf8c8f23c44c68ba..fddca34a490addeda397c0db234ae0ec4aecda57 100644 GIT binary patch delta 49 zcmdnQy@`7RH>(umI|fe1Zw!Kr-x<^ye=ry^{$#LX{KeqG_-?W)t34azKL!rQ|C6&= FJpf?64p;yH delta 49 zcmdnQy@`7RH>(tLI0GkhJcA%}0)skpB7+fg5`z_UGJ^+m_+(X9dp72D1`g(o$yux( E0Op1X8vpNW2&QL1@ob?>NBZB&b1 zxnW2$AHYXS(K}fvofHd+a^>91#*Y1j$plzn(SAGeo*c_QmaNiIy+X>4=s|Zaz`D)o zYgMovT~*IE;f@7wanRzQX%T8O+-1g|y3wmAlJN)TTBPG`vQzh%Hmgn1Y5Js&$_wy< zpI0KhF~K`AKA7f{G+p{-JN|!{0fN$r19>)3q7AXhmiTVVRHM?k>?J|aYf_3~Z#A{FhrKi!NHi5YW)l@tXx6An(>sa&g%)?v zARIa95A-jBo-~T~%>!qzwa;4n>~&{aruqE)_yoi`Y??QE%*4l{hb5LZ1`9QnudAa< zwNcHgawAt$N~3osQ#i?HLgmV-iusRwWFYJzLezTEgNYakH*t-jqAII;OO^-L{R~J4=_ng)qKVnZ7Tc00Ezbs81Q$C(b#~bkbctb~j4)H|nxJ#Ca&>%vGn7gY diff --git a/bin/fenetres/create$5.class b/bin/fenetres/create$5.class index da347e3d8ec06ff4a81500f1b905cca9a2eea545..0744b242f4fce8f89884b73cfd900e3a718ffcf0 100644 GIT binary patch delta 28 kcmeyu_JwW3StiD_lg}}Eb1__C;AObTAi{8YvNCfZ0HF8@nE(I) delta 28 kcmeyu_JwW3StiE+lg}}Eb1^b8@G>$ph%mBFR%Q+a0FOimWB>pF diff --git a/bin/fenetres/create$6.class b/bin/fenetres/create$6.class index 35e06bb8d911a2ba2d942d2086c7571fd06e6a9c..d10709c8663bc16d48d04260613c427aa7fa709d 100644 GIT binary patch delta 21 ccmeBX?PlG;!NkPqGntFYoQctIvNMwh05l8)aR2}S delta 21 ccmeBX?PlG;!NkP0but%|ITO?N$<9n306Q23MF0Q* diff --git a/bin/fenetres/create$7.class b/bin/fenetres/create$7.class index 99265a228e8d607580f022a5be39ab3a964cac6c..b3bfc6d721e8dbecc3a513d4cf2d5e1167e5789b 100644 GIT binary patch delta 21 ccmeBX?PlG;!NkNEKADTjoQW}VvNMwh05r!0hX4Qo delta 21 ccmeBX?PlG;!NkOLU@{kzITO>N$<9n306WtKTL1t6 diff --git a/bin/fenetres/create$8.class b/bin/fenetres/create$8.class index b179b065a054265e0d34697da550e37962703bcf..ce26429c743725de7c3f397a0e0cfbf58a7ef7c9 100644 GIT binary patch delta 21 ccmeBX?PlG;!NkOvFqwB$<9n306hf-e*gdg diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class index bb321ba8cf38a169310241a47d7bf0b7f3d74867..33f37e49a057b3af5c1f11ce049228bda0ecbf04 100644 GIT binary patch delta 7885 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 z%0Aw^)-i}ge7qg19g`0kQ-pj585`8LT6N)_ro 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 diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class index e2233a11569f7fad40bb2b2bd6ce5eb42b9ab98b..a3d87e3223b58d1197f8929aca7df43642f12426 100644 GIT binary patch delta 55 zcmeyw^NDA}3RYPq22Lh*23aNz2300a21_O_1{Wr61|KFJhA1Yb$wyg(I1L%Zn2Z>t Ln2aYYumu4CFn0;P delta 55 zcmeyw^NDA}3RYPa22LhT23aO82300)21_O#1{Wq>1|KFphA1YL$wyg(IE@*^m`oU? Lm`o=tumu4CGQA1Y diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class index a462d104e7382191aa3a3e4856775eee0acc021e..bb4b120d7d72f31fe01190c09f21074bb13ce603 100644 GIT binary patch delta 35 rcmZ3$v4CSkAG2UM11EC~gCKJ(gDP_zgD!LU1xTq44&(p; delta 55 zcmV-70LcID3+@ZBJp~=A00{%H01*SQ03`#l067D)07L_`089h409pg8lUfBs3Ag|R N1GxYT1G(BE*#qbR-2?0Z^aJex`~&&{0t5R28Uy?R cB?J8dMg#r(HG*#qhT-2?6b^aJkz`~&;}0t5X48Uy|T cB?JEfMg#x>Ndy4_R0IM6U<3pJMw1W_amR`_3IG5A diff --git a/bin/fenetres/evaluate$15.class b/bin/fenetres/evaluate$15.class index 90df1d58fb566360edfa3f860e5b92c545400f73..9c25b3e8cb429755f0276696bc66fcd16ac3b8b0 100644 GIT binary patch delta 67 zcmX>va9&_TJi9C>11Ad~gCGk(gDQ&vgC&a~gA0oggAa=^Llg_=(~76}Gf V7D=EADFzJ|X$BJ(*~x#|g8)=53AX?M delta 67 zcmX>va9&_TJi9D611F0BgCL6_gDQ&7^)Z~7-}YqG6w+w#7zkW delta 35 rcmaFP_MC0QW+uk+$y=BL1S=VM8LAir8LAmX7-|?K80sdAG6w+w#RUlw diff --git a/bin/fenetres/evaluate$17.class b/bin/fenetres/evaluate$17.class index 48519bb55a385eab53110d26b93ed69d0a22ae1b..83d7ad83cbb1c9b2ee2592e21af3b2fe54fd0009 100644 GIT binary patch delta 35 rcmeyv_J?i52`0vd$tRft1e+Lm8JZac8Cn=b7+M)57}_UmF$Vzv(w7Oa delta 35 rcmeyv_J?i52`0v-$tRft1X~z*8Cn?x8QK^`7}^;m7&<3wF$Vzv(@zP! diff --git a/bin/fenetres/evaluate$18.class b/bin/fenetres/evaluate$18.class index 5e3e6fbe21f34467b67a2b0327f0bc37d4bd0b6d..cb79ce21cf2216f424aed052e4634603d8c2c959 100644 GIT binary patch delta 35 rcmaFE_J(c44kpI_$vc?>1Sc}^GE8C+WSGn#!Z3wFf??WZDdr#m&>IQ5 delta 35 rcmaFE_J(c44kpHllXo%&2u^0;WthSs$S{>bgkc(k1jCHUQp`aB(9;RV diff --git a/bin/fenetres/evaluate$19.class b/bin/fenetres/evaluate$19.class index 0e2e30549b15c36de85562475396a5da985f8353..38a2d85ed5b95bda72db6b8c5e3ebae7fd67c8b7 100644 GIT binary patch delta 35 rcmaFP_MC0QW+ujEleaJh2(Dn@Wmw4|$gqk*gkd#<1jE|NqRc@6)#(Z= delta 35 rcmaFP_MC0QW+uiJleaJh2(Dt_WmwH1$gqY%gkdd%1jG8tqRc@6)}abF diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class index a41483d8a26fcd2b2ab77b196de095c470476094..77aa7db24e24c83444aa8429997a5617234d98b7 100644 GIT binary patch delta 67 zcmcb{dyRL)e^yy522Lh>23aNt2300U21_O<1{Wr01|KFDhA1Yh$uexQqMi&KOkNCp UOx_G)Og=!BzCe|Jll#~_0Kx1FJ UOuh_aOnyL>{y>!hll#~_0L5?&00000 diff --git a/bin/fenetres/evaluate$20.class b/bin/fenetres/evaluate$20.class index 2d2490b5aa802f0e86d258c0cfd20a73cbdad982..b9d9db499ff95928b6926e06a2c598bcb95ef2ec 100644 GIT binary patch delta 35 rcmaFN_LyzMdM3ublQ%F02<~U#WjMef$Z(KBgy9f_1jCWZg3Lhx+%*cJ delta 35 rcmaFN_LyzMdM3vGlQ%F02p(kMWjMqj$Z(iJgy9H-1jDh(g3Lhx-0cdj diff --git a/bin/fenetres/evaluate$21.class b/bin/fenetres/evaluate$21.class index 236e51aacfc2701a69c9e346d8b981197d08d2d5..403eeec698f3cf371420ad001679a87fcfa28126 100644 GIT binary patch delta 35 rcmaFM_LgnKPA0~4lXo!%2wq^|Ww^*7$Z&~4gyAxS1jE(I(#$~s=RFHK delta 35 rcmaFM_LgnKPA0|+lXo!%2wq~~Ww^{B$Z&;0gyAZK1jF^o(#$~s=k*Ik diff --git a/bin/fenetres/evaluate$22.class b/bin/fenetres/evaluate$22.class index f6e27884b80c0aaf825e114d0a33807cfce252a2..8e18d300e3c857818e5711e8cf40aa54a0c4d8e2 100644 GIT binary patch delta 35 rcmaFK_L6PGRwl-mleaMi2)<_EWq89N$ncgygy9{71jC2P;>ByS&%sh0Nu?A9smFU delta 36 scmaFN_LyzMdM3tylQ%H=3o$Y<@G>$o2r@D;h%hoUNHDTa7Gw?r0JyIQEC2ui diff --git a/bin/fenetres/evaluate$24.class b/bin/fenetres/evaluate$24.class index 80be2b87e11a898f93c508be9d56efb4e8b211a3..b515b8a53cefdf0f4929529dd1cdbc005237896b 100644 GIT binary patch delta 35 rcmaFL_LObIMkYp%$(xu01i2V^8Mzq*8F?5)7F+ diff --git a/bin/fenetres/evaluate$26.class b/bin/fenetres/evaluate$26.class index 2afd5af8c03628cbd54e146063b2d27f96a799ec..524d21070d5e2caa8f534e126babf4657f4f886f 100644 GIT binary patch delta 19 acmbQqI+JySI1^*{WCas@L0 delta 21 ccmbQqI+JySIMd_+Cbr44Ova4;lLMJN06_r-lmGw# diff --git a/bin/fenetres/evaluate$27.class b/bin/fenetres/evaluate$27.class index 1a5e60dafab7df40be86529105fe67d640e086b0..86709f5fe2066feee8ae67e21c2dab96afb5420d 100644 GIT binary patch delta 19 bcmbQqI+JySI1}T{$r4N!jI$>PGI;<1H&O*p delta 21 dcmbQqI+JySIMd_+Cbr44Ova3JCkHZl002Qp1)=}| diff --git a/bin/fenetres/evaluate$28.class b/bin/fenetres/evaluate$28.class index 04fa9c5c53db02c833e3741edbfe8308b7245a70..2cbdf0b9ac0cfad42b48e35340254abe76df3f3f 100644 GIT binary patch delta 19 bcmbQqI+JySI1}T_$r4N!jH@RHGI;<1I8p^~ delta 21 dcmbQqI+JySIMd_+Cbr44Ova3BCkHZl002Rk1+oAD diff --git a/bin/fenetres/evaluate$29.class b/bin/fenetres/evaluate$29.class index 782ca131b57934cda812835e873e77d2fc70d1f2..feb10986f5206215e83c8d0bcd2b3639d174b54f 100644 GIT binary patch delta 19 bcmbQqI+JySI1}TB$r4N!jGHD0GI;<1IKl;e delta 21 dcmbQqI+JySIMd_+Cbr44Ova2`CI>Qk002R{1-SqK diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class index 4f221da1932549d48088d430576e8f980d11d953..03b9a077a2fc19730b2a61da643865ed9bedd1a9 100644 GIT binary patch delta 123 zcmWN{s}4Z{0D$3te{$L66PzG;14WTcA}YtNFt@qiHnJoLf)}tU0#WlOo3%DN}HG+Qg%t(BV(VOgZ~^-a74*5Ehp@pvUkS8 YIcFDKTyk~A%{31XP=Bia*n7uX5)mtQx48J XJLlqpt4nUKc(~^2mY2KJCp`E8iC`Tj diff --git a/bin/fenetres/evaluate$30.class b/bin/fenetres/evaluate$30.class index f391f86283e848923f96494d14a3899bf6e4ca33..6aa845258655a5330f2f02026e1e9c523483fa26 100644 GIT binary patch delta 19 bcmbQqI+JySI1}T}$r4N!jJqcXGI;<1IZ_3W delta 21 dcmbQqI+JySIMd_+Cbr44Ova3RCkHZl002Sf1;PLT diff --git a/bin/fenetres/evaluate$31.class b/bin/fenetres/evaluate$31.class index a8393db9c60e9867f32c7113188ad92047d4ed40..1a1a14d56262cf52abb72e00c256e02b90540b76 100644 GIT binary patch delta 19 bcmbQqI+JySI1}Tc$r4N!j7KI1GI;<1IpPJO delta 21 dcmbQqI+JySIMd_+Cbr44Ova4ICI>Qk002T11c diff --git a/bin/fenetres/evaluate$32.class b/bin/fenetres/evaluate$32.class index c3e4b986dd7badf31b925dfc8520b096579d0232..1cdef7f159e37c6ff96d4f9c22932b38cbe7d5a6 100644 GIT binary patch delta 19 bcmbQqI+JySI1}TQ$r4N!jMpXyGI;<1I|2p8 delta 21 dcmbQqI+JySIMd_+Cbr44Ova2iCI>Qk002U61>FDu diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class index ddb9eb0d9edbc29dd77b9b265dcadf2229e1627f..9a370d7c0039971002722add725c9aa7e73fa73d 100644 GIT binary patch delta 95 zcmV-l0HFVX6o3@4ng|_%00{zy038B{03`y5067AQ07L?c089dl09pcpleY-BF^~WV z0+Ik00+Rq70+awD0+j$J0+#?T0+;|t0+|3~0-6AA0-FGE0-OMN0-peX0-%$h31KRI B7a9Nn delta 95 zcmV-l0HFVX6o3@4ng|_(00{z!038B}03`y7067AS07L?e089dn09pcrleY-BF_HiX z0+aw20+j$90+s+F0+#?L0+|3V0-69v0-FG10-OMC0-XSG0-gYP0-*qZ0-}?j31Kn+ B7eoL6 diff --git a/bin/fenetres/evaluate$5.class b/bin/fenetres/evaluate$5.class index 260dd11320f9433b1650d5652c1bc2131e2101a6..455a78e51638fa842257838c191c7de58a03b2ed 100644 GIT binary patch delta 111 zcmV-#0FeLF7Sk56stFya00{!D038CY03`yh067A$07L??089e009pd5lgA0sLA3w` z0=57M0=EDW0=WPs0=fVz0=ob%0=xh^0=)oA0=@uF0>1!K0>A)S0>J=U0>S`Z0>l7e R0>uDr0>=Px0?3ou3VOZTA8P;r delta 111 zcmWN|yAHts06@{38-v;`-8z~ib~cGg#9(8P_yB{|Z}cxZPz;FoBN{g8@ P7ZWq4zM1)nf0g+k$W$Ml diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class index 595e912093d13efc8453b884d81f6695ed4044af..aeaf2bae8ed6ecc3d5ab4482ac07ea3ec413a55e 100644 GIT binary patch delta 209 zcmV~$JtzbK9LC}I{rz(~hlwoi6kP^`QOq)3DK?AQU}rK?7IoQ_%t~USZZw@bU(31k zEg~0kLWt)nWD1$h575&r2b%bO&CI@Om_OBNE`Qm#cyex`Nr9|=xAOaK4? delta 209 zcmV~$J17JI9LMqB@B8<oubQNFp60wrPwTHgPqApS=41yGAoIRy3yv6XX(!S z5qaeu^7wr6nS5qxCYdfM!Isi&E6a{L*;O}t>SbSp6jqj#S;mX1prjOss^>_J9IJ^F zwQ#Cd&eX=aI=E05m+Ik416*r}8;x+QG43?MgK|7-o+qvHtOH(D;!Ur-yN(Yx@acBG y+{d^3`SCEnp5)I{VNVC1ZH_X}MY$KE(u+~$wMcj)lHQDzi&5?SsLhSmtp5W7r#-I# diff --git a/bin/fenetres/evaluate$7.class b/bin/fenetres/evaluate$7.class index 5a7fd81b1f1d0fede87c01f99afd1b850cf5638c..781d77c5be2b697e4d2c68bd40ac23528d182a06 100644 GIT binary patch delta 59 zcmX@jf0}>8Q#MHv22N&420>;i232Nh1_Ndp1`B3c1~+Dr$^Y201Qi+Bn3Wg=n3WlX PnN=8!nAIm&vIhYGL5~Th delta 59 zcmX@jf0}>8Q#MI422N&a20>;S232NR1_Nd}1`B3+1~+E0$^Y201eF=sm{k}Am{l2s PnbjDKm^CL?vIhYGL^BD# diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class index 013faaac5589d617d4d002129447b9bc82e07ef4..1cd6870cf5d71cbbd26610412b9918ccf7579ee6 100644 GIT binary patch delta 55 zcmZ3&vxH|uBCD(}11GZ)gCMgpgDSHLgC(;mgA216gAcPgLlm>_4irdB5)k1>_Lbge_{ug+mkNZ+j|fwqh*nduQq4oEibAGZj~yx>dsGEV)Mv;$7au6v(q>2+Zi5E7DFYGcC*)kt_vIIM21$Ida@+BP~%SR}XeJGYn?3d#>ASZE1 zno%MhD3u-@mOdO&K)G^7mGVKgbykg1b3t(4;=ac~y>P zRf87QfQ#w^T2(uKQ-7dMJwm&oaLsVR?}iN>#$1{T0toe}R%ppFfHGQ-P$LnYLy!PV@I)HvUn3Hrk zC+ir#sM9z_XLG8~Wq>}wX}XLr>vQy;uA4YRw{oU#<7|DMLAr~$#FBaH`<$REAUh0xc}Z&#XWvD{;pf=>s0Kn5sCO$LYpz zIe{lElsXHgo(tH>r98<5o?b$~InN7caAy zzi^OOM6pe5Y!`1{lZot*Aa=@p-jE31l-0Z?$?TFXye(PmmfieIO4%b{vRA5kSI+RB z{K~)O2JcHZA4)&_l#>Jdl?w-yjsMg>2=o{G6KD>>mH%0x15>TK0!6IY6&8qra4``r z8u8+Qwc==%Hw+tPI5MmPbHv%I%>{)r!m7&^W#Wdf#2vNbf$zl=XT^p=8O4#}#nXSBCi0o2ZIv%KgziqTL1t6 delta 1145 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 delta 1260 zcmZvbeQZ-z7{;Hs=iYHC+t}7^u4C)kvbI~ht{qUObzy-m0*M+Dj0p)6yK%?nzDj$? zSj-%Viyx?iy(VVCg`oKTxy;N(68~15ANYY23@$207nvx6%8+^QEyxI--28Ixd7tMw z=RLW1GP!rV_2}hy-vdxX)g#usN;1+kb*C1MD|nw!#rsRWnO)AUosC`XYKK;-;3&WC zyn`m#;_9W3d6%o7KIJs`4*HCH-L3Qm|LmTj<2Wt&3c18%rzyV0Q$pYICQlvxz{8$G`jN*yYw4#!Z!t}?!`qYh3t>@G z>uFP?CKb#OlI-#>=Wo4hq_c!to+vNk)jp5(J7G89yTs0WeD~2GJmY(gF7RO4%@+K{ z6J^7BxJa;WO~ksRO^H~$s^Ah~ogNkDH_Gi6T;>nTZzFJ)zl|*1>u<=GuIgLbW7|}P z()g^u&aDs%QYYG$h{c;*8iVmfXIxEaEoxFBD`A6~*&lGb(+Roe4J138v|wBhxpEDZ zNpRN0S8e1p{|N8sKR7)R+lD9ic!zv9Uoid-9M?u*P< zpE2@&HL%*iZwAg8IB(!j9jT4}HnV*5t+R&W9|LnbY(!VZHWH?~V4m7W@|AL)-$n~= zsPnBW2l^b>8H&x+l543;OjqcCL@r%q-j9uznl8^Zm(O(huXB}~qJT-gLH+O{ojFFU zfw%O3S-=X=DRhqxRfniAZn=Q%mRTeOkQ6dBVMUi%j2$8u-NKHY!hs&)!~LQjeIkb4 z;sNXt2hcCZ@vu0CN5pYFDo)}tF@?S2G#(ezctV`RfRv7XQa1KW`52U(cuK0p)6y0U zNxe8AJ%eHC2o6do`fx}(k7uPh9F`05yzImavIj590lXwf@QSYE6ohU6Kxor$WGZ|P})-bOD ziZU~B0ZAzaHXtd$z|A1YAjTlXpvWN1pu-@-V9p>46k}lEftbLc0F+^1Py%9h23Bq^ NAOK1z1G!8LDgaPz9c%yq delta 152 zcmbQp_K}tA)W2Q(7#J9A7?d}1u`y0gWE7t)&FCi2Q(RJ+lWLWgn46hX$-yAa$iP{W zT2W$^mzbN%!5}+%4&yV<5(Xv)Mxb83$=yskUd(HNOlAfyASuSc3MBa%xETb1Y(WM^ o1|bF=24Ntdfq@62g+Y!%9>`MwVm1aAZZ0k^ptvHC$Hbrn06P8{6aWAK diff --git a/bin/list/listeEvalNameNode.class b/bin/list/listeEvalNameNode.class index 5c313037eba9f94e08dbea2f3bf98bf9304c26d5..9db6eb10ad2f68f60a29a9cbb158cfd1c0bae52d 100644 GIT binary patch delta 29 jcmZ3=x|DT84wE1+10N8|Fz_>IF$geNFbGbrWzqluPtgRG delta 29 kcmZ3=x|DT84wE1s10MrFgA9WJgBF7zg9U@|T08keMn*aa+ diff --git a/bin/list/listeNodeAnalyseWriter.class b/bin/list/listeNodeAnalyseWriter.class index 47365400a4f26a88c922e9100684ca8ccf893ab2..a31b6f7f4ddec4818eec332f5e9a22951d10dd2a 100644 GIT binary patch delta 160 zcmeyyIgg9$)W2Q(7#J9A7`!)f)i7~zFt{=@F!_g0Ze!ZWd4++AfsuiMQDL(KGY6xJ zmXOmn2BDb@tSoD^gj`@u<~2a=%nV#WGLJ!eau`dpyDFnFgBqh8g9ZaPP?QH^27?=e YJCNrA#4-$0++4T-P_-ve4HJVG0N!mEDF6Tf delta 102 zcmbQo^^KG3)W2Q(7#J9A7(6#})i6!&W7^2Mg@K8Ik%57cYqJM42O}Tz8lXHg0~e4? vW00I&!jdeb#=s5a@jz5DxG=Z^d2T=~#UQ~wnUPg^vH&YPyE{;TiNON^VDb=g diff --git a/src/MEPTL/ecritureSujet.java b/src/MEPTL/ecritureSujet.java index 8ba80a8..e259e35 100644 --- a/src/MEPTL/ecritureSujet.java +++ b/src/MEPTL/ecritureSujet.java @@ -5,6 +5,9 @@ import java.util.ArrayList; import cXML.Run; import cXML.node; +import list.listeDesNodesAnalyseStyle; +import list.listeDesNodesAvecEvalNameNode; +import list.listeDesNodesRechercheByContenu; import list.listeRechercheParAnchorPageNumber; @@ -271,7 +274,7 @@ public class ecritureSujet { /** - * Ajoute les différents attributs aux nodes enfants des nodes principaux. + * Ajoute les différents attributs aux nodes enfants des nodes principaux.
* @param noPourPlacerEvaluer * @param nameNodeRacine * @return @@ -293,18 +296,18 @@ public class ecritureSujet { } /** - * Ajoute les attributs d'analyseWriter par défaut + * Ajoute les attributs d'analyseWriter par défaut.
* @param no */ private static void nextNodesEnfants(ArrayList no) { for(int k=0 ; k < no.size(); k++) { if(no.get(k)!=null) { no.get(k).getAttributs().put("evaluer", "false"); - if(listeDesNodesAvecEvalNode(no.get(k).getNomElt())) no.get(k).getAttributs().put("evalNameNode", "0"); + if( listeDesNodesAvecEvalNameNode.isEvalNameNode(no.get(k))) no.get(k).getAttributs().put("evalNameNode", "0"); if(listeDesNodesSautEtTitre(no.get(k).getNomElt())) {no.get(k).getAttributs().put("saut", "false"); no.get(k).getAttributs().put("titre", "");} - if(listeDesNodesByRecherche(no.get(k).getNomElt())) {no.get(k).getAttributs().put("recherche_index", "false"); no.get(k).getAttributs().put("recherche_contenu_exact", "false");no.get(k).getAttributs().put("recherche_contenu_plus_proche_voisin", "false");} - if(listeDesNodesAnalyseStyle(no.get(k).getNomElt())) no.get(k).getAttributs().put("analyseStyle", "false"); - if(listeDesNodesAllContent(no.get(k).getNomElt())) no.get(k).getAttributs().put("allContent", "strict0"); + if(listeDesNodesRechercheByContenu.isRechercheByContenu(no.get(k))) {no.get(k).getAttributs().put("recherche_index", "false"); no.get(k).getAttributs().put("recherche_contenu_exact", "false");no.get(k).getAttributs().put("recherche_contenu_plus_proche_voisin", "false");} + if(listeDesNodesAnalyseStyle.isAnalyseStyle(no.get(k))) no.get(k).getAttributs().put("analyseStyle", "false"); + if(listeDesNodesRechercheByContenu.isRechercheByContenu(no.get(k))) no.get(k).getAttributs().put("allContent", "strict0"); if(listeRechercheParAnchorPageNumber.isRechercheParAnchorPageNumber(no.get(k))) no.get(k).getAttributs().put("recherche_anchor-page-number", "false"); if(!no.get(k).getNodes().isEmpty()) { @@ -314,18 +317,7 @@ public class ecritureSujet { } } - - /** - * Liste des nodes qui peuvent contenir l'attribut evalNameNode - * @param nameNode - * @return - */ - public static boolean listeDesNodesAvecEvalNode(String nameNode) { - if(nameNode.contains("meta:")) return true; - if(nameNode.contains("dc:")) return true; - if(nameNode.contains("text:")) return true; - return false; - } + /** * Liste des nodes qui peuvent contenir les attributs saut et titre @@ -340,46 +332,6 @@ public class ecritureSujet { return false; } - /** - * Liste des nodes qui peuvent contenir l'attribut recherche_index, recherche_contenu_exact, recherche_contenu_plus_proche_voisin - * @param nameNode - * @return - */ - public static boolean listeDesNodesByRecherche(String nameNode) { - if(nameNode.contains("text:p")) return true; - if(nameNode.contains("text:line-break")) return true; - if(nameNode.contains("text:h")) return true; - if(nameNode.contains("text:span")) return true; - if(nameNode.equals("draw:text-box")) return true; - if(nameNode.equals("text:soft-page-break")) return true; - - return false; - } - - /** - * Liste des nodes qui peuvent contenir l'attribut analyseStyle - * @param nameNode - * @return - */ - public static boolean listeDesNodesAnalyseStyle(String nameNode) { - if(nameNode.contains("text:database-display")) return false; - if(nameNode.contains("text:")) return true; - return false; - } - - /** - * Liste des nodes qui peuvent contenir l'attribut allContent - * @param nameNode - * @return - */ - public static boolean listeDesNodesAllContent(String nameNode) { - if(nameNode.contains("text:")) return true; - if(nameNode.equals("table:table-cell")) return true; - if(nameNode.equals("table:table-row")) return true; - return false; - } - - /** diff --git a/src/fenetres/attributs.java b/src/fenetres/attributs.java index e238b20..56b4d09 100644 --- a/src/fenetres/attributs.java +++ b/src/fenetres/attributs.java @@ -280,8 +280,8 @@ public class attributs extends JFrame { panelCentre.add(Lespoints.get(i), "cell 3 " + i+1 +",alignx left,growy"); } - //Enabled false les valeurs ne peuvent pas être modifiées - //Enabled false les evaluer si pas evaluable + //Enabled false les valeurs ne peuvent pas être modifiées. + //Enabled false les evaluer si pas evaluable. for(int i = 0 ; i1 - JMenu mnSaut = new JMenu("Saut de ligne avant"); - mnSaut.setIcon( new ImageIcon(create.class.getResource("/resources/sautmini.png"))); - mnSaut.add(new actsauttrue()); - mnSaut.add(new actsautfalse()); - - //Menu saut niveau = 1 - //Menu Saut - JMenu mnSautNiveau1 = new JMenu("Saut de ligne avant"); - mnSautNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/sautmini.png"))); - mnSautNiveau1.add(new actsauttrue()); - mnSautNiveau1.add(new actsautfalse()); - - //Menu Titre niveau > 1 - JMenu mnTitre = new JMenu("Titre"); - mnTitre.setIcon( new ImageIcon(create.class.getResource("/resources/titremini.png"))); - mnTitre.add(new actTitrePrincipal()); - mnTitre.add(new actTitre1()); - mnTitre.add(new actTitre2()); - mnTitre.add(new actTitre3()); - mnTitre.addSeparator(); - mnTitre.add(new actSupprimeTitre()); - - //Menu Titre niveau = 1 - JMenu mnTitreNiveau1 = new JMenu("Titre"); - mnTitreNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/titremini.png"))); - mnTitreNiveau1.add(new actTitrePrincipal()); - mnTitreNiveau1.add(new actTitre1()); - mnTitreNiveau1.add(new actTitre2()); - mnTitreNiveau1.add(new actTitre3()); - mnTitreNiveau1.addSeparator(); - mnTitreNiveau1.add(new actSupprimeTitre()); - - //Menu ajoute un lien de menu niveau 1 - JMenu mnAddMenuNiveau1= new JMenu("Lien"); //addMenu - mnAddMenuNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/addmenumini.png"))); - mnAddMenuNiveau1.add(new actAddMenuTrue()); - mnAddMenuNiveau1.add(new actAddMenuFalse()); - - //Menu ajoute un lien de menu niveau sup 1 - JMenu mnAddMenuNiveauSup1= new JMenu("Lien"); //addMenu - mnAddMenuNiveauSup1.setIcon( new ImageIcon(create.class.getResource("/resources/addmenumini.png"))); - mnAddMenuNiveauSup1.add(new actAddMenuTrue()); - mnAddMenuNiveauSup1.add(new actAddMenuFalse()); - - //Menu recherche par l'index - 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()); - - //Menu recherche par le contenu Exact - 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()); - - //Menu recherche par le contenu plus proche voisin - JMenu mnRechercheContenuPlusProcheVoisin = new JMenu("Recherche par le plus proche voisin"); - mnRechercheContenuPlusProcheVoisin.setIcon(new ImageIcon(create.class.getResource("/resources/recherchecontenuplusprochevoisinmini.png"))); - mnRechercheContenuPlusProcheVoisin.add( new actRechercheContenuPlusProcheVoisintrue()); - mnRechercheContenuPlusProcheVoisin.addSeparator(); - mnRechercheContenuPlusProcheVoisin.add(new actRechercheContenuPlusProcheVoisinfalse()); - - //Menu analyseStyle (évaluer le style du paragraphe) - 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()); - - //Menu evalEnteteActive (pour les style:header-style) - JMenu mnevalEnteteActive = new JMenu("Entête activé"); - mnevalEnteteActive.setIcon(new ImageIcon(create.class.getResource("/resources/enteteouimini.png"))); - mnevalEnteteActive.add(new actEvalEnteteActive()); - mnevalEnteteActive.add(new actEvalEnteteActiveNon()); - - //Menu evalEntetePasActive (pour les style:header-style) - JMenu mnevalEntetePasActive = new JMenu("Entête pas activé"); - mnevalEntetePasActive.setIcon(new ImageIcon(create.class.getResource("/resources/entetenonmini.png"))); - mnevalEntetePasActive.add(new actEvalEntetePasActive()); - mnevalEntetePasActive.add(new actEvalEntetePasActiveNon()); - - //Menu evalPiedPageActive (pour les style:footer-style) - JMenu mnEvalPiedPageActive = new JMenu("Pied page activé"); - mnEvalPiedPageActive.setIcon(new ImageIcon(create.class.getResource("/resources/piedpageouimini.png"))); - mnEvalPiedPageActive.add(new actEvalPiedPageActive()); - mnEvalPiedPageActive.add(new actEvalPiedPageActiveNon()); - - //Menu evalPiedPagePasActive (pour les style:footer-style) - JMenu mnEvalPiedPagePasActive = new JMenu("Pied page pas activé"); - mnEvalPiedPagePasActive.setIcon(new ImageIcon(create.class.getResource("/resources/piedpagenonmini.png"))); - mnEvalPiedPagePasActive.add(new actEvalPiedPagePasActive()); - mnEvalPiedPagePasActive.add(new actEvalPiedPagePasActiveNon()); - - //Menu Evaluer présence d'un node pour les nodes de niveau > 1 - JMenu mnEvalNameNode = new JMenu("Evaluer la présence du node"); - mnEvalNameNode.setIcon(new ImageIcon(create.class.getResource("/resources/evalnodemini.png"))); - mnEvalNameNode.add(new actEvalNameNodeOui()); - mnEvalNameNode.add(new actEvalNameNodeNon()); - - //Menu evalNameSequence (pour les text:sequence-decl) - JMenu mnEvalNameSequence = new JMenu("Evaluer le nom de la séquence"); - mnEvalNameSequence.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamesequencemini.png"))); - mnEvalNameSequence.add(new actEvalNameSequenceOui()); - mnEvalNameSequence.add(new actEvalNameSequenceNon()); - - //Menu evalNamePage (pour les nodes page) - JMenu mnEvalNamePage = new JMenu("Evaluer le nom de la page"); - mnEvalNamePage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepagemini.png"))); - mnEvalNamePage.add(new actEvalNamePageOui()); - mnEvalNamePage.add(new actEvalNamePageNon()); - - //Menu evalNumeroPage (pour les nodes page) - JMenu mnEvalNumeroPage = new JMenu("Evaluer le numéro de la page"); - mnEvalNumeroPage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagemini.png"))); - mnEvalNumeroPage.add(new actEvalNumeroPageOui()); - mnEvalNumeroPage.add(new actEvalNumeroPageNon()); - - //Menu evalNumeroPage (pour les nodes page) - JMenu mnEvalNumeroAbsoluePage = new JMenu("Evaluer le numéro absolue de la page"); - mnEvalNumeroAbsoluePage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepagemini.png"))); - mnEvalNumeroAbsoluePage.add(new actEvalNumeroAbsoluePageOui()); - mnEvalNumeroAbsoluePage.add(new actEvalNumeroAbsoluePageNon()); - - //Menu evalTextUserDefined - JMenu mnEvalTextUserDefined = new JMenu("Evaluer la valeur de la propriété"); - mnEvalTextUserDefined.setIcon(new ImageIcon(create.class.getResource("/resources/evaltextuserdefinedmini.png"))); - mnEvalTextUserDefined.add(new actEvalTextUserDefinedOui()); - mnEvalTextUserDefined.add(new actEvalTextUserDefinedNon()); - - //Menue Recherche par le numéro de la page ancrer - JMenu mnRechercheParNumeroPageAncrer = new JMenu("Recherche par le numéro de la page"); - mnRechercheParNumeroPageAncrer.setIcon(new ImageIcon(create.class.getResource("/resources/rechercheancragepagemini.png"))); - mnRechercheParNumeroPageAncrer.add( new actRechercheAnchorPageNumberTrue()); - mnRechercheParNumeroPageAncrer.addSeparator(); - mnRechercheParNumeroPageAncrer.add( new actRechercheAnchorPageNumberFalse()); - - //Menu Représentation dans le feedback - JMenu mnPourFeedback = new JMenu("Pour représentation feedback"); - mnPourFeedback.add(mnSaut); - mnPourFeedback.addSeparator(); - mnPourFeedback.add(mnTitre); - mnPourFeedback.addSeparator(); - mnPourFeedback.add(mnAddMenuNiveauSup1); - - //Menu Evaluer tous les styles dans une page - JMenu mnEvaluerStylesParagraphes = new JMenu("Evaluer tous les styles (paragraphes ou titres)."); - mnEvaluerStylesParagraphes.setIcon(new ImageIcon(create.class.getResource("/resources/evaluertouslesstylesparagraphesmini.png"))); - mnEvaluerStylesParagraphes.add( new actEvaluerTousLesStylesParagraphesTrue()); - - //Menu OU - JMenu mnOu = new JMenu("Insérer un node OU"); - mnOu.setIcon(new ImageIcon(create.class.getResource("/resources/oumini.png"))); - mnOu.add( new actOu()); - - //Menu ordreParagraphe - JMenu mnOrdreParagraphe = new JMenu("Ordre des paragraphe"); - mnOrdreParagraphe.setIcon(new ImageIcon(create.class.getResource("/resources/ordreparagraphemini.png"))); - mnOrdreParagraphe.add(new actEvalOrdreParagrapheOui()); - mnOrdreParagraphe.add(new actEvalOrdreParagrapheNon()); - - - //*************************** - //** Menu node niveau = 1 *** - //*************************** - JMenu mnNiveau1 = new JMenu("Attributs aW, niveau 1 "); - mnNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/attributanalysewritermini.png"))); - mnNiveau1.add(new actCoefficient()); - mnNiveau1.addSeparator(); - mnNiveau1.add(mnSautNiveau1); - mnNiveau1.addSeparator(); - mnNiveau1.add(mnTitreNiveau1); - mnNiveau1.addSeparator(); - mnNiveau1.add(mnAddMenuNiveau1); - - - - //********************************************* - //** La popupMenu qui s'affiche sur le tree *** - //********************************************* - JPopupMenu mnPopupTree = new JPopupMenu(); - mnPopupTree.add(mnEvaluer); - if(nod.getLevel()==1 ) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnNiveau1); - if(nod.getNomElt().equals("structurepage")){ - mnPopupTree.addSeparator(); - mnPopupTree.add(mnOu); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnOrdreParagraphe); - } - } - - //Pour les nodes de niveau supérieur à 1 - if(nod.getLevel()>1 ) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnPourFeedback); - if(listeEvalNameNode.isNodeEvalNameNode(nod)) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvalNameNode); - } - if(nod.retourneLesContenusEnfants("").length()>0) { - mnPopupTree.addSeparator(); - mnPopupTree.add(new actAllContent()); - } - if(nod.getNomElt().equals("meta:initial-creator")) { - mnPopupTree.addSeparator(); - mnPopupTree.add(new actEvalInitialCreator()); - } - if(nod.getNomElt().equals("dc:creator")) { - mnPopupTree.addSeparator(); - mnPopupTree.add(new actevalNameCreator()); - } - if(listeRechercheParAnchorPageNumber.isRechercheParAnchorPageNumber(nod)) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnRechercheParNumeroPageAncrer); - } - if(nod.getNomElt().equals("style:header-style")) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnevalEnteteActive); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnevalEntetePasActive); - } - if(nod.getNomElt().equals("style:footer-style")) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvalPiedPageActive); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvalPiedPagePasActive); - } - if(nod.getNomElt().equals("text:sequence-decl")) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvalNameSequence); - } - if(nod.getNomElt().equals("page")) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvalNamePage); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvalNumeroPage); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvalNumeroAbsoluePage); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvaluerStylesParagraphes); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnOu); - } - if(nod.getNomElt().equals("text:user-defined") && nod.chemin().contains("structurepage")) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnEvalTextUserDefined); - } - - if(ecritureSujet.listeDesNodesByRecherche(nod.getNomElt())) { - mnPopupTree.addSeparator(); - mnPopupTree.add(mnRechercheIndex); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnRechercheContenu); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnRechercheContenuPlusProcheVoisin); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnAnalyseStyle); - mnPopupTree.addSeparator(); - mnPopupTree.add(mnOu); - } - mnPopupTree.addSeparator(); - mnPopupTree.add(new actAttribut()); - } - - - mnPopupTree.addSeparator(); - mnPopupTree.add(mnManageTree); - mnPopupTree.addSeparator(); - mnPopupTree.add(new actCopy()); - mnPopupTree.addSeparator(); - mnPopupTree.add(new actPaste()); - mnPopupTree.addSeparator(); - mnPopupTree.add(new actDeleteNode()); - - - tree.setComponentPopupMenu(mnPopupTree); - } - } - - - - /* Methode de construction de la barre de menu */ private JMenuBar createMenuBar() { diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java new file mode 100644 index 0000000..2b85ff0 --- /dev/null +++ b/src/fenetres/createPopupMenu.java @@ -0,0 +1,612 @@ +package fenetres; + +import javax.swing.ImageIcon; +import javax.swing.JMenu; +import javax.swing.JPopupMenu; + +import cXML.node; +import fenetres.create_act.actAddMenuFalse; +import fenetres.create_act.actAddMenuTrue; +import fenetres.create_act.actAllContent; +import fenetres.create_act.actAttribut; +import fenetres.create_act.actCoefficient; +import fenetres.create_act.actCollapseAll; +import fenetres.create_act.actCollapseNode; +import fenetres.create_act.actCopy; +import fenetres.create_act.actDeleteNode; +import fenetres.create_act.actDownNode; +import fenetres.create_act.actEvalEnteteActive; +import fenetres.create_act.actEvalEnteteActiveNon; +import fenetres.create_act.actEvalEntetePasActive; +import fenetres.create_act.actEvalEntetePasActiveNon; +import fenetres.create_act.actEvalInitialCreator; +import fenetres.create_act.actEvalNameNodeNon; +import fenetres.create_act.actEvalNameNodeOui; +import fenetres.create_act.actEvalNamePageNon; +import fenetres.create_act.actEvalNamePageOui; +import fenetres.create_act.actEvalNameSequenceNon; +import fenetres.create_act.actEvalNameSequenceOui; +import fenetres.create_act.actEvalNumeroAbsoluePageNon; +import fenetres.create_act.actEvalNumeroAbsoluePageOui; +import fenetres.create_act.actEvalNumeroPageNon; +import fenetres.create_act.actEvalNumeroPageOui; +import fenetres.create_act.actEvalOrdreParagrapheNon; +import fenetres.create_act.actEvalOrdreParagrapheOui; +import fenetres.create_act.actEvalPiedPageActive; +import fenetres.create_act.actEvalPiedPageActiveNon; +import fenetres.create_act.actEvalPiedPagePasActive; +import fenetres.create_act.actEvalPiedPagePasActiveNon; +import fenetres.create_act.actEvalTextUserDefinedNon; +import fenetres.create_act.actEvalTextUserDefinedOui; +import fenetres.create_act.actEvalueFalse; +import fenetres.create_act.actEvalueTrue; +import fenetres.create_act.actEvaluerStyleFalse; +import fenetres.create_act.actEvaluerStyleTrue; +import fenetres.create_act.actEvaluerTousLesStylesParagraphesTrue; +import fenetres.create_act.actExpandAll; +import fenetres.create_act.actExpandNode; +import fenetres.create_act.actOu; +import fenetres.create_act.actPaste; +import fenetres.create_act.actRechercheAnchorPageNumberFalse; +import fenetres.create_act.actRechercheAnchorPageNumberTrue; +import fenetres.create_act.actRechercheContenuPlusProcheVoisinfalse; +import fenetres.create_act.actRechercheContenuPlusProcheVoisintrue; +import fenetres.create_act.actRechercheContenufalse; +import fenetres.create_act.actRechercheContenutrue; +import fenetres.create_act.actRechercheIndexfalse; +import fenetres.create_act.actRechercheIndextrue; +import fenetres.create_act.actSupprimeTitre; +import fenetres.create_act.actTitre1; +import fenetres.create_act.actTitre2; +import fenetres.create_act.actTitre3; +import fenetres.create_act.actTitrePrincipal; +import fenetres.create_act.actUpNode; +import fenetres.create_act.actevalNameCreator; +import fenetres.create_act.actsautfalse; +import fenetres.create_act.actsauttrue; +import list.listeDesNodesAllContent; +import list.listeDesNodesAnalyseStyle; +import list.listeDesNodesAvecEvalNameNode; +import list.listeDesNodesAvecOU; +import list.listeDesNodesPourEvaluationEntetePage; +import list.listeDesNodesPourEvaluerPage; +import list.listeDesNodesPourEvaluerPiedDePage; +import list.listeDesNodesRechercheByContenu; +import list.listeDesNotesAEvaluer; +import list.listeEvalNameNode; +import list.listeRechercheParAnchorPageNumber; + +public class createPopupMenu extends JPopupMenu { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public createPopupMenu(node nod) { +if(nod!=null) { + + + //************************************************************** + //** La popupMenu qui s'affiche sur le tree pour les niveau 1 ** + //************************************************************** + JPopupMenu mnPopupTree = new JPopupMenu(); + mnPopupTree.add( mnEvaluer()); + if(nod.getLevel()==1 ) { + mnPopupTree.addSeparator(); + mnPopupTree.add(mnNiveau1()); + } + + //******************************************** + //** Pour les nodes de niveau supérieur à 1 ** + //******************************************** + if(nod.getLevel()>1 ) { + + mnPopupTree.addSeparator(); + mnPopupTree.add(mnPourFeedback()); + + if(listeDesNodesRechercheByContenu.isRechercheByContenu(nod)||listeRechercheParAnchorPageNumber.isRechercheParAnchorPageNumber(nod)) { + mnPopupTree.addSeparator(); + mnPopupTree.add(mnGroupeRechercheContenu(nod)); + } + + if(listeDesNodesAvecEvalNameNode.isEvalNameNode(nod)||listeDesNodesAllContent.isAllContent(nod)|| + listeDesNodesPourEvaluationEntetePage.isEntete(nod) || listeDesNodesPourEvaluerPiedDePage.isPiedDePage(nod)|| + listeDesNodesPourEvaluerPage.isPage(nod) || listeDesNotesAEvaluer.isAEvaluer(nod)) { + mnPopupTree.addSeparator(); + mnPopupTree.add(mnGroupeMethodeEvaluer(nod)); + } + + + if(listeDesNodesAvecOU.isOU(nod)) { + mnPopupTree.addSeparator(); + mnPopupTree.add(mnOu()); + } + + mnPopupTree.addSeparator(); + mnPopupTree.add(new actAttribut()); + } + + + mnPopupTree.addSeparator(); + mnPopupTree.add(mnArbre()); + mnPopupTree.addSeparator(); + mnPopupTree.add(new actCopy()); + mnPopupTree.addSeparator(); + mnPopupTree.add(new actPaste()); + mnPopupTree.addSeparator(); + mnPopupTree.add(new actDeleteNode()); + + + //************************************* + //** Applique le popMenu sur la tree ** + //************************************* + create.getTree().setComponentPopupMenu(mnPopupTree); + + } + } + + /** + * Menu Evaluer.
+ * @return + */ + private JMenu mnEvaluer() { + JMenu mnEvaluer = new JMenu("Evaluer"); + mnEvaluer.add(new actEvalueTrue()); + mnEvaluer.add(new actEvalueFalse()); + return mnEvaluer; + } + + /** + * Menu Arbre.
+ * @return + */ + private JMenu mnArbre() { + JMenu mnManageTree = new JMenu("Arbre"); + mnManageTree.add(new actUpNode()); + mnManageTree.add(new actDownNode()); + mnManageTree.addSeparator(); + mnManageTree.add(new actExpandAll()); + mnManageTree.add(new actExpandNode()); + mnManageTree.addSeparator(); + mnManageTree.add(new actCollapseAll()); + mnManageTree.add(new actCollapseNode()); + return mnManageTree; + } + + /** + * Menu saut de ligne.
+ * @return + */ + private JMenu mnSaut() { + JMenu mnSaut = new JMenu("Saut de ligne avant"); + mnSaut.setIcon( new ImageIcon(create.class.getResource("/resources/sautmini.png"))); + mnSaut.add(new actsauttrue()); + mnSaut.add(new actsautfalse()); + return mnSaut; + } + + /** + * Menu saut de ligne pour les niveau 1.
+ * @return + */ + private JMenu mnSautNiveau1() { + JMenu mnSautNiveau1 = new JMenu("Saut de ligne avant"); + mnSautNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/sautmini.png"))); + mnSautNiveau1.add(new actsauttrue()); + mnSautNiveau1.add(new actsautfalse()); + return mnSautNiveau1; + } + + /** + * Menu Titre.
+ * @return + */ + private JMenu mnTitre() { + JMenu mnTitre = new JMenu("Titre"); + mnTitre.setIcon( new ImageIcon(create.class.getResource("/resources/titremini.png"))); + mnTitre.add(new actTitrePrincipal()); + mnTitre.add(new actTitre1()); + mnTitre.add(new actTitre2()); + mnTitre.add(new actTitre3()); + mnTitre.addSeparator(); + mnTitre.add(new actSupprimeTitre()); + return mnTitre; + } + + /** + * Menu Titre pour le niveau 1.
+ * @return + */ + private JMenu mnTitreNiveau1() { + JMenu mnTitreNiveau1 = new JMenu("Titre"); + mnTitreNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/titremini.png"))); + mnTitreNiveau1.add(new actTitrePrincipal()); + mnTitreNiveau1.add(new actTitre1()); + mnTitreNiveau1.add(new actTitre2()); + mnTitreNiveau1.add(new actTitre3()); + mnTitreNiveau1.addSeparator(); + mnTitreNiveau1.add(new actSupprimeTitre()); + return mnTitreNiveau1; + } + + /** + * Menu lien de menu vers les niveau 1.
+ * @return + */ + private JMenu mnAddMenuNiveau1() { + JMenu mnAddMenuNiveau1= new JMenu("Lien"); //addMenu + mnAddMenuNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/addmenumini.png"))); + mnAddMenuNiveau1.add(new actAddMenuTrue()); + mnAddMenuNiveau1.add(new actAddMenuFalse()); + return mnAddMenuNiveau1; + } + + /** + * Menu lien de menu vers les niveau supérieur à 1.
+ * @return + */ + private JMenu mnAddMenuNiveauSup1() { + JMenu mnAddMenuNiveauSup1= new JMenu("Lien"); //addMenu + mnAddMenuNiveauSup1.setIcon( new ImageIcon(create.class.getResource("/resources/addmenumini.png"))); + mnAddMenuNiveauSup1.add(new actAddMenuTrue()); + mnAddMenuNiveauSup1.add(new actAddMenuFalse()); + return mnAddMenuNiveauSup1; + } + + /** + * Menu rechercher par l'index.
+ * @return + */ + private JMenu mnRechercheIndex() { + 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; + } + + /** + * Menu rechercher par le contenu exact.
+ * Ignore la case et les epaces avant et après.
+ * @return + */ + private JMenu mnRechercheContenuExact() { + 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; + } + + /** + * Menu rechercher par le contenu du plus proche voisin.
+ * @return + */ + private JMenu mnRechercheContenuPlusProcheVoisin() { + 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; + } + + /** + * Menu analyseStyle.
+ * @return + */ + private JMenu mnAnalyseStyle() { + 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; + } + + /** + * Menu entête active.
+ * @return + */ + private JMenu mnevalEnteteActive() { + JMenu mnevalEnteteActive = new JMenu("Entête activé"); + mnevalEnteteActive.setIcon(new ImageIcon(create.class.getResource("/resources/enteteouimini.png"))); + mnevalEnteteActive.add(new actEvalEnteteActive()); + mnevalEnteteActive.add(new actEvalEnteteActiveNon()); + return mnevalEnteteActive; + } + + /** + * Menu ent^te pas active.
+ * @return + */ + private JMenu mnevalEntetePasActive() { + JMenu mnevalEntetePasActive = new JMenu("Entête pas activé"); + mnevalEntetePasActive.setIcon(new ImageIcon(create.class.getResource("/resources/entetenonmini.png"))); + mnevalEntetePasActive.add(new actEvalEntetePasActive()); + mnevalEntetePasActive.add(new actEvalEntetePasActiveNon()); + return mnevalEntetePasActive; + } + + /** + * Menu pied de page active.
+ * @return + */ + private JMenu mnEvalPiedPageActive() { + JMenu mnEvalPiedPageActive = new JMenu("Pied page activé"); + mnEvalPiedPageActive.setIcon(new ImageIcon(create.class.getResource("/resources/piedpageouimini.png"))); + mnEvalPiedPageActive.add(new actEvalPiedPageActive()); + mnEvalPiedPageActive.add(new actEvalPiedPageActiveNon()); + return mnEvalPiedPageActive; + } + + /** + * Menu pied de page pas active.
+ * @return + */ + private JMenu mnEvalPiedPagePasActive() { + JMenu mnEvalPiedPagePasActive = new JMenu("Pied page pas activé"); + mnEvalPiedPagePasActive.setIcon(new ImageIcon(create.class.getResource("/resources/piedpagenonmini.png"))); + mnEvalPiedPagePasActive.add(new actEvalPiedPagePasActive()); + mnEvalPiedPagePasActive.add(new actEvalPiedPagePasActiveNon()); + return mnEvalPiedPagePasActive; + } + + /** + * Menu évaluer le nom du node.
+ * Revient à évaluer la présence du node.
+ * @return + */ + private JMenu mnEvalNameNode() { + JMenu mnEvalNameNode = new JMenu("Evaluer la présence du node"); + mnEvalNameNode.setIcon(new ImageIcon(create.class.getResource("/resources/evalnodemini.png"))); + mnEvalNameNode.add(new actEvalNameNodeOui()); + mnEvalNameNode.add(new actEvalNameNodeNon()); + return mnEvalNameNode; + } + + /** + * Menu évaluer une variable de séquence.
+ * @return + */ + private JMenu mnEvalNameSequence() { + JMenu mnEvalNameSequence = new JMenu("Evaluer le nom de la séquence"); + mnEvalNameSequence.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamesequencemini.png"))); + mnEvalNameSequence.add(new actEvalNameSequenceOui()); + mnEvalNameSequence.add(new actEvalNameSequenceNon()); + return mnEvalNameSequence; + } + + /** + * Menu évaluer le nom de la page.
+ * @return + */ + private JMenu mnEvalNamePage() { + JMenu mnEvalNamePage = new JMenu("Evaluer le nom de la page"); + mnEvalNamePage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepagemini.png"))); + mnEvalNamePage.add(new actEvalNamePageOui()); + mnEvalNamePage.add(new actEvalNamePageNon()); + return mnEvalNamePage; + } + + /** + * Menu évaluer le numéro de la page.
+ * @return + */ + private JMenu mnEvalNumeroPage() { + JMenu mnEvalNumeroPage = new JMenu("Evaluer le numéro de la page"); + mnEvalNumeroPage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagemini.png"))); + mnEvalNumeroPage.add(new actEvalNumeroPageOui()); + mnEvalNumeroPage.add(new actEvalNumeroPageNon()); + return mnEvalNumeroPage; + } + + /* + * Menu évaluer le numéro absolu de la page.
+ */ + private JMenu mnEvalNumeroAbsoluePage() { + JMenu mnEvalNumeroAbsoluePage = new JMenu("Evaluer le numéro absolue de la page"); + mnEvalNumeroAbsoluePage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepagemini.png"))); + mnEvalNumeroAbsoluePage.add(new actEvalNumeroAbsoluePageOui()); + mnEvalNumeroAbsoluePage.add(new actEvalNumeroAbsoluePageNon()); + return mnEvalNumeroAbsoluePage; + } + + /** + * Evaluer la propriété personnalisé.
+ * @return + */ + private JMenu mnEvalTextUserDefined() { + JMenu mnEvalTextUserDefined = new JMenu("Evaluer la valeur de la propriété"); + mnEvalTextUserDefined.setIcon(new ImageIcon(create.class.getResource("/resources/evaltextuserdefinedmini.png"))); + mnEvalTextUserDefined.add(new actEvalTextUserDefinedOui()); + mnEvalTextUserDefined.add(new actEvalTextUserDefinedNon()); + return mnEvalTextUserDefined; + } + + /** + * Menu rechercher par le numéro de la page ancrer.
+ * Ce menu est utilisé pour les frames.
+ * @return + */ + private JMenu mnRechercheParNumeroPageAncrer() { + JMenu mnRechercheParNumeroPageAncrer = new JMenu("Recherche par le numéro de la page"); + mnRechercheParNumeroPageAncrer.setIcon(new ImageIcon(create.class.getResource("/resources/rechercheancragepagemini.png"))); + mnRechercheParNumeroPageAncrer.add( new actRechercheAnchorPageNumberTrue()); + mnRechercheParNumeroPageAncrer.addSeparator(); + mnRechercheParNumeroPageAncrer.add( new actRechercheAnchorPageNumberFalse()); + return mnRechercheParNumeroPageAncrer; + } + + /** + * Menu pour la représentation dans les feedbacks des étudiants.
+ * Ce menu apparaît dans tous nodes supérieur à 1.
+ * @return + */ + private JMenu mnPourFeedback() { + JMenu mnPourFeedback = new JMenu("Pour représentation feedback"); + mnPourFeedback.add(mnSaut()); + mnPourFeedback.addSeparator(); + mnPourFeedback.add(mnTitre()); + mnPourFeedback.addSeparator(); + mnPourFeedback.add(mnAddMenuNiveauSup1()); + return mnPourFeedback; + } + + /** + * Menu pour évaluer les tous les styles de paragraphe ou de titre.
+ * Ce menu apparaît uniquement dans le node page de la structurepage.
+ * @return + */ + private JMenu mnEvaluerStylesParagraphes() { + JMenu mnEvaluerStylesParagraphes = new JMenu("Evaluer tous les styles (paragraphes ou titres)."); + mnEvaluerStylesParagraphes.setIcon(new ImageIcon(create.class.getResource("/resources/evaluertouslesstylesparagraphesmini.png"))); + mnEvaluerStylesParagraphes.add( new actEvaluerTousLesStylesParagraphesTrue()); + return mnEvaluerStylesParagraphes; + } + + + /** + * Menu permettant insérer le node OU.
+ * Uniquement accésible pour les nodes avec recherche par contenu.
+ * @return + */ + private JMenu mnOu() { + JMenu mnOu = new JMenu("Insérer un node OU"); + mnOu.setIcon(new ImageIcon(create.class.getResource("/resources/oumini.png"))); + mnOu.add( new actOu()); + return mnOu; + } + + /** + * Menu respecter l'ordre des paragraphes.
+ * Vérification de l'ordre par le node précédent.
+ * @return + */ + private JMenu mnOrdreParagraphe() { + JMenu mnOrdreParagraphe = new JMenu("Ordre des paragraphes"); + mnOrdreParagraphe.setIcon(new ImageIcon(create.class.getResource("/resources/ordreparagraphemini.png"))); + mnOrdreParagraphe.add(new actEvalOrdreParagrapheOui()); + mnOrdreParagraphe.add(new actEvalOrdreParagrapheNon()); + return mnOrdreParagraphe; + } + + /** + * Menu pour la représentation des nodes de niveau 1.
+ * Permet de modifier le coefficient du node de niveua 1.
+ * @return + */ + private JMenu mnNiveau1 () { + JMenu mnNiveau1 = new JMenu("Pour représentation & coefficient"); + mnNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/attributanalysewritermini.png"))); + mnNiveau1.add(new actCoefficient()); + mnNiveau1.addSeparator(); + mnNiveau1.add(mnSautNiveau1()); + mnNiveau1.addSeparator(); + mnNiveau1.add(mnTitreNiveau1()); + mnNiveau1.addSeparator(); + mnNiveau1.add(mnAddMenuNiveau1()); + return mnNiveau1; + } + + /** + * Menu regroupant les menus permettant de recherche un node par son contenu textuel.
+ * Ce menu apparaît uniquement pour les node de la liste recherche par contenu.
+ * @return + */ + private JMenu mnGroupeRechercheContenu(node nod) { + JMenu mnGroupeRechercheContenu = new JMenu("Recherche le node"); + mnGroupeRechercheContenu.setIcon( new ImageIcon(create.class.getResource("/resources/recherchemini.png"))); + + if(listeDesNodesRechercheByContenu.isRechercheByContenu(nod)) { + mnGroupeRechercheContenu.add(mnRechercheContenuExact()); + mnGroupeRechercheContenu.addSeparator(); + mnGroupeRechercheContenu.add(mnRechercheContenuPlusProcheVoisin()); + mnGroupeRechercheContenu.addSeparator(); + mnGroupeRechercheContenu.add(mnRechercheIndex()); + } + if(listeRechercheParAnchorPageNumber.isRechercheParAnchorPageNumber(nod)) { + mnGroupeRechercheContenu.addSeparator(); + mnGroupeRechercheContenu.add(mnRechercheParNumeroPageAncrer()); + } + + return mnGroupeRechercheContenu; + } + + /** + * + * @param nod + * @return + */ + private JMenu mnGroupeMethodeEvaluer(node nod) { + JMenu mnGroupeMethodeEvaluer = new JMenu("Evaluer le node"); + mnGroupeMethodeEvaluer.setIcon( new ImageIcon(create.class.getResource("/resources/evaluatemini.png"))); + + if(listeDesNodesAnalyseStyle.isAnalyseStyle(nod)) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnAnalyseStyle()); + } + + if(listeEvalNameNode.isNodeEvalNameNode(nod)) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvalNameNode()); + } + + if(listeDesNodesAllContent.isAllContent(nod) ) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(new actAllContent()); + } + + if(listeDesNodesPourEvaluerPage.isPage(nod)) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvalNamePage()); + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvalNumeroPage()); + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvalNumeroAbsoluePage()); + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvaluerStylesParagraphes()); + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnOrdreParagraphe()); + } + + if(listeDesNodesPourEvaluationEntetePage.isEntete(nod)) { + mnGroupeMethodeEvaluer.add(mnevalEnteteActive()); + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnevalEntetePasActive()); + } + + if(listeDesNodesPourEvaluerPiedDePage.isPiedDePage(nod)) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvalPiedPageActive()); + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvalPiedPagePasActive()); + } + + if(nod.getNomElt().equals("meta:initial-creator")) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(new actEvalInitialCreator()); + } + if(nod.getNomElt().equals("dc:creator")) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(new actevalNameCreator()); + } + + if(nod.getNomElt().equals("text:sequence-decl")) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvalNameSequence()); + } + + if(nod.getNomElt().equals("text:user-defined") && nod.chemin().contains("structurepage")) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvalTextUserDefined()); + } + + + return mnGroupeMethodeEvaluer; + } + +} diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java index 1caf323..1c03738 100644 --- a/src/fenetres/evaluate.java +++ b/src/fenetres/evaluate.java @@ -19,7 +19,6 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; -import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -43,7 +42,6 @@ import fenetres.create_act.actDocumentation; import fenetres.create_act.actLicence; import fenetres.create_act.actTutoriels; import net.miginfocom.swing.MigLayout; -import fenetres.create_act.actLicence; public class evaluate extends JFrame { diff --git a/src/list/descriptionNode.java b/src/list/descriptionNode.java index 889d9d0..7b0bf95 100644 --- a/src/list/descriptionNode.java +++ b/src/list/descriptionNode.java @@ -103,6 +103,10 @@ public class descriptionNode { if(nameNode.equals("saut:automatique")) descriptionNode = descriptionNode + "

Ce node correspond au node \"text:soft-page-break\" sur Writer. Il indique un saut de page automatique." + "
C'est à dire qu'un node \"text:p\" (un paragraphe) a été scindé par un saut de page. Sur Writer les node \"text:soft-page-break\" sont des marqueurs de début de page mais ne peuvent pas contenir du texte, contrairement au node \"saut:automatique\".

"; + if(nameNode.equals("OU")) descriptionNode = descriptionNode + "

Ce node permet de réaliser une fonction logique OU.
" + + "Les nodes enfants correspondent à plusieurs possibilités laissé aux étudiants.
" + + "Le node enfant qui obtient le plus grand nombre de point est retenu comme réalisation de l'étudiant.

"; + //**************************************** diff --git a/src/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java b/src/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java index e1d6730..d84a7d9 100644 --- a/src/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java +++ b/src/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java @@ -7,11 +7,13 @@ public class listeAttributWriterPasEvaluableAvecCodeEvaluateur { } /** - * Liste des attributs Writer qui ne peuvent pas être évaluer par un code évaluateurs + * Liste des attributs Writer qui ne peuvent pas être évaluer par un code évaluateurs.
+ * * @param nameAttribut * @return */ public static boolean isEvaluable(String nameAttribut) { + if(nameAttribut.equals("style:name")) return true; if(nameAttribut.equals("style:page-layout-name")) return true; if(nameAttribut.equals("style:family")) return true; if(nameAttribut.equals("text:name")) return true; diff --git a/src/list/listeDesNodesAllContent.java b/src/list/listeDesNodesAllContent.java new file mode 100644 index 0000000..d13a116 --- /dev/null +++ b/src/list/listeDesNodesAllContent.java @@ -0,0 +1,20 @@ +package list; + +import cXML.node; + +public class listeDesNodesAllContent { + + public static boolean isAllContent(node nod) { + if(nod.retourneLesContenusEnfants("").length()<=0) return false; + if(nod.getNomElt().equals("OU")) return false; + + if(nod.getNomElt().equals("page")) return true; + if(nod.getNomElt().contains("text:")) return true; + + return true; + } + + + + +} diff --git a/src/list/listeDesNodesAnalyseStyle.java b/src/list/listeDesNodesAnalyseStyle.java new file mode 100644 index 0000000..067b9a7 --- /dev/null +++ b/src/list/listeDesNodesAnalyseStyle.java @@ -0,0 +1,17 @@ +package list; + +import cXML.node; + +public class listeDesNodesAnalyseStyle { + + /** + * Retourne TRUE si on peut utiliser la procédure analyseStyle.<:br> + * @param nod + * @return + */ + public static Boolean isAnalyseStyle(node nod) { + if(nod.getNomElt().contains("text:database-display")) return false; + if(nod.getNomElt().contains("text:")) return true; + return false; + } +} diff --git a/src/list/listeDesNodesAvecEvalNameNode.java b/src/list/listeDesNodesAvecEvalNameNode.java new file mode 100644 index 0000000..2d97432 --- /dev/null +++ b/src/list/listeDesNodesAvecEvalNameNode.java @@ -0,0 +1,19 @@ +package list; + +import cXML.node; + +public class listeDesNodesAvecEvalNameNode { + + /** + * Retourne TRUE si on peut utiliser la procédure evalNameNode.
+ * @param nod + * @return + */ + public static boolean isEvalNameNode(node nod) { + if(nod.getNomElt().contains("meta:")) return true; + if(nod.getNomElt().contains("dc:")) return true; + if(nod.getNomElt().contains("text:")) return true; + return false; + } + +} diff --git a/src/list/listeDesNodesAvecOU.java b/src/list/listeDesNodesAvecOU.java new file mode 100644 index 0000000..9e4c78e --- /dev/null +++ b/src/list/listeDesNodesAvecOU.java @@ -0,0 +1,16 @@ +package list; + +import cXML.node; + +public class listeDesNodesAvecOU { + + public static Boolean isOU(node nod) { + if(nod.getNomElt().equals("page")) return true; + if(nod.getNomElt().equals("text:p")) return true; + if(nod.getNomElt().equals("text:h")) return true; + if(nod.getNomElt().equals("text:list")) return true; + if(nod.getNomElt().equals("draw:frame")) return true; + return false; + } + +} diff --git a/src/list/listeDesNodesPourEvaluationEntetePage.java b/src/list/listeDesNodesPourEvaluationEntetePage.java new file mode 100644 index 0000000..c8ba945 --- /dev/null +++ b/src/list/listeDesNodesPourEvaluationEntetePage.java @@ -0,0 +1,14 @@ +package list; + +import cXML.node; + +public class listeDesNodesPourEvaluationEntetePage { + + + public static Boolean isEntete(node nod) { + + if(nod.getNomElt().equals("style:header-style")) return true; + return false; + } + +} diff --git a/src/list/listeDesNodesPourEvaluerPage.java b/src/list/listeDesNodesPourEvaluerPage.java new file mode 100644 index 0000000..dba98f9 --- /dev/null +++ b/src/list/listeDesNodesPourEvaluerPage.java @@ -0,0 +1,11 @@ +package list; + +import cXML.node; + +public class listeDesNodesPourEvaluerPage { + + public static Boolean isPage(node nod) { + if(nod.getNomElt().equals("page")) return true; + return false; + } +} diff --git a/src/list/listeDesNodesPourEvaluerPiedDePage.java b/src/list/listeDesNodesPourEvaluerPiedDePage.java new file mode 100644 index 0000000..4edc526 --- /dev/null +++ b/src/list/listeDesNodesPourEvaluerPiedDePage.java @@ -0,0 +1,12 @@ +package list; + +import cXML.node; + +public class listeDesNodesPourEvaluerPiedDePage { + + public static Boolean isPiedDePage(node nod) { + if(nod.getNomElt().equals("style:footer-style")) return true; + return false; + } + +} diff --git a/src/list/listeDesNodesRechercheByContenu.java b/src/list/listeDesNodesRechercheByContenu.java new file mode 100644 index 0000000..9545628 --- /dev/null +++ b/src/list/listeDesNodesRechercheByContenu.java @@ -0,0 +1,32 @@ +package list; + +import cXML.node; + +public class listeDesNodesRechercheByContenu { + + /** + * Retourne TRUE si on peut utiliser la recherche par contenu textuel.
+ * La rechercher par contenu se réalise par les méthodes suivantes:
+ * 1-Recherche par le contenu exact (ignore la case, et les espace au début et fin).
+ * 2-Recherche par le contenu du plus proche voisin.
+ * 3-Recherche par l'index;
+ * @param nod + * @return + */ + public static Boolean isRechercheByContenu(node nod) { + if(nod.getNomElt().contains("text:p")) return true; + if(nod.getNomElt().contains("text:line-break")) return true; + if(nod.getNomElt().contains("text:h")) return true; + if(nod.getNomElt().contains("text:span")) return true; + if(nod.getNomElt().equals("draw:text-box")) return true; + if(nod.getNomElt().equals("text:soft-page-break")) return true; + if(nod.getNomElt().contains("text:list")) return true; + if(nod.getNomElt().contains("text:section")) return true; + if(nod.getNomElt().equals("table:table-cell")) return true; + if(nod.getNomElt().equals("table:table-row")) return true; + if(nod.getNomElt().equals("draw:frame")) return true; + return false; + } + + +} diff --git a/src/list/listeDesNotesAEvaluer.java b/src/list/listeDesNotesAEvaluer.java new file mode 100644 index 0000000..bde80c2 --- /dev/null +++ b/src/list/listeDesNotesAEvaluer.java @@ -0,0 +1,17 @@ +package list; + +import cXML.node; + +public class listeDesNotesAEvaluer { + + + public static Boolean isAEvaluer(node nod) { + if(nod.getNomElt().equals("meta:initial-creator")) return true; + if(nod.getNomElt().equals("dc:creator")) return true; + if(nod.getNomElt().equals("text:sequence-decl")) return true; + if(nod.getNomElt().equals("text:user-defined")) return true; + + return false; + } + +} diff --git a/src/list/listeEvalNameNode.java b/src/list/listeEvalNameNode.java index a0896d6..20c61b4 100644 --- a/src/list/listeEvalNameNode.java +++ b/src/list/listeEvalNameNode.java @@ -10,12 +10,10 @@ public class listeEvalNameNode { * @return */ public static boolean isNodeEvalNameNode(node nod) { - if(nod.getNomElt().contains("meta:")) return true; if(nod.getNomElt().contains("dc:")) return true; if(nod.getNomElt().contains("text:")) return true; if(nod.getNomElt().contains("draw:")) return true; - return false; } diff --git a/src/list/listeNodeAnalyseWriter.java b/src/list/listeNodeAnalyseWriter.java index 6f1cdd2..8486d2e 100644 --- a/src/list/listeNodeAnalyseWriter.java +++ b/src/list/listeNodeAnalyseWriter.java @@ -34,6 +34,8 @@ public class listeNodeAnalyseWriter { if(nameNode.equals("translation")) return true; if(nameNode.equals("import_moodle")) return true; + if(nameNode.equals("import_moodle")) return true; + if(nameNode.equals("OU")) return true; return false; } diff --git a/src/resources/recherche.png b/src/resources/recherche.png new file mode 100644 index 0000000000000000000000000000000000000000..d5aa2129bd8fe9ed56154c52e9ab1880566fe3ac GIT binary patch literal 945 zcmV;i15W&jP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H113pPa zK~z|U&Dcwb990y?@n6+Mh|G*=f;u``XarFsfhfd<(HIbdkWChf;L4pl!G&NTvr~e& z(48CI7?otB5ky2VQGDP+jH0M<DB-c6UBFP~BbioqwHs z`_#QvM1(dfieds=u?aJnz{yS=kBAGcjB+R{-n(NA!Zd1IK!R zt`r|*=P;p*ZquVEibwGb)-`_m3ZLOL7I8JUU>l0$yhY66sc1X@`can(KW};E&fx&A z>oF>uupeg{*S?B!sM7;aG?E_0HLcCqh$9V;r-ufO-B?JHy@+*v8&ayKRto+=c4$@m z`Z7uK_8`Csc%kYzwck&;G&l6aNrE%Da?Qp}<5c4NSZ?TJiTS>4<~)-4exA|SM*PTjEYj{rHoJnD5mh`%y&vsp>$rcI5CaF`In;I)`aP-z3MgE1uPd zO4U=X)-O3s8#*{I zs(hd2i>BMMjbM`G*(AX^+`b0jn^jw|+V7QIz)k4OEMMvUj@<(Q--Y?a=Vxpf3Unvo z^{Td1C%k~?a8(P~D^xq2e;d7H?Zj$Og0!OLp_Uv0?m#`}H1euTZr_1o(a*vg3oP6pA5 zLowj)sOu|)ri!B2j6K+;+Ie5A+M@l6?>jg4PDC8Mtp zLAnN)Eb?Ab;b!z*@linU>j7LxUvqpE(38Q@7T~QbK78mQfR6?`Gx+GB`vX7R3w*TD znZQR6odJA2&}#%AAM_f)#|u3m`1qj*0B^Nm8i|Tx8gHrIE%wrr~n)KCw T_pqLG00000NkvXXu0mjf5$x2j literal 0 HcmV?d00001 diff --git a/src/resources/recherchemini.png b/src/resources/recherchemini.png new file mode 100644 index 0000000000000000000000000000000000000000..70f467ad74eff8571837a910d2996f7886773923 GIT binary patch literal 527 zcmV+q0`UEbP)3@y}k=A_h4wU=VGzw}}vJgj8xHULk0$SX7t49#LnY!CcHwIb@9PE@ z5mj!eT?+VwnUvCGNkU4gjSfDR0($B-?Up3ql=`xJg?c;j0dLV6alyN@_C0nqc?Vro zc!_-*6yJ|G>J2*6=%M8T=hfS>id#5|!x?@XKXSanYjlD=#efW%#UuRAo%X%LeH_F& zR14e*)`H{3fC11nj^Z?qVR|tBoa;ek{~4TU1Q_Wo4glhRlZ*?P40=P5btf4Q&;T+% zpb)Y-Kmla)fDw?b0o0JG;OP)#Y3l(0AkT8~Kf&1)QS=RzTS`;7h{qyU{sPNc2fyA* RV0Zuk002ovPDHLkV1iJE