diff --git a/.classpath b/.classpath index 033eb86..869a31d 100644 --- a/.classpath +++ b/.classpath @@ -12,6 +12,6 @@ - + diff --git a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java b/Menu/menucontextuel/MnGroupeMethodeEvaluer.java index 2282e3b..673437e 100644 --- a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java +++ b/Menu/menucontextuel/MnGroupeMethodeEvaluer.java @@ -9,7 +9,6 @@ import action.actevalNameCreator; import cXML.node; import fenetres.create; import list.listeDesNodesAllContent; -import list.listeDesNodesAnalyseSpan; import list.listeDesNodesAnalyseStyle; import list.listeDesNodesAncrable; import list.listeDesNodesEvalPlacement; @@ -19,7 +18,6 @@ import list.listeDesNodesPourEvaluerPage; import list.listeDesNodesPourEvaluerPiedDePage; import list.listeDesNodesTabStop; import list.listeEvalNameNode; -import sousmenuEvaluation.mnAnalyseSpan; import sousmenuEvaluation.mnAnalyseStyle; import sousmenuEvaluation.mnEvalAncrageNumeroAbsoluPage; import sousmenuEvaluation.mnEvalEnteteActive; @@ -96,12 +94,6 @@ public class MnGroupeMethodeEvaluer { mnGroupeMethodeEvaluer.add(mnEvalNameLegacyStyle.menu()); } - // Pour la méthode analyseStyle et evalNameLegacyStyle - if(listeDesNodesAnalyseSpan.isAnalyseSpan(nod)) { - mnGroupeMethodeEvaluer.addSeparator(); - mnGroupeMethodeEvaluer.add(mnAnalyseSpan.menu()); - } - // Pour la méthode evalPlacement, evalLastChild, evalFirstChild if(listeDesNodesEvalPlacement.isPlacement(nod)) { mnGroupeMethodeEvaluer.addSeparator(); diff --git a/Menu/sousmenuEvaluation/mnAnalyseSpan.java b/Menu/sousmenuEvaluation/mnAnalyseSpan.java deleted file mode 100644 index 328d152..0000000 --- a/Menu/sousmenuEvaluation/mnAnalyseSpan.java +++ /dev/null @@ -1,24 +0,0 @@ -package sousmenuEvaluation; - -import javax.swing.ImageIcon; -import javax.swing.JMenu; - -import action.actEvaluerStyleFalse; -import action.actEvaluerStyleTrue; -import fenetres.create; - -/** - * Menu analyseStyle.
- * @author pabr6 - * - */ -public class mnAnalyseSpan{ - - public static JMenu menu() { - JMenu mnAnalyseStyle = new JMenu("Evaluer le formatage direct"); - mnAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerspanmini.png"))); - mnAnalyseStyle.add(new actEvaluerStyleTrue()); - mnAnalyseStyle.add( new actEvaluerStyleFalse()); - return mnAnalyseStyle; - } -} diff --git a/Menu/sousmenuEvaluation/mnAnalyseStyle.java b/Menu/sousmenuEvaluation/mnAnalyseStyle.java index ef8c855..8bec18a 100644 --- a/Menu/sousmenuEvaluation/mnAnalyseStyle.java +++ b/Menu/sousmenuEvaluation/mnAnalyseStyle.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvaluerStyleFalse; import action.actEvaluerStyleTrue; import fenetres.create; @@ -18,7 +17,6 @@ public class mnAnalyseStyle{ JMenu mnAnalyseStyle = new JMenu("Evaluer le style appliqué"); mnAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstylemini.png"))); mnAnalyseStyle.add(new actEvaluerStyleTrue()); - mnAnalyseStyle.add( new actEvaluerStyleFalse()); return mnAnalyseStyle; } } diff --git a/Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java b/Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java index 301215d..5e3d1c6 100644 --- a/Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java +++ b/Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalAncrageNumeroAbsoluePageNon; import action.actEvalAncrageNumeroAbsoluePageOui; import fenetres.create; @@ -18,7 +17,6 @@ public class mnEvalAncrageNumeroAbsoluPage{ JMenu mnEvalAncrageNumeroAbsoluPageAncrage = new JMenu("Numéro absolue de la page"); mnEvalAncrageNumeroAbsoluPageAncrage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropageancragemini.png"))); mnEvalAncrageNumeroAbsoluPageAncrage.add(new actEvalAncrageNumeroAbsoluePageOui()); - mnEvalAncrageNumeroAbsoluPageAncrage.add(new actEvalAncrageNumeroAbsoluePageNon()); return mnEvalAncrageNumeroAbsoluPageAncrage; } } diff --git a/Menu/sousmenuEvaluation/mnEvalEnteteActive.java b/Menu/sousmenuEvaluation/mnEvalEnteteActive.java index 7691590..2e5ce6a 100644 --- a/Menu/sousmenuEvaluation/mnEvalEnteteActive.java +++ b/Menu/sousmenuEvaluation/mnEvalEnteteActive.java @@ -4,7 +4,6 @@ import javax.swing.ImageIcon; import javax.swing.JMenu; import action.actEvalEnteteActive; -import action.actEvalEnteteActiveNon; import fenetres.create; /** @@ -18,7 +17,6 @@ public class 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; } diff --git a/Menu/sousmenuEvaluation/mnEvalEntetePasActive.java b/Menu/sousmenuEvaluation/mnEvalEntetePasActive.java index 3c384fe..bcf7783 100644 --- a/Menu/sousmenuEvaluation/mnEvalEntetePasActive.java +++ b/Menu/sousmenuEvaluation/mnEvalEntetePasActive.java @@ -4,7 +4,6 @@ import javax.swing.ImageIcon; import javax.swing.JMenu; import action.actEvalEntetePasActive; -import action.actEvalEntetePasActiveNon; import fenetres.create; /** @@ -18,7 +17,6 @@ public class 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; } diff --git a/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java b/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java index 1cab353..418cd81 100644 --- a/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java +++ b/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalFormatageDirectNon; import action.actEvalFormatageDirectOui; import fenetres.create; @@ -18,9 +17,8 @@ public class mnEvalFormatageDirect{ public static JMenu menu() { JMenu mnEvalFormatageDirect = new JMenu("Evaluer l'absence ou la présence du formatage direct"); - mnEvalFormatageDirect.setIcon( new ImageIcon(create.class.getResource("/resources/evalformatagedirectmini.png"))); + mnEvalFormatageDirect.setIcon( new ImageIcon(create.class.getResource("/resources/sautpagecolonnemini.png"))); mnEvalFormatageDirect.add(new actEvalFormatageDirectOui()); - mnEvalFormatageDirect.add(new actEvalFormatageDirectNon()); return mnEvalFormatageDirect; } } diff --git a/Menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java b/Menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java index fa531b1..7d5bf4d 100644 --- a/Menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java +++ b/Menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvaluerNomDuStyleHeriteFalse; import action.actEvaluerNomDuStyleHeriteTrue; import fenetres.create; @@ -19,7 +18,6 @@ public class mnEvalNameLegacyStyle{ JMenu mnEvalNameLegacyStyle = new JMenu("Evaluer le nom du style hérité"); mnEvalNameLegacyStyle.setIcon( new ImageIcon(create.class.getResource("/resources/heritagestylemini.png"))); mnEvalNameLegacyStyle.add(new actEvaluerNomDuStyleHeriteTrue()); - mnEvalNameLegacyStyle.add( new actEvaluerNomDuStyleHeriteFalse()); return mnEvalNameLegacyStyle; } } diff --git a/Menu/sousmenuEvaluation/mnEvalNameNode.java b/Menu/sousmenuEvaluation/mnEvalNameNode.java index d580319..55dab89 100644 --- a/Menu/sousmenuEvaluation/mnEvalNameNode.java +++ b/Menu/sousmenuEvaluation/mnEvalNameNode.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalNameNodeNon; import action.actEvalNameNodeOui; import fenetres.create; @@ -20,7 +19,6 @@ public class 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; } } diff --git a/Menu/sousmenuEvaluation/mnEvalNamePage.java b/Menu/sousmenuEvaluation/mnEvalNamePage.java index db661d7..1b75d3a 100644 --- a/Menu/sousmenuEvaluation/mnEvalNamePage.java +++ b/Menu/sousmenuEvaluation/mnEvalNamePage.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalNamePageNon; import action.actEvalNamePageOui; import fenetres.create; @@ -18,7 +17,6 @@ public class mnEvalNamePage{ JMenu mnEvalNamePage = new JMenu("Evaluer le nom du style de la page"); mnEvalNamePage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepagemini.png"))); mnEvalNamePage.add(new actEvalNamePageOui()); - mnEvalNamePage.add(new actEvalNamePageNon()); return mnEvalNamePage; } diff --git a/Menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java b/Menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java index 6048b29..9e86f65 100644 --- a/Menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java +++ b/Menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalNumeroAbsoluePageNon; import action.actEvalNumeroAbsoluePageOui; import fenetres.create; @@ -18,7 +17,6 @@ public class 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; } diff --git a/Menu/sousmenuEvaluation/mnEvalNumeroPage.java b/Menu/sousmenuEvaluation/mnEvalNumeroPage.java index 3fc41b6..d289767 100644 --- a/Menu/sousmenuEvaluation/mnEvalNumeroPage.java +++ b/Menu/sousmenuEvaluation/mnEvalNumeroPage.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalNumeroPageNon; import action.actEvalNumeroPageOui; import fenetres.create; @@ -18,7 +17,6 @@ public class mnEvalNumeroPage{ JMenu mnEvalNumeroPage = new JMenu("Evaluer la pagination (num. de la page)"); mnEvalNumeroPage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagemini.png"))); mnEvalNumeroPage.add(new actEvalNumeroPageOui()); - mnEvalNumeroPage.add(new actEvalNumeroPageNon()); return mnEvalNumeroPage; } diff --git a/Menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java b/Menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java index bacb529..67c300c 100644 --- a/Menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java +++ b/Menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalPasParagrapheVideNon; import action.actEvalPasParagrapheVideOui; import fenetres.create; @@ -19,7 +18,6 @@ public class mnEvalPasParagrapheVide{ JMenu mnEvalPasParagrapheVide = new JMenu("Evaluer l'absence de paragraphe vide dans la page"); mnEvalPasParagrapheVide.setIcon( new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidemini.png"))); mnEvalPasParagrapheVide.add(new actEvalPasParagrapheVideOui()); - mnEvalPasParagrapheVide.add(new actEvalPasParagrapheVideNon()); return mnEvalPasParagrapheVide; } } diff --git a/Menu/sousmenuEvaluation/mnEvalPiedPageActive.java b/Menu/sousmenuEvaluation/mnEvalPiedPageActive.java index 7a2be5e..599ab3f 100644 --- a/Menu/sousmenuEvaluation/mnEvalPiedPageActive.java +++ b/Menu/sousmenuEvaluation/mnEvalPiedPageActive.java @@ -4,7 +4,6 @@ import javax.swing.ImageIcon; import javax.swing.JMenu; import action.actEvalPiedPageActive; -import action.actEvalPiedPageActiveNon; import fenetres.create; /** @@ -18,7 +17,6 @@ public class 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; } diff --git a/Menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java b/Menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java index dc2e656..2a3b169 100644 --- a/Menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java +++ b/Menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java @@ -4,7 +4,6 @@ import javax.swing.ImageIcon; import javax.swing.JMenu; import action.actEvalPiedPagePasActive; -import action.actEvalPiedPagePasActiveNon; import fenetres.create; /** @@ -18,7 +17,6 @@ public class 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; } diff --git a/Menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java b/Menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java index 46f7106..0df37c6 100644 --- a/Menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java +++ b/Menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalPlacementParagrapheNon; import action.actEvalPlacementParagrapheOui; import fenetres.create; @@ -19,7 +18,6 @@ public class mnEvalPlacementParagraphe{ JMenu mnPlacementParagraphe = new JMenu("Placement des paragraphes (evaluation du ¶ avant)"); mnPlacementParagraphe.setIcon(new ImageIcon(create.class.getResource("/resources/ordreparagraphemini.png"))); mnPlacementParagraphe.add(new actEvalPlacementParagrapheOui()); - mnPlacementParagraphe.add(new actEvalPlacementParagrapheNon()); return mnPlacementParagraphe; } } diff --git a/Menu/sousmenuEvaluation/mnEvalSautPageColonne.java b/Menu/sousmenuEvaluation/mnEvalSautPageColonne.java index 2a306ab..c73afa7 100644 --- a/Menu/sousmenuEvaluation/mnEvalSautPageColonne.java +++ b/Menu/sousmenuEvaluation/mnEvalSautPageColonne.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalSautPageColonneNon; import action.actEvalSautPageColonneOui; import fenetres.create; @@ -18,7 +17,6 @@ public class mnEvalSautPageColonne{ JMenu mnEvalSautPageColonne = new JMenu("Evaluer le saut de page ou de colonne"); mnEvalSautPageColonne.setIcon( new ImageIcon(create.class.getResource("/resources/sautpagecolonnemini.png"))); mnEvalSautPageColonne.add(new actEvalSautPageColonneOui()); - mnEvalSautPageColonne.add( new actEvalSautPageColonneNon()); return mnEvalSautPageColonne; } diff --git a/Menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java b/Menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java index 7056029..dc0c810 100644 --- a/Menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java +++ b/Menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalTabAlignementGaucheNon; import action.actEvalTabAlignementGaucheOui; import fenetres.create; @@ -12,7 +11,6 @@ public class mnEvalTabAlignementGauche { JMenu mnEvalTabAlignementGauche= new JMenu("Evaluer l'agniment à gauche d'une tab."); mnEvalTabAlignementGauche.setIcon(new ImageIcon(create.class.getResource("/resources/evaltabalgngauchemini.png"))); mnEvalTabAlignementGauche.add(new actEvalTabAlignementGaucheOui()); - mnEvalTabAlignementGauche.add(new actEvalTabAlignementGaucheNon()); return mnEvalTabAlignementGauche; } } diff --git a/Menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java b/Menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java index 46d92bc..16ad1b2 100644 --- a/Menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java +++ b/Menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalTabDefautStyleLeaderNon; import action.actEvalTabDefautStyleLeaderOui; import fenetres.create; @@ -12,7 +11,6 @@ public class mnEvalTabDefautStyleLeader { JMenu mnEvalTabAlignementGauche= new JMenu("Evaluer les caractères par défaut de remplissage d'une tab."); mnEvalTabAlignementGauche.setIcon(new ImageIcon(create.class.getResource("/resources/evaltabstyleleadermini.png"))); mnEvalTabAlignementGauche.add(new actEvalTabDefautStyleLeaderOui()); - mnEvalTabAlignementGauche.add(new actEvalTabDefautStyleLeaderNon()); return mnEvalTabAlignementGauche; } } diff --git a/Menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java b/Menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java index 1fd95b9..3eb30c2 100644 --- a/Menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java +++ b/Menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvaluerATraversAnalyseStyleFalse; import action.actEvaluerATraversAnalyseStyleTrue; import fenetres.create; @@ -18,7 +17,6 @@ public class mnEvaluerATraversAnalyseStyle{ JMenu mnEvaluerATraversAnalyseStyle = new JMenu("Evaluer le style dans la structure"); mnEvaluerATraversAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestylemini.png"))); mnEvaluerATraversAnalyseStyle.add(new actEvaluerATraversAnalyseStyleTrue()); - mnEvaluerATraversAnalyseStyle.add( new actEvaluerATraversAnalyseStyleFalse()); return mnEvaluerATraversAnalyseStyle; } diff --git a/Menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java b/Menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java index 3d591f5..6915c58 100644 --- a/Menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java +++ b/Menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalLastChildFalse; import action.actEvalLastChildTrue; import fenetres.create; @@ -18,7 +17,6 @@ public class mnEvaluerDernierEnfant{ JMenu mnEvaluerDernierEnfant = new JMenu("Le node est le dernier enfant"); mnEvaluerDernierEnfant.setIcon(new ImageIcon(create.class.getResource("/resources/dernierenfantmini.png"))); mnEvaluerDernierEnfant.add(new actEvalLastChildTrue()); - mnEvaluerDernierEnfant.add(new actEvalLastChildFalse()); return mnEvaluerDernierEnfant; } } diff --git a/Menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java b/Menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java index d70942f..986afe3 100644 --- a/Menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java +++ b/Menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java @@ -3,7 +3,6 @@ package sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import action.actEvalFirstChildFalse; import action.actEvalFirstChildTrue; import fenetres.create; @@ -18,7 +17,6 @@ public class mnEvaluerPremierEnfant{ JMenu mnEvaluerPremierEnfant = new JMenu("Le node est le premier enfant"); mnEvaluerPremierEnfant.setIcon(new ImageIcon(create.class.getResource("/resources/premierenfantmini.png"))); mnEvaluerPremierEnfant.add(new actEvalFirstChildTrue()); - mnEvaluerPremierEnfant.add(new actEvalFirstChildFalse()); return mnEvaluerPremierEnfant; } diff --git a/bin/.gitignore b/bin/.gitignore index 64465bd..067a124 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -536,3 +536,7 @@ /supprimeAttribut.png /supprimeAttribut.svg /supprimeAttributmini.png +/atraversanalysestylefalse.png +/atraversanalysestylefalsemini.png +/atraversanalysestyletrue.png +/atraversanalysestyletruemini.png diff --git a/bin/dernierenfant.png b/bin/dernierenfant.png index ce03155..8db441c 100644 Binary files a/bin/dernierenfant.png and b/bin/dernierenfant.png differ diff --git a/bin/dernierenfant.svg b/bin/dernierenfant.svg index af14322..1c9b7e3 100644 --- a/bin/dernierenfant.svg +++ b/bin/dernierenfant.svg @@ -9,9 +9,9 @@ id="svg5" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="dernierenfant.svg" - inkscape:export-filename="evalLastChildfalse.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96" + inkscape:export-filename="dernierenfantmini.png" + inkscape:export-xdpi="51.200001" + inkscape:export-ydpi="51.200001" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -27,15 +27,15 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" showgrid="false" - inkscape:zoom="15.822222" - inkscape:cx="22.531601" - inkscape:cy="62.001404" + inkscape:zoom="15.720805" + inkscape:cx="22.486125" + inkscape:cy="22.51793" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer1" + inkscape:current-layer="g2" showguides="true"> + transform="matrix(1.7342069,0,0,1.7428036,-0.40462457,1.9761108)" /> Z + style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Heavy';fill:#ff0000;stroke-width:0.34686" + x="2.4835956" + y="8.9485664">ω diff --git a/bin/evalnodefalse.png b/bin/evalnodefalse.png deleted file mode 100644 index f523d12..0000000 Binary files a/bin/evalnodefalse.png and /dev/null differ diff --git a/bin/evalnodefalsemini.png b/bin/evalnodefalsemini.png deleted file mode 100644 index b45734a..0000000 Binary files a/bin/evalnodefalsemini.png and /dev/null differ diff --git a/bin/evalnodemini.png b/bin/evalnodemini.png index 35776fd..22f355d 100644 Binary files a/bin/evalnodemini.png and b/bin/evalnodemini.png differ diff --git a/bin/evalnodetrue.png b/bin/evalnodetrue.png deleted file mode 100644 index 6cb569b..0000000 Binary files a/bin/evalnodetrue.png and /dev/null differ diff --git a/bin/evalnodetruemini.png b/bin/evalnodetruemini.png deleted file mode 100644 index acb5ca9..0000000 Binary files a/bin/evalnodetruemini.png and /dev/null differ diff --git a/bin/resources/actEvalEnteteActivefalse.png b/bin/resources/actEvalEnteteActivefalse.png deleted file mode 100644 index 36307a4..0000000 Binary files a/bin/resources/actEvalEnteteActivefalse.png and /dev/null differ diff --git a/bin/resources/actEvalEnteteActivefalsemini.png b/bin/resources/actEvalEnteteActivefalsemini.png deleted file mode 100644 index af3295e..0000000 Binary files a/bin/resources/actEvalEnteteActivefalsemini.png and /dev/null differ diff --git a/bin/resources/actEvalEnteteActivetrue.png b/bin/resources/actEvalEnteteActivetrue.png deleted file mode 100644 index c445ec1..0000000 Binary files a/bin/resources/actEvalEnteteActivetrue.png and /dev/null differ diff --git a/bin/resources/actEvalEnteteActivetruemini.png b/bin/resources/actEvalEnteteActivetruemini.png deleted file mode 100644 index 34f5cdb..0000000 Binary files a/bin/resources/actEvalEnteteActivetruemini.png and /dev/null differ diff --git a/bin/resources/actEvalEntetePasActivefalse.png b/bin/resources/actEvalEntetePasActivefalse.png deleted file mode 100644 index c3574f3..0000000 Binary files a/bin/resources/actEvalEntetePasActivefalse.png and /dev/null differ diff --git a/bin/resources/actEvalEntetePasActivefalsemini.png b/bin/resources/actEvalEntetePasActivefalsemini.png deleted file mode 100644 index 297879f..0000000 Binary files a/bin/resources/actEvalEntetePasActivefalsemini.png and /dev/null differ diff --git a/bin/resources/actEvalEntetePasActivetrue.png b/bin/resources/actEvalEntetePasActivetrue.png deleted file mode 100644 index 065d1ff..0000000 Binary files a/bin/resources/actEvalEntetePasActivetrue.png and /dev/null differ diff --git a/bin/resources/actEvalEntetePasActivetruemini.png b/bin/resources/actEvalEntetePasActivetruemini.png deleted file mode 100644 index 283f4b8..0000000 Binary files a/bin/resources/actEvalEntetePasActivetruemini.png and /dev/null differ diff --git a/bin/resources/dernierenfant.png b/bin/resources/dernierenfant.png index ce03155..8db441c 100644 Binary files a/bin/resources/dernierenfant.png and b/bin/resources/dernierenfant.png differ diff --git a/bin/resources/dernierenfantmini.png b/bin/resources/dernierenfantmini.png index 6580c0e..d2a6139 100644 Binary files a/bin/resources/dernierenfantmini.png and b/bin/resources/dernierenfantmini.png differ diff --git a/bin/resources/evalFirstChildfalse.png b/bin/resources/evalFirstChildfalse.png deleted file mode 100644 index 98a0c8b..0000000 Binary files a/bin/resources/evalFirstChildfalse.png and /dev/null differ diff --git a/bin/resources/evalFirstChildfalsemini.png b/bin/resources/evalFirstChildfalsemini.png deleted file mode 100644 index 32fb2de..0000000 Binary files a/bin/resources/evalFirstChildfalsemini.png and /dev/null differ diff --git a/bin/resources/evalFirstChildtrue.png b/bin/resources/evalFirstChildtrue.png deleted file mode 100644 index 9af1829..0000000 Binary files a/bin/resources/evalFirstChildtrue.png and /dev/null differ diff --git a/bin/resources/evalFirstChildtruemini.png b/bin/resources/evalFirstChildtruemini.png deleted file mode 100644 index 4b8e83a..0000000 Binary files a/bin/resources/evalFirstChildtruemini.png and /dev/null differ diff --git a/bin/resources/evalLastChildfalse.png b/bin/resources/evalLastChildfalse.png deleted file mode 100644 index f6ac558..0000000 Binary files a/bin/resources/evalLastChildfalse.png and /dev/null differ diff --git a/bin/resources/evalLastChildfalsemini.png b/bin/resources/evalLastChildfalsemini.png deleted file mode 100644 index 2d94b3d..0000000 Binary files a/bin/resources/evalLastChildfalsemini.png and /dev/null differ diff --git a/bin/resources/evalLastChildtrue.png b/bin/resources/evalLastChildtrue.png deleted file mode 100644 index d810078..0000000 Binary files a/bin/resources/evalLastChildtrue.png and /dev/null differ diff --git a/bin/resources/evalLastChildtruemini.png b/bin/resources/evalLastChildtruemini.png deleted file mode 100644 index a8b09a4..0000000 Binary files a/bin/resources/evalLastChildtruemini.png and /dev/null differ diff --git a/bin/resources/evalformatagedirectfalse.png b/bin/resources/evalformatagedirectfalse.png deleted file mode 100644 index 369369a..0000000 Binary files a/bin/resources/evalformatagedirectfalse.png and /dev/null differ diff --git a/bin/resources/evalformatagedirectfalsemini.png b/bin/resources/evalformatagedirectfalsemini.png deleted file mode 100644 index 4c559e8..0000000 Binary files a/bin/resources/evalformatagedirectfalsemini.png and /dev/null differ diff --git a/bin/resources/evalformatagedirecttrue.png b/bin/resources/evalformatagedirecttrue.png deleted file mode 100644 index 36ce2c7..0000000 Binary files a/bin/resources/evalformatagedirecttrue.png and /dev/null differ diff --git a/bin/resources/evalformatagedirecttruemini.png b/bin/resources/evalformatagedirecttruemini.png deleted file mode 100644 index 926424b..0000000 Binary files a/bin/resources/evalformatagedirecttruemini.png and /dev/null differ diff --git a/bin/resources/evalnamepagefalse.png b/bin/resources/evalnamepagefalse.png deleted file mode 100644 index e3f22ae..0000000 Binary files a/bin/resources/evalnamepagefalse.png and /dev/null differ diff --git a/bin/resources/evalnamepagefalsemini.png b/bin/resources/evalnamepagefalsemini.png deleted file mode 100644 index 643e898..0000000 Binary files a/bin/resources/evalnamepagefalsemini.png and /dev/null differ diff --git a/bin/resources/evalnamepagetrue.png b/bin/resources/evalnamepagetrue.png deleted file mode 100644 index faa836b..0000000 Binary files a/bin/resources/evalnamepagetrue.png and /dev/null differ diff --git a/bin/resources/evalnamepagetruemini.png b/bin/resources/evalnamepagetruemini.png deleted file mode 100644 index a379a46..0000000 Binary files a/bin/resources/evalnamepagetruemini.png and /dev/null differ diff --git a/bin/resources/evalnodefalse.png b/bin/resources/evalnodefalse.png deleted file mode 100644 index f523d12..0000000 Binary files a/bin/resources/evalnodefalse.png and /dev/null differ diff --git a/bin/resources/evalnodefalsemini.png b/bin/resources/evalnodefalsemini.png deleted file mode 100644 index b45734a..0000000 Binary files a/bin/resources/evalnodefalsemini.png and /dev/null differ diff --git a/bin/resources/evalnodemini.png b/bin/resources/evalnodemini.png index 35776fd..22f355d 100644 Binary files a/bin/resources/evalnodemini.png and b/bin/resources/evalnodemini.png differ diff --git a/bin/resources/evalnodetrue.png b/bin/resources/evalnodetrue.png deleted file mode 100644 index 6cb569b..0000000 Binary files a/bin/resources/evalnodetrue.png and /dev/null differ diff --git a/bin/resources/evalnodetruemini.png b/bin/resources/evalnodetruemini.png deleted file mode 100644 index acb5ca9..0000000 Binary files a/bin/resources/evalnodetruemini.png and /dev/null differ diff --git a/bin/resources/evalnumeroabsoluepagefalse.png b/bin/resources/evalnumeroabsoluepagefalse.png deleted file mode 100644 index 16cb8e1..0000000 Binary files a/bin/resources/evalnumeroabsoluepagefalse.png and /dev/null differ diff --git a/bin/resources/evalnumeroabsoluepagefalsemini.png b/bin/resources/evalnumeroabsoluepagefalsemini.png deleted file mode 100644 index 5ec0dc6..0000000 Binary files a/bin/resources/evalnumeroabsoluepagefalsemini.png and /dev/null differ diff --git a/bin/resources/evalnumeroabsoluepagetrue.png b/bin/resources/evalnumeroabsoluepagetrue.png deleted file mode 100644 index 0989d16..0000000 Binary files a/bin/resources/evalnumeroabsoluepagetrue.png and /dev/null differ diff --git a/bin/resources/evalnumeroabsoluepagetruemini.png b/bin/resources/evalnumeroabsoluepagetruemini.png deleted file mode 100644 index 94b0ade..0000000 Binary files a/bin/resources/evalnumeroabsoluepagetruemini.png and /dev/null differ diff --git a/bin/resources/evalnumeropageancragefalse.png b/bin/resources/evalnumeropageancragefalse.png deleted file mode 100644 index 06ff5de..0000000 Binary files a/bin/resources/evalnumeropageancragefalse.png and /dev/null differ diff --git a/bin/resources/evalnumeropageancragefalsemini.png b/bin/resources/evalnumeropageancragefalsemini.png deleted file mode 100644 index be80433..0000000 Binary files a/bin/resources/evalnumeropageancragefalsemini.png and /dev/null differ diff --git a/bin/resources/evalnumeropageancragetrue.png b/bin/resources/evalnumeropageancragetrue.png deleted file mode 100644 index 8c9ebb3..0000000 Binary files a/bin/resources/evalnumeropageancragetrue.png and /dev/null differ diff --git a/bin/resources/evalnumeropageancragetruemini.gng b/bin/resources/evalnumeropageancragetruemini.gng deleted file mode 100644 index 2835ece..0000000 Binary files a/bin/resources/evalnumeropageancragetruemini.gng and /dev/null differ diff --git a/bin/resources/evalnumeropagefalse.png b/bin/resources/evalnumeropagefalse.png deleted file mode 100644 index 46c3f50..0000000 Binary files a/bin/resources/evalnumeropagefalse.png and /dev/null differ diff --git a/bin/resources/evalnumeropagefalsemini.png b/bin/resources/evalnumeropagefalsemini.png deleted file mode 100644 index b8fd380..0000000 Binary files a/bin/resources/evalnumeropagefalsemini.png and /dev/null differ diff --git a/bin/resources/evalnumeropagetrue.png b/bin/resources/evalnumeropagetrue.png deleted file mode 100644 index 58ddf62..0000000 Binary files a/bin/resources/evalnumeropagetrue.png and /dev/null differ diff --git a/bin/resources/evalnumeropagetruemini.png b/bin/resources/evalnumeropagetruemini.png deleted file mode 100644 index bba6b30..0000000 Binary files a/bin/resources/evalnumeropagetruemini.png and /dev/null differ diff --git a/bin/resources/evalpasparagraphevidefalse.png b/bin/resources/evalpasparagraphevidefalse.png deleted file mode 100644 index 6193003..0000000 Binary files a/bin/resources/evalpasparagraphevidefalse.png and /dev/null differ diff --git a/bin/resources/evalpasparagraphevidefalsemini.png b/bin/resources/evalpasparagraphevidefalsemini.png deleted file mode 100644 index 311752b..0000000 Binary files a/bin/resources/evalpasparagraphevidefalsemini.png and /dev/null differ diff --git a/bin/resources/evalpasparagraphevidetrue.png b/bin/resources/evalpasparagraphevidetrue.png deleted file mode 100644 index fc65743..0000000 Binary files a/bin/resources/evalpasparagraphevidetrue.png and /dev/null differ diff --git a/bin/resources/evalpasparagraphevidetruemini.png b/bin/resources/evalpasparagraphevidetruemini.png deleted file mode 100644 index 9d976b7..0000000 Binary files a/bin/resources/evalpasparagraphevidetruemini.png and /dev/null differ diff --git a/bin/resources/evalplacementparagraphefalse.png b/bin/resources/evalplacementparagraphefalse.png deleted file mode 100644 index 0e618fc..0000000 Binary files a/bin/resources/evalplacementparagraphefalse.png and /dev/null differ diff --git a/bin/resources/evalplacementparagraphefalsemini.png b/bin/resources/evalplacementparagraphefalsemini.png deleted file mode 100644 index aea3a33..0000000 Binary files a/bin/resources/evalplacementparagraphefalsemini.png and /dev/null differ diff --git a/bin/resources/evalplacementparagraphetrue.png b/bin/resources/evalplacementparagraphetrue.png deleted file mode 100644 index cd59b59..0000000 Binary files a/bin/resources/evalplacementparagraphetrue.png and /dev/null differ diff --git a/bin/resources/evalplacementparagraphetruemini.png b/bin/resources/evalplacementparagraphetruemini.png deleted file mode 100644 index a67a78c..0000000 Binary files a/bin/resources/evalplacementparagraphetruemini.png and /dev/null differ diff --git a/bin/resources/evaluerspan.png b/bin/resources/evaluerspan.png deleted file mode 100644 index b301bb5..0000000 Binary files a/bin/resources/evaluerspan.png and /dev/null differ diff --git a/bin/resources/evaluerstylefalse.png b/bin/resources/evaluerstylefalse.png deleted file mode 100644 index 81a46dd..0000000 Binary files a/bin/resources/evaluerstylefalse.png and /dev/null differ diff --git a/bin/resources/evaluerstylefalsemini.png b/bin/resources/evaluerstylefalsemini.png deleted file mode 100644 index df052e3..0000000 Binary files a/bin/resources/evaluerstylefalsemini.png and /dev/null differ diff --git a/bin/resources/evaluerstyletrue.png b/bin/resources/evaluerstyletrue.png deleted file mode 100644 index 0b07670..0000000 Binary files a/bin/resources/evaluerstyletrue.png and /dev/null differ diff --git a/bin/resources/evaluerstyletruemini.png b/bin/resources/evaluerstyletruemini.png deleted file mode 100644 index 2275ddf..0000000 Binary files a/bin/resources/evaluerstyletruemini.png and /dev/null differ diff --git a/bin/resources/heritagestylefalse.png b/bin/resources/heritagestylefalse.png deleted file mode 100644 index 260d254..0000000 Binary files a/bin/resources/heritagestylefalse.png and /dev/null differ diff --git a/bin/resources/heritagestylefalsemini.png b/bin/resources/heritagestylefalsemini.png deleted file mode 100644 index 230958f..0000000 Binary files a/bin/resources/heritagestylefalsemini.png and /dev/null differ diff --git a/bin/resources/heritagestyletrue.png b/bin/resources/heritagestyletrue.png deleted file mode 100644 index a6a1114..0000000 Binary files a/bin/resources/heritagestyletrue.png and /dev/null differ diff --git a/bin/resources/heritagestyletruemini.png b/bin/resources/heritagestyletruemini.png deleted file mode 100644 index 6482a84..0000000 Binary files a/bin/resources/heritagestyletruemini.png and /dev/null differ diff --git a/bin/resources/premierenfant.png b/bin/resources/premierenfant.png index 641b2ad..37fec37 100644 Binary files a/bin/resources/premierenfant.png and b/bin/resources/premierenfant.png differ diff --git a/bin/resources/premierenfantmini.png b/bin/resources/premierenfantmini.png index df96977..eefeacd 100644 Binary files a/bin/resources/premierenfantmini.png and b/bin/resources/premierenfantmini.png differ diff --git a/bin/resources/sautpagecolonnefalse.png b/bin/resources/sautpagecolonnefalse.png deleted file mode 100644 index c0f3e3a..0000000 Binary files a/bin/resources/sautpagecolonnefalse.png and /dev/null differ diff --git a/bin/resources/sautpagecolonnefalsemini.png b/bin/resources/sautpagecolonnefalsemini.png deleted file mode 100644 index 6b01cd5..0000000 Binary files a/bin/resources/sautpagecolonnefalsemini.png and /dev/null differ diff --git a/bin/resources/sautpagecolonnetrue.png b/bin/resources/sautpagecolonnetrue.png deleted file mode 100644 index 021e4f6..0000000 Binary files a/bin/resources/sautpagecolonnetrue.png and /dev/null differ diff --git a/bin/resources/sautpagecolonnetruemini.png b/bin/resources/sautpagecolonnetruemini.png deleted file mode 100644 index 35d5e82..0000000 Binary files a/bin/resources/sautpagecolonnetruemini.png and /dev/null differ diff --git a/icons/dernierenfant.png b/icons/dernierenfant.png index ce03155..8db441c 100644 Binary files a/icons/dernierenfant.png and b/icons/dernierenfant.png differ diff --git a/icons/dernierenfant.svg b/icons/dernierenfant.svg index af14322..1c9b7e3 100644 --- a/icons/dernierenfant.svg +++ b/icons/dernierenfant.svg @@ -9,9 +9,9 @@ id="svg5" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="dernierenfant.svg" - inkscape:export-filename="evalLastChildfalse.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96" + inkscape:export-filename="dernierenfantmini.png" + inkscape:export-xdpi="51.200001" + inkscape:export-ydpi="51.200001" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -27,15 +27,15 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" showgrid="false" - inkscape:zoom="15.822222" - inkscape:cx="22.531601" - inkscape:cy="62.001404" + inkscape:zoom="15.720805" + inkscape:cx="22.486125" + inkscape:cy="22.51793" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer1" + inkscape:current-layer="g2" showguides="true"> + transform="matrix(1.7342069,0,0,1.7428036,-0.40462457,1.9761108)" /> Z + style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Heavy';fill:#ff0000;stroke-width:0.34686" + x="2.4835956" + y="8.9485664">ω diff --git a/icons/evalnodefalse.png b/icons/evalnodefalse.png deleted file mode 100644 index f523d12..0000000 Binary files a/icons/evalnodefalse.png and /dev/null differ diff --git a/icons/evalnodefalsemini.png b/icons/evalnodefalsemini.png deleted file mode 100644 index b45734a..0000000 Binary files a/icons/evalnodefalsemini.png and /dev/null differ diff --git a/icons/evalnodemini.png b/icons/evalnodemini.png index 35776fd..22f355d 100644 Binary files a/icons/evalnodemini.png and b/icons/evalnodemini.png differ diff --git a/icons/evalnodetrue.png b/icons/evalnodetrue.png deleted file mode 100644 index 6cb569b..0000000 Binary files a/icons/evalnodetrue.png and /dev/null differ diff --git a/icons/evalnodetruemini.png b/icons/evalnodetruemini.png deleted file mode 100644 index acb5ca9..0000000 Binary files a/icons/evalnodetruemini.png and /dev/null differ diff --git a/icons/premierenfant.png b/icons/premierenfant.png index 641b2ad..37fec37 100644 Binary files a/icons/premierenfant.png and b/icons/premierenfant.png differ diff --git a/icons/premierenfant.svg b/icons/premierenfant.svg index 857e3a3..8a603cd 100644 --- a/icons/premierenfant.svg +++ b/icons/premierenfant.svg @@ -9,9 +9,9 @@ id="svg5" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="premierenfant.svg" - inkscape:export-filename="premierenfant.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96" + inkscape:export-filename="premierenfantmini.png" + inkscape:export-xdpi="51.200001" + inkscape:export-ydpi="51.200001" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -27,15 +27,16 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" showgrid="false" - inkscape:zoom="14.345196" - inkscape:cx="14.534483" - inkscape:cy="53.04912" - inkscape:window-width="1920" - inkscape:window-height="1009" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" - inkscape:current-layer="layer1" /> + inkscape:zoom="15.527517" + inkscape:cx="22.476228" + inkscape:cy="22.444027" + inkscape:window-width="958" + inkscape:window-height="1000" + inkscape:window-x="-7" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="g1" + showguides="false" /> + transform="matrix(1.7342069,0,0,1.7428036,-0.40462457,1.8018208)" /> A + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Bold';fill:#ff0000;stroke-width:0.459829" + x="2.7997386" + y="9.6002226">α Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalAncrageNumeroAbsoluePage a été supprimé."); - }else { - nod.getAttributs().put("evalAncrageNumeroAbsoluePage", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalAncrageNumeroAbsoluePage", + "

Si le node dans le fichier de l'étudiant est ancré dans la même page
" + + "(en valeur absolue), alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalAncrageNumeroAbsoluePage", + new ImageIcon(create.class.getResource("/resources/evalnumeropageancrage.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } - } diff --git a/src/action/actEvalEnteteActive.java b/src/action/actEvalEnteteActive.java index 5b031eb..e12f7c7 100644 --- a/src/action/actEvalEnteteActive.java +++ b/src/action/actEvalEnteteActive.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalEnteteActive extends AbstractAction{ @@ -20,33 +19,18 @@ public class actEvalEnteteActive extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer l'activation de l'en-tête." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/actEvalEnteteActivetruemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/enteteouimini.png"))); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalEnteteActive")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalEnteteActive")); - } - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalEnteteActive"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalEnteteActive a été supprimé.

"); - }else { - nod.getAttributs().put("evalEnteteActive", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } - - fenetres.create.getTextNodeSelect().refreshAffichage(nod); + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalEnteteActive", + "

Si ce node dans le fichier de l'étudiant contient le node
" + + "style:header-footer-properties (en-tête activé),
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalEnteteActive", + new ImageIcon(create.class.getResource("/resources/enteteoui.png"))); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } - } diff --git a/src/action/actEvalEnteteActiveNon.java b/src/action/actEvalEnteteActiveNon.java deleted file mode 100644 index 6dc98f9..0000000 --- a/src/action/actEvalEnteteActiveNon.java +++ /dev/null @@ -1,30 +0,0 @@ -package action; - -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{ - - /** - * - */ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Supprime evaluation de l'activation de l'en-tête." ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'activation de l'en-tête." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/actEvalEnteteActivefalsemini.png"))); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalEnteteActive"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalEntetePasActive.java b/src/action/actEvalEntetePasActive.java index 9ccae4e..f7b0216 100644 --- a/src/action/actEvalEntetePasActive.java +++ b/src/action/actEvalEntetePasActive.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalEntetePasActive extends AbstractAction{ @@ -20,31 +19,18 @@ public class actEvalEntetePasActive extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer la non activation de l'en-tête." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/actEvalEntetePasActivetruemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/entetenonmini.png"))); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalEntetePasActive")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalEntetePasActive")); - } - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalEntetePasActive"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalEntetePasActive a été supprimé.

"); - }else { - nod.getAttributs().put("evalEntetePasActive", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalEntetePasActive", + "

Si ce node dans le fichier de l'étudiant ne contient pas le node
" + + "style:header-footer-properties (en-tête désactivé),
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalEntetePasActive", + new ImageIcon(create.class.getResource("/resources/entetenon.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalEntetePasActiveNon.java b/src/action/actEvalEntetePasActiveNon.java deleted file mode 100644 index d972a98..0000000 --- a/src/action/actEvalEntetePasActiveNon.java +++ /dev/null @@ -1,30 +0,0 @@ -package action; - -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{ - - /** - * - */ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Supprime l'évaluation de la non activation de l'en-tête." ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la non activation de l'en-tête." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/actEvalEntetePasActivefalsemini.png"))); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalEntetePasActive"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalFirstChildFalse.java b/src/action/actEvalFirstChildFalse.java deleted file mode 100644 index fdade6b..0000000 --- a/src/action/actEvalFirstChildFalse.java +++ /dev/null @@ -1,33 +0,0 @@ -package action; - -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 actEvalFirstChildFalse extends AbstractAction{ - { - putValue( Action.NAME, "Supprimer évaluer le node est le premier enfant." ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du premier enfant." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalFirstChildfalsemini.png"))); - } - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - if(listeDesNodesEvalPlacement.isPlacement(nod)) { - nod.getAttributs().put("evalFirstChild", "0"); - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalFirstChildTrue.java b/src/action/actEvalFirstChildTrue.java index fed2a86..985cba5 100644 --- a/src/action/actEvalFirstChildTrue.java +++ b/src/action/actEvalFirstChildTrue.java @@ -5,18 +5,16 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; -import list.listeDesNodesEvalPlacement; public class actEvalFirstChildTrue extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer si le node est le premier enfant."); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalFirstChildtruemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/premierenfantmini.png"))); } /** * @@ -26,29 +24,12 @@ public class actEvalFirstChildTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalFirstChild")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalFirstChild")); - } - String a=""; - a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalFirstChild a été supprimé.

"); - if(listeDesNodesEvalPlacement.isPlacement(nod)) { - nod.supprimeAttribut("evalFirstChild"); - } - }else { - nod.getAttributs().put("evalFirstChild", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalFirstChild", + "

Si ce node est le premier node dans le fichier de l'étudiant alors
" + + "l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalFirstChild", + new ImageIcon(create.class.getResource("/resources/premierenfant.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalFormatageDirectNon.java b/src/action/actEvalFormatageDirectNon.java deleted file mode 100644 index 0624256..0000000 --- a/src/action/actEvalFormatageDirectNon.java +++ /dev/null @@ -1,31 +0,0 @@ -package action; - -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 actEvalFormatageDirectNon extends AbstractAction{ - { - putValue( Action.NAME, "Supprime évaluer l'absence ou la présence du formatage direct" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime évaluer l'absence ou la présence du formatage direct." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalformatagedirectfalsemini.png")) ); - } - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalFormatageDirect"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - - } - -} diff --git a/src/action/actEvalFormatageDirectOui.java b/src/action/actEvalFormatageDirectOui.java index 53e04a9..35bf98d 100644 --- a/src/action/actEvalFormatageDirectOui.java +++ b/src/action/actEvalFormatageDirectOui.java @@ -5,17 +5,16 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalFormatageDirectOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence ou l'absence du formatage direct." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalformatagedirecttruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/sautpagecolonnemini.png")) ); } /** * @@ -25,29 +24,15 @@ public class actEvalFormatageDirectOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalFormatageDirect")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalFormatageDirect")); - } - String a = ""; - a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalFormatageDirect"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalFormatageDirect a été supprimé.

"); - }else { - nod.getAttributs().put("evalFormatageDirect", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalFormatageDirect", + "

Si le node dans le fichier de l'étudiant par comparaison avec
" + + "ce node, contient une surcharge des formats de paragraphe
" + + "et/ou de caractères (style:name=Px), ou ne contient pas
" + + "une surcharge alors l'étudiant aura les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalFormatageDirect", + new ImageIcon(create.class.getResource("/resources/evalformatagedirect.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } } diff --git a/src/action/actEvalLastChildFalse.java b/src/action/actEvalLastChildFalse.java deleted file mode 100644 index e8410f3..0000000 --- a/src/action/actEvalLastChildFalse.java +++ /dev/null @@ -1,33 +0,0 @@ -package action; - -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 actEvalLastChildFalse extends AbstractAction{ - { - putValue( Action.NAME, "Supprimer évaluer le node est le dernier enfant." ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du dernier enfant." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalLastChildfalsemini.png"))); - } - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - if(listeDesNodesEvalPlacement.isPlacement(nod)) { - nod.getAttributs().put("evalLastChild", "0"); - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalLastChildTrue.java b/src/action/actEvalLastChildTrue.java index 87a5b65..1037d2b 100644 --- a/src/action/actEvalLastChildTrue.java +++ b/src/action/actEvalLastChildTrue.java @@ -5,18 +5,16 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; -import list.listeDesNodesEvalPlacement; public class actEvalLastChildTrue extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer si le node est le dernier enfant."); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalLastChildtruemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/dernierenfantmini.png"))); } /** * @@ -26,30 +24,12 @@ public class actEvalLastChildTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalLastChild")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalLastChild")); - } - String a=""; - a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalLastChild a été supprimé.

"); - if(listeDesNodesEvalPlacement.isPlacement(nod)) { - nod.supprimeAttribut("evalLastChild"); - } - }else { - nod.getAttributs().put("evalLastChild", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalLastChild", + "

Si ce node est le dernier node dans le fichier de l'étudiant alors
" + + "l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalLastChild", + new ImageIcon(create.class.getResource("/resources/dernierenfant.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalNameNodeNon.java b/src/action/actEvalNameNodeNon.java deleted file mode 100644 index 5bc4d7a..0000000 --- a/src/action/actEvalNameNodeNon.java +++ /dev/null @@ -1,30 +0,0 @@ -package action; - -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{ - - /** - * - */ - 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.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnodefalsemini.png")) ); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalNameNode"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalNameNodeOui.java b/src/action/actEvalNameNodeOui.java index 05b1c4e..b531bca 100644 --- a/src/action/actEvalNameNodeOui.java +++ b/src/action/actEvalNameNodeOui.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalNameNodeOui extends AbstractAction{ @@ -20,33 +19,17 @@ public class actEvalNameNodeOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence de ce node." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnodetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnodemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalNameNode")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalNameNode")); - } - - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalNameNode"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalNameNode a été supprimé.

"); - }else { - nod.getAttributs().put("evalNameNode", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalNameNode", + "

Si ce node est présent dans le fichier de l'étudiant alors
" + + "l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalNameNode", + new ImageIcon(create.class.getResource("/resources/evalnode.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalNamePageNon.java b/src/action/actEvalNamePageNon.java deleted file mode 100644 index 827347d..0000000 --- a/src/action/actEvalNamePageNon.java +++ /dev/null @@ -1,35 +0,0 @@ -package action; - -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{ - - /** - * - */ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Supprime évaluer le nom du style de la page" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du nom du style de la page." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnamepagefalsemini.png")) ); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - if(nod.getNomElt().equals("page")) nod.getAttributs().remove("evalNamePage"); - if(nod.getNomElt().equals("structurepage")) { - for(int i = 0 ; i < nod.getNodes().size();i++) { - nod.getNodes().get(i).getAttributs().remove("evalNamePage"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalNamePageOui.java b/src/action/actEvalNamePageOui.java index 46f0c2b..fca814e 100644 --- a/src/action/actEvalNamePageOui.java +++ b/src/action/actEvalNamePageOui.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePointpourNumeroPageEtStructure; import fenetres.create; public class actEvalNamePageOui extends AbstractAction{ @@ -20,51 +19,23 @@ public class actEvalNamePageOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer le nom du style de la page" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnamepagetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnamepagemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalNamePage")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalNamePage")); - } - String a=""; - a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()) { - - try { - point = Integer.valueOf(a); - if(point<=0) { - if(nod.getNomElt().equals("page")) nod.supprimeAttribut("evalNamePage"); - if(nod.getNomElt().equals("structurepage")) ajouteAToutesLesPages(nod,0); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut a été supprimé.
evalNamePage=0.

"); - }else { - if(nod.getNomElt().equals("page")) nod.getAttributs().put("evalNamePage", String.valueOf(point)); - if(nod.getNomElt().equals("structurepage")) ajouteAToutesLesPages(nod,point); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - - } + CustomInputDialogSimplePointpourNumeroPageEtStructure.showCustominputDialog(nod,"evalNamePage", + "

Si le node \"page\" dans le fichier de l'étudiant est du
" + + "même style de page (même nom de la page) que ce node,
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + +"

Cochez sur la case sur \"Sur toutes les pages\" pour insérer
" + +"ou supprimer la méthode sur toutes les pages.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalNamePage", + new ImageIcon(create.class.getResource("/resources/evalnamepage.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - - - private void ajouteAToutesLesPages(node nod,Integer point) { - for(int i=0; i < nod.getNodes().size();i++) { - if(point>0) { - nod.getNodes().get(i).getAttributs().put("evalNamePage", String.valueOf(point)); - }else { - nod.getNodes().get(i).supprimeAttribut("evalNamePage"); - } } - } - -} + } diff --git a/src/action/actEvalNumeroAbsoluePageNon.java b/src/action/actEvalNumeroAbsoluePageNon.java deleted file mode 100644 index fab391b..0000000 --- a/src/action/actEvalNumeroAbsoluePageNon.java +++ /dev/null @@ -1,34 +0,0 @@ -package action; - -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{ - - /** - * - */ - 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.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepagefalsemini.png")) ); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - if(nod.getNomElt().equals("page")) nod.getAttributs().remove("evalNumeroAbsoluePage"); - if(nod.getNomElt().equals("structurepage")) { - for(int i = 0 ; i < nod.getNodes().size();i++) { - nod.getNodes().get(i).getAttributs().remove("evalNumeroAbsoluePage"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } -} diff --git a/src/action/actEvalNumeroAbsoluePageOui.java b/src/action/actEvalNumeroAbsoluePageOui.java index d8d993d..57a01c8 100644 --- a/src/action/actEvalNumeroAbsoluePageOui.java +++ b/src/action/actEvalNumeroAbsoluePageOui.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePointpourNumeroPageEtStructure; import fenetres.create; public class actEvalNumeroAbsoluePageOui extends AbstractAction{ @@ -20,45 +19,20 @@ public class actEvalNumeroAbsoluePageOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); 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/evalnumeroabsoluepagetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepagemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalNumeroAbsoluePage")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalNumeroAbsoluePage")); - } - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()){ - try { - point = Integer.valueOf(a); - if(point<=0) { - if(nod.getNomElt().equals("page")) nod.supprimeAttribut("evalNumeroAbsoluePage"); - if(nod.getNomElt().equals("structurepage")) ajouteAToutesLesPages(nod,0); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalNumeroAbsoluePage a été supprimé.

"); - }else { - if(nod.getNomElt().equals("page")) nod.getAttributs().put("evalNumeroAbsoluePage", String.valueOf(point)); - if(nod.getNomElt().equals("structurepage")) ajouteAToutesLesPages(nod,point); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - - private void ajouteAToutesLesPages(node nod,Integer point) { - for(int i=0; i < nod.getNodes().size();i++) { - if(point>0) { - nod.getNodes().get(i).getAttributs().put("evalNumeroAbsoluePage", String.valueOf(point)); - }else { - nod.getNodes().get(i).supprimeAttribut("evalNumeroAbsoluePage"); - } + CustomInputDialogSimplePointpourNumeroPageEtStructure.showCustominputDialog(nod,"evalNumeroAbsoluePage", + "

Si le node \"page\" dans le fichier de l'étudiant est situé
" + + "au même numéro de page absolue que ce node de page,
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + +"

Cochez sur la case sur \"Sur toutes les pages\" pour insérer
" + +"ou supprimer la méthode sur toutes les pages.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalNumeroAbsoluePage", + new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepage.png"))); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } - -} diff --git a/src/action/actEvalNumeroPageNon.java b/src/action/actEvalNumeroPageNon.java deleted file mode 100644 index b1433c0..0000000 --- a/src/action/actEvalNumeroPageNon.java +++ /dev/null @@ -1,34 +0,0 @@ -package action; - -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{ - - /** - * - */ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Supprime évaluer le numéro de la page" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la pagination (num. page)." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeropagefalsemini.png")) ); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - if(nod.getNomElt().equals("page")) nod.getAttributs().remove("evalNumeroPage"); - if(nod.getNomElt().equals("structurepage")) { - for(int i = 0 ; i < nod.getNodes().size();i++) { - nod.getNodes().get(i).getAttributs().remove("evalNumeroPage"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); } - -} diff --git a/src/action/actEvalNumeroPageOui.java b/src/action/actEvalNumeroPageOui.java index 297d289..37ca65c 100644 --- a/src/action/actEvalNumeroPageOui.java +++ b/src/action/actEvalNumeroPageOui.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePointpourNumeroPageEtStructure; import fenetres.create; public class actEvalNumeroPageOui extends AbstractAction{ @@ -20,46 +19,20 @@ public class actEvalNumeroPageOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer la pagination (num. page)" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeropagetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeropagemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalNumeroPage")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalNumeroPage")); - } - String a = ""; - a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - if(nod.getNomElt().equals("page")) nod.supprimeAttribut("evalNumeroPage"); - if(nod.getNomElt().equals("structurepage")) ajouteAToutesLesPages(nod,0); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalNumeroPage a été supprimé.

"); - }else { - if(nod.getNomElt().equals("page")) nod.getAttributs().put("evalNumeroPage", String.valueOf(point)); - if(nod.getNomElt().equals("structurepage")) ajouteAToutesLesPages(nod,point); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePointpourNumeroPageEtStructure.showCustominputDialog(nod,"evalNumeroPage", + "

Si le node \"page\" dans le fichier de l'étudiant est situé
" + + "au même numéro de la pagination que ce node de page,
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + +"

Cochez sur la case sur \"Sur toutes les pages\" pour insérer
" + +"ou supprimer la méthode sur toutes les pages.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalNumeroPage", + new ImageIcon(create.class.getResource("/resources/evalnumeropage.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); - - } - - private void ajouteAToutesLesPages(node nod,Integer point) { - for(int i=0; i < nod.getNodes().size();i++) { - if(point>0) { - nod.getNodes().get(i).getAttributs().put("evalNumeroPage", String.valueOf(point)); - }else { - nod.getNodes().get(i).supprimeAttribut("evalNumeroPage"); - } } } - -} diff --git a/src/action/actEvalPasParagrapheVideNon.java b/src/action/actEvalPasParagrapheVideNon.java deleted file mode 100644 index a3ba52c..0000000 --- a/src/action/actEvalPasParagrapheVideNon.java +++ /dev/null @@ -1,30 +0,0 @@ -package action; - -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 actEvalPasParagrapheVideNon extends AbstractAction{ - { - putValue( Action.NAME, "Supprime l'évaluation de l'absence de paragraphe vide dans la page." ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'absence de paragraphe vide dans la page." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidefalsemini.png")) ); - } - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalPasParagrapheVide"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalPasParagrapheVideOui.java b/src/action/actEvalPasParagrapheVideOui.java index 81c86d5..0b887f5 100644 --- a/src/action/actEvalPasParagrapheVideOui.java +++ b/src/action/actEvalPasParagrapheVideOui.java @@ -5,17 +5,16 @@ 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.CustomInputDialogSimplePointpourNumeroPageEtStructure; import fenetres.create; public class actEvalPasParagrapheVideOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer l'absence de paragraphe vide" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidemini.png")) ); } /** * @@ -25,29 +24,15 @@ public class actEvalPasParagrapheVideOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalPasParagrapheVide")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalPasParagrapheVide")); - } - String a =""; - a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalPasParagrapheVide"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉEIEUR à zéro.
Cependant,l'attribut evalPasParagrapheVide a été supprimé.

"); - }else { - nod.getAttributs().put("evalPasParagrapheVide", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - + CustomInputDialogSimplePointpourNumeroPageEtStructure.showCustominputDialog(nod,"evalPasParagrapheVide", + "

Si ce node, dans le fichier de l'étudiant, ne contient pas
" + + "de paragraphe vide (text:p sans contenu), alors l'étudiant
" + + "obtiendra les points ci-dessous.


" + +"

Cochez sur la case sur \"Sur toutes les pages\" pour insérer
" + +"ou supprimer la méthode sur toutes les pages.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalPasParagrapheVide", + new ImageIcon(create.class.getResource("/resources/evalpasparagraphevide.png"))); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } - } diff --git a/src/action/actEvalPiedPageActive.java b/src/action/actEvalPiedPageActive.java index 9fb5b32..c747081 100644 --- a/src/action/actEvalPiedPageActive.java +++ b/src/action/actEvalPiedPageActive.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalPiedPageActive extends AbstractAction{ @@ -20,32 +19,19 @@ public class actEvalPiedPageActive extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer l'activation du pied de page" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalPiedPageActivetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/piedpageouimini.png")) ); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalPiedPageActive")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalPiedPageActive")); - } - String Nombre = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(Nombre!=null)if(!Nombre.isBlank()) { - try { - point = Integer.valueOf(Nombre); - if(point<=0) { - nod.getAttributs().put("evalPiedPageActive", String.valueOf(0)); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalPiedPageActive=0.

"); - }else { - nod.getAttributs().put("evalPiedPageActive", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalPiedPageActive", + "

Si ce node dans le fichier de l'étudiant ne contient pas le node
" + + "style:header-footer-properties (pied de page désactivé),
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalPiedPageActive", + new ImageIcon(create.class.getResource("/resources/piedpageoui.png"))); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalPiedPageActiveNon.java b/src/action/actEvalPiedPageActiveNon.java deleted file mode 100644 index bbb4ef1..0000000 --- a/src/action/actEvalPiedPageActiveNon.java +++ /dev/null @@ -1,31 +0,0 @@ -package action; - -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{ - - /** - * - */ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Supprime pied page active" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'activation du pied de page." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalPiedPageActivefalsemini.png")) ); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalPiedPageActive"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalPiedPagePasActive.java b/src/action/actEvalPiedPagePasActive.java index 10e9555..b2371aa 100644 --- a/src/action/actEvalPiedPagePasActive.java +++ b/src/action/actEvalPiedPagePasActive.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalPiedPagePasActive extends AbstractAction{ @@ -20,32 +19,19 @@ public class actEvalPiedPagePasActive extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer la non activation du pied de page" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalPiedPagePasActivetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/piedpagenonmini.png")) ); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalPiedPagePasActive")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalPiedPagePasActive")); - } - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()){ - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalPiedPagePasActive"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalPiedPagePasActive a été supprimé.

"); - }else { - nod.getAttributs().put("evalPiedPagePasActive", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalPiedPagePasActive", + "

Si ce node dans le fichier de l'étudiant contient le node
" + + "style:header-footer-properties (pied de page activé),
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalPiedPagePasActive", + new ImageIcon(create.class.getResource("/resources/piedpagenon.png"))); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalPiedPagePasActiveNon.java b/src/action/actEvalPiedPagePasActiveNon.java deleted file mode 100644 index c3a9b52..0000000 --- a/src/action/actEvalPiedPagePasActiveNon.java +++ /dev/null @@ -1,30 +0,0 @@ -package action; - -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{ - - /** - * - */ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Supprime pied page pas active" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la non activation du pied de page." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalPiedPagePasActivefalsemini.png"))); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalPiedPagePasActive"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalPlacementParagrapheNon.java b/src/action/actEvalPlacementParagrapheNon.java deleted file mode 100644 index 451945c..0000000 --- a/src/action/actEvalPlacementParagrapheNon.java +++ /dev/null @@ -1,44 +0,0 @@ -package action; - -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{ - - /** - * - */ - 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 node" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalplacementparagraphefalsemini.png"))); - } - @Override - public void actionPerformed(ActionEvent e) { - - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - - - if(nod.getNomElt().equals("page")) { - for(int i =0 ; i < nod.getNodes().size(); i++) { - if(listeDesNodesEvalPlacement.isPlacement(nod.getNodes().get(i))) { - nod.getNodes().get(i).getAttributs().put("evalPlacement", "0"); - } - } - }else { - nod.getAttributs().put("evalPlacement", "0"); - } - - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - - } - -} diff --git a/src/action/actEvalPlacementParagrapheOui.java b/src/action/actEvalPlacementParagrapheOui.java index 8d180b6..3c3f607 100644 --- a/src/action/actEvalPlacementParagrapheOui.java +++ b/src/action/actEvalPlacementParagrapheOui.java @@ -5,12 +5,10 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; -import list.listeDesNodesEvalPlacement; public class actEvalPlacementParagrapheOui extends AbstractAction{ @@ -21,52 +19,18 @@ public class actEvalPlacementParagrapheOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer le placement du node"); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalplacementparagraphetruemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/ordreparagraphemini.png"))); } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalPlacement")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalPlacement")); - } - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()){ - try { - point = Integer.valueOf(a); - if(point<=0) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalPlacement a été supprimé.

"); - if(nod.getNomElt().equals("page")) { - for(int i =0 ; i < nod.getNodes().size(); i++) { - if(listeDesNodesEvalPlacement.isPlacement(nod.getNodes().get(i))) { - nod.getNodes().get(i).supprimeAttribut("evalPlacement"); - } - } - }else { - nod.supprimeAttribut("evalPlacement"); - } - }else { - if(nod.getNomElt().equals("page")) { - for(int i =0 ; i < nod.getNodes().size(); i++) { - if(listeDesNodesEvalPlacement.isPlacement(nod.getNodes().get(i))) { - nod.getNodes().get(i).getAttributs().put("evalPlacement", String.valueOf(point)); - } - } - }else { - nod.getAttributs().put("evalPlacement", String.valueOf(point)); - } - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } - - - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalPlacement", + "

Si ce node dans le fichier de l'étudiant est placé juste après le
" + + "node précédent de ce node, alors l'étudiant obtiendra les points
" + + "ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalPlacement", + new ImageIcon(create.class.getResource("/resources/ordreparagraphe.png"))); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } - } diff --git a/src/action/actEvalSautPageColonneNon.java b/src/action/actEvalSautPageColonneNon.java deleted file mode 100644 index e7f7aa2..0000000 --- a/src/action/actEvalSautPageColonneNon.java +++ /dev/null @@ -1,29 +0,0 @@ -package action; - -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 actEvalSautPageColonneNon extends AbstractAction{ - { - putValue( Action.NAME, "Supprime l'évaluation du saut dans le paragraphe" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du saut dans le paragraphe." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/sautpagecolonnefalsemini.png")) ); - } - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalSautPageColonne"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); } - -} diff --git a/src/action/actEvalSautPageColonneOui.java b/src/action/actEvalSautPageColonneOui.java index 20f5449..d0724c4 100644 --- a/src/action/actEvalSautPageColonneOui.java +++ b/src/action/actEvalSautPageColonneOui.java @@ -5,17 +5,16 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalSautPageColonneOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer le saut de page ou de colonne." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/sautpagecolonnetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/sautpagecolonnemini.png")) ); } /** * @@ -25,30 +24,12 @@ public class actEvalSautPageColonneOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalSautPageColonne")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalSautPageColonne")); - } - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalSautPageColonne"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalSautPageColonne a été supprimé.

"); - }else { - if(point>0) { - nod.getAttributs().put("evalSautPageColonne", String.valueOf(point)); - } - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalSautPageColonne", + "

Si ce node contient un saut de page ou de colonne,
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalSautPageColonne", + new ImageIcon(create.class.getResource("/resources/sautpagecolonne.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - } diff --git a/src/action/actEvalTabAlignementGaucheNon.java b/src/action/actEvalTabAlignementGaucheNon.java deleted file mode 100644 index 2dea865..0000000 --- a/src/action/actEvalTabAlignementGaucheNon.java +++ /dev/null @@ -1,30 +0,0 @@ -package action; - -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 actEvalTabAlignementGaucheNon extends AbstractAction{ - - /** - * - */ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Supprime évaluation de l'alignement à gauche de la tabulation" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime évaluation de l'alignement à gauche de la tabulation."); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaltabalgngauchefalsemini.png"))); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalTABAlignementAGauche"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvalTabAlignementGaucheOui.java b/src/action/actEvalTabAlignementGaucheOui.java index 4ea4881..76eb185 100644 --- a/src/action/actEvalTabAlignementGaucheOui.java +++ b/src/action/actEvalTabAlignementGaucheOui.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalTabAlignementGaucheOui extends AbstractAction{ @@ -20,43 +19,19 @@ public class actEvalTabAlignementGaucheOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer l'alignement à gauche de la tabulation" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaltabalgngauchetruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaltabalgngauchemini.png")) ); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalTABAlignementAGauche")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalTABAlignementAGauche")); - } - - - if(nod.getAttributs().get("style:type")==null) { - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<0) { - nod.supprimeAttribut("evalTABAlignementAGauche"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalTABAlignementAGauche a été supprimé.

"); - }else { - if(point>0) { - nod.getAttributs().put("evalTABAlignementAGauche", String.valueOf(point)); - } - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - }else { - JOptionPane.showMessageDialog(null,"Il y a un autre alignement dans cette tabulation."); - } - - + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalTABAlignementAGauche", + "

Si ce node dans le fichier de l'étudiant ne contient pas le node
" + + "style:type (alignement à gauche),
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalPiedPagePasActive", + new ImageIcon(create.class.getResource("/resources/evaltabalgngauche.png"))); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalTabDefautStyleLeaderNon.java b/src/action/actEvalTabDefautStyleLeaderNon.java deleted file mode 100644 index 1d9427f..0000000 --- a/src/action/actEvalTabDefautStyleLeaderNon.java +++ /dev/null @@ -1,25 +0,0 @@ -package action; - -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 actEvalTabDefautStyleLeaderNon extends AbstractAction{ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Supprime l'évaluation des des caractères de remplissage" ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation des des caractères de remplissage."); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/EvalTabDefautStyleLeaderfalsemini.png"))); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalTABStyleLeaderDefault"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } -} diff --git a/src/action/actEvalTabDefautStyleLeaderOui.java b/src/action/actEvalTabDefautStyleLeaderOui.java index 5a7dd44..14ddbf3 100644 --- a/src/action/actEvalTabDefautStyleLeaderOui.java +++ b/src/action/actEvalTabDefautStyleLeaderOui.java @@ -5,10 +5,9 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvalTabDefautStyleLeaderOui extends AbstractAction{ @@ -20,41 +19,19 @@ public class actEvalTabDefautStyleLeaderOui extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer les caractères de remplissage par défaut de la tab." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/EvalTabDefautStyleLeadertruemini.png")) ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaltabstyleleadermini.png")) ); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalTABStyleLeaderDefault")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalTABStyleLeaderDefault")); - } - - - if(nod.getAttributs().get("style:leader-text")==null) { - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - - if(a!=null)if(!a.isBlank()) { - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalTABStyleLeaderDefault"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalTABStyleLeaderDefault a été supprimé.

"); - }else { - nod.getAttributs().put("evalTABStyleLeaderDefault", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - }else { - JOptionPane.showMessageDialog(null,"Il y a déjà un autre remplissage de caractère dans cette tabulation."); - } - - + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalTABStyleLeaderDefault", + "

Si ce node dans le fichier de l'étudiant ne contient pas le node
" + + "style:leader-text (remplissage des caractères par défaut),
" + + "alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalTABStyleLeaderDefault", + new ImageIcon(create.class.getResource("/resources/evaltabstyleleader.png"))); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvaluerATraversAnalyseStyleFalse.java b/src/action/actEvaluerATraversAnalyseStyleFalse.java deleted file mode 100644 index d05b080..0000000 --- a/src/action/actEvaluerATraversAnalyseStyleFalse.java +++ /dev/null @@ -1,45 +0,0 @@ -package action; - -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 cXML.node; -import fenetres.create; - -public class actEvaluerATraversAnalyseStyleFalse extends AbstractAction{ - { - putValue( Action.NAME, "N'évaluer pas le style dans la structure." ); - putValue( Action.SHORT_DESCRIPTION, "N'évaluer pas le style:name de ce node dans la struture du fichier de l'étudiant" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/atraversanalysestylefalsemini.png"))); - } - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.getAttributs().put("EvaluerATraversAnalyseStyle", "false"); - nod.changeLesCodesEvaluateursVersCodeEvaluateurDirect(); - TreePath path = fenetres.create.getTree().getSelectionPath(); - - DefaultTreeModel model = (DefaultTreeModel) fenetres.create.getTree().getModel(); - DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); - model.reload(root); - - fenetres.create.getTree().setSelectionPath(path); - fenetres.create.getTree().expandPath(path); - - - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - - } - -} diff --git a/src/action/actEvaluerATraversAnalyseStyleTrue.java b/src/action/actEvaluerATraversAnalyseStyleTrue.java index 2454fd9..a007a59 100644 --- a/src/action/actEvaluerATraversAnalyseStyleTrue.java +++ b/src/action/actEvaluerATraversAnalyseStyleTrue.java @@ -10,13 +10,14 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import cXML.node; +import fenetres.CustomInputDialogActivateStyleDansLaStructure; import fenetres.create; public class actEvaluerATraversAnalyseStyleTrue extends AbstractAction{ { putValue( Action.NAME, "Evaluer le style dans la structure." ); putValue( Action.SHORT_DESCRIPTION, "Evaluer le style:name de ce node dans la struture du fichier de l'étudiant"); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/atraversanalysestyletruemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/atraversanalysestylemini.png"))); } /** * @@ -26,22 +27,14 @@ public class actEvaluerATraversAnalyseStyleTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.getAttributs().put("EvaluerATraversAnalyseStyle", "true"); - nod.changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); - - + CustomInputDialogActivateStyleDansLaStructure.showCustominputDialog(nod); TreePath path = fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - fenetres.create.getTree().setSelectionPath(path); fenetres.create.getTree().expandPath(path); - - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } } diff --git a/src/action/actEvaluerNomDuStyleHeriteFalse.java b/src/action/actEvaluerNomDuStyleHeriteFalse.java deleted file mode 100644 index 84a2c67..0000000 --- a/src/action/actEvaluerNomDuStyleHeriteFalse.java +++ /dev/null @@ -1,30 +0,0 @@ -package action; - -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 actEvaluerNomDuStyleHeriteFalse extends AbstractAction{ - { - putValue( Action.NAME, "Supprime l'évaluation du nom du style hérité." ); - putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du nom du style hérité." ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/heritagestylefalsemini.png")) ); - } - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.supprimeAttribut("evalNameLegacyStyle"); - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvaluerNomDuStyleHeriteTrue.java b/src/action/actEvaluerNomDuStyleHeriteTrue.java index 190a71e..20f91a2 100644 --- a/src/action/actEvaluerNomDuStyleHeriteTrue.java +++ b/src/action/actEvaluerNomDuStyleHeriteTrue.java @@ -5,17 +5,16 @@ 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.CustomInputDialogSimplePoint; import fenetres.create; public class actEvaluerNomDuStyleHeriteTrue extends AbstractAction{ { putValue( Action.NAME, "Oui, combien de point?" ); putValue( Action.SHORT_DESCRIPTION, "Evaluer le nom du style hérité.\nSi pas d'héritage alors évalue celui du nom de ce style."); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/heritagestyletruemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/heritagestylemini.png"))); } /** * @@ -25,26 +24,12 @@ public class actEvaluerNomDuStyleHeriteTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - int point = 0; - if(nod.getAttributs().get("evalNameLegacyStyle")!=null) { - point = Integer.valueOf(nod.getAttributs().get("evalNameLegacyStyle")); - } - String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(a!=null)if(!a.isBlank()){ - try { - point = Integer.valueOf(a); - if(point<=0) { - nod.supprimeAttribut("evalNameLegacyStyle"); - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalNameLegacyStyle a été supprimé.

"); - }else { - nod.getAttributs().put("evalNameLegacyStyle", String.valueOf(point)); - } - } catch (Exception e2) { - fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); - } - } + CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalNameLegacyStyle", + "

Si le node de l'étudiant possède le même style par héritage
" + + "que ce node, alors l'étudiant obtiendra les points ci-dessous.


" + + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + + "d'évaluation evalNameLegacyStyle", + new ImageIcon(create.class.getResource("/resources/heritagestyle.png"))); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvaluerStyleFalse.java b/src/action/actEvaluerStyleFalse.java deleted file mode 100644 index b71f456..0000000 --- a/src/action/actEvaluerStyleFalse.java +++ /dev/null @@ -1,46 +0,0 @@ -package action; - -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{ - - /** - * - */ - 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.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaluerstylefalsemini.png"))); - } - @Override - public void actionPerformed(ActionEvent e) { - node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.getAttributs().put("analyseStyle", "false"); - - //*************************************************************************************************************** - //** Place l'attribut EvaluerATraversAnalyseStyle=false au style qui doit être évaluer à travers d'analyseStyle ** - //** S'il y a des attributs évaluer avec ‼ alors change par ‽ ** - //*************************************************************************************************************** - node nodStyle = commandes.sujet.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nod.getAttributs().get("text:style-name")); - if(nodStyle!=null) { - nodStyle.getAttributs().put("EvaluerATraversAnalyseStyle", "false"); - nodStyle.evaluerAllChildFalse(); - if(!listeNodeFormatageDirectDeWriter.isFormatageDirect(nodStyle)) { - nodStyle.changeLesCodesEvaluateursVersCodeEvaluateurDirect(); - } - } - - fenetres.create.getTextNodeSelect().refreshAffichage(nod); - } - -} diff --git a/src/action/actEvaluerStyleTrue.java b/src/action/actEvaluerStyleTrue.java index a0bd93f..91829ba 100644 --- a/src/action/actEvaluerStyleTrue.java +++ b/src/action/actEvaluerStyleTrue.java @@ -9,8 +9,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import MEPTL.commandes; import cXML.node; +import fenetres.CustomInputDialogActivateStyle; import fenetres.create; public class actEvaluerStyleTrue extends AbstractAction{ @@ -22,39 +22,19 @@ public class actEvaluerStyleTrue extends AbstractAction{ { 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.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaluerstyletruemini.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaluerstylemini.png"))); } @Override public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); - nod.getAttributs().put("analyseStyle", "true"); - - //*************************************************************************************************************** - //** Place l'attribut EvaluerATraversAnalyseStyle=true au style qui doit être évaluer à travers d'analyseStyle ** - //** S'il y a des attributs évaluer avec ‽ alors change par ‼ ** - //*************************************************************************************************************** - String nameStyle = nod.getAttributs().get("text:style-name"); - - node nodStyle = commandes.sujet.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameStyle); - - - if(nodStyle!=null) { - nodStyle.getAttributs().put("EvaluerATraversAnalyseStyle", "true"); - nodStyle.evaluerTrue(); - nodStyle.changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); - } - + CustomInputDialogActivateStyle.showCustominputDialog(nod); TreePath path = fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); - model.reload(root); - + model.reload(root); fenetres.create.getTree().setSelectionPath(path); fenetres.create.getTree().expandPath(path); - - - fenetres.create.getTextNodeSelect().refreshAffichage(nod); + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/fenetres/CustomInputDialogActivateStyle.java b/src/fenetres/CustomInputDialogActivateStyle.java new file mode 100644 index 0000000..33ff079 --- /dev/null +++ b/src/fenetres/CustomInputDialogActivateStyle.java @@ -0,0 +1,83 @@ +package fenetres; + +import java.awt.Color; +import java.awt.Font; +import java.util.ArrayList; + +import javax.swing.ImageIcon; +import javax.swing.JLabel; +import javax.swing.JOptionPane; + +import MEPTL.commandes; +import cXML.node; + + +public class CustomInputDialogActivateStyle { + public static void showCustominputDialog(node nod) { + + JLabel lblTitre = new JLabel("

AnalyseStyle

"); + lblTitre.setForeground(new Color(50,50,200)); + + JLabel lblExpliaction = new JLabel("

Si la méthode est activée alors le style de ce texte est analysé
" + + "dans la structure du document. Cette méthode convient pour
" + + "les formatages directs (surcharges) des paragraphes ou des
" + + "caractères.

"); + lblExpliaction.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblExpliaction.setForeground(Color.blue); + ImageIcon icon = new ImageIcon(create.class.getResource("/resources/evaluerstyle.png")); + + Object[] message = { + lblTitre, + lblExpliaction, + }; + + String[] options = {"Active", "Désactive"}; + + int optionSelected = JOptionPane.showOptionDialog( + null, + message, + "Ajouter ou supprimer la méthode AnalyseStyle", + JOptionPane.DEFAULT_OPTION, + JOptionPane.INFORMATION_MESSAGE, + icon, + options, + options[0]); + + if (optionSelected == 0) { // Bouton "Ajouter" sélectionné + nod.getAttributs().put("analyseStyle", "true"); + //*************************************************************************************************************** + //** Place l'attribut EvaluerATraversAnalyseStyle=true au style qui doit être évaluer à travers d'analyseStyle ** + //** S'il y a des attributs évaluer avec ‽ alors change par ‼ ** + //*************************************************************************************************************** + String nameStyle = nod.getAttributs().get("text:style-name"); + ArrayList nodP = commandes.sujet.retourneEnfantsContainAttribut("style:name"); + for(int i = 0 ; i < nodP.size();i++) { + if(nodP.get(i).getAttributs().get("style:name").equals(nameStyle)) { + nodP.get(i).getAttributs().put("EvaluerATraversAnalyseStyle", "true"); + nodP.get(i).evaluerTrue(); + nodP.get(i).changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); + } + } + } else if (optionSelected == 1) { // Bouton "Supprimer" sélectionné + + nod.supprimeAttribut("analyseStyle"); + //*************************************************************************************************************** + //** Place l'attribut EvaluerATraversAnalyseStyle=true au style qui doit être évaluer à travers d'analyseStyle ** + //** S'il y a des attributs évaluer avec ‽ alors change par ‼ ** + //*************************************************************************************************************** + String nameStyle = nod.getAttributs().get("text:style-name"); + ArrayList nodP = commandes.sujet.retourneEnfantsContainAttribut("style:name"); + for(int i = 0 ; i < nodP.size();i++) { + if(nodP.get(i).getAttributs().get("style:name").equals(nameStyle)) { + nodP.get(i).getAttributs().put("EvaluerATraversAnalyseStyle", "false"); + nodP.get(i).changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); + nodP.get(i).evaluerFalse(); + } + } + } else { // Si la boîte de dialogue est annulée ou fermée + + } + + + } +} diff --git a/src/fenetres/CustomInputDialogActivateStyleDansLaStructure.java b/src/fenetres/CustomInputDialogActivateStyleDansLaStructure.java new file mode 100644 index 0000000..d2ab73e --- /dev/null +++ b/src/fenetres/CustomInputDialogActivateStyleDansLaStructure.java @@ -0,0 +1,83 @@ +package fenetres; + +import java.awt.Color; +import java.awt.Font; +import java.util.ArrayList; + +import javax.swing.ImageIcon; +import javax.swing.JLabel; +import javax.swing.JOptionPane; + +import MEPTL.commandes; +import cXML.node; + + +public class CustomInputDialogActivateStyleDansLaStructure { + public static void showCustominputDialog(node nod) { + + JLabel lblTitre = new JLabel("

EvaluerATraversAnalyseStyle

"); + lblTitre.setForeground(new Color(50,50,200)); + + JLabel lblExpliaction = new JLabel("

Si la méthode est activée alors ce style est évalué uniquement
" + + "dans la structure à partir de la méthode analyseStyle.
" + + "Cette méthode convient pour les formatages directs (surcharges)
" + + "des paragraphes ou des caractères.

"); + lblExpliaction.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblExpliaction.setForeground(Color.blue); + ImageIcon icon = new ImageIcon(create.class.getResource("/resources/atraversanalysestyle.png")); + + Object[] message = { + lblTitre, + lblExpliaction, + }; + + String[] options = {"Active", "Désactive"}; + + int optionSelected = JOptionPane.showOptionDialog( + null, + message, + "Ajouter ou supprimer la méthode EvaluerATraversAnalyseStyle", + JOptionPane.DEFAULT_OPTION, + JOptionPane.INFORMATION_MESSAGE, + icon, + options, + options[0]); + + if (optionSelected == 0) { // Bouton "Ajouter" sélectionné + nod.getAttributs().put("EvaluerATraversAnalyseStyle", "true"); + nod.evaluerTrue(); + nod.changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); + //************************************************************************************************ + //** Place l'attribut analyseStyle=true au style qui doit être évaluer à travers d'analyseStyle ** ** + //************************************************************************************************ + String nameStyle = nod.getAttributs().get("style:name"); + ArrayList nodP = commandes.sujet.retourneEnfantsContainAttribut("text:style-name"); + for(int i =0 ; i < nodP.size();i++) { + if(nodP.get(i).getAttributs().get("text:style-name").equals(nameStyle)) { + nodP.get(i).getAttributs().put("analyseStyle", "true"); + } + } + } else if (optionSelected == 1) { // Bouton "Désactivé" sélectionné + nod.getAttributs().put("EvaluerATraversAnalyseStyle", "false"); + nod.changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); + nod.supprimeAttribut("EvaluerATraversAnalyseStyle"); + nod.evaluerFalse(); + //*************************************************************************************************************** + //** Place l'attribut EvaluerATraversAnalyseStyle=true au style qui doit être évaluer à travers d'analyseStyle ** + //** S'il y a des attributs évaluer avec ‽ alors change par ‼ ** + //*************************************************************************************************************** + String nameStyle = nod.getAttributs().get("style:name"); + ArrayList nodP = commandes.sujet.retourneEnfantsContainAttribut("text:style-name"); + for(int i =0 ; i < nodP.size();i++) { + if(nodP.get(i).getAttributs().get("text:style-name").equals(nameStyle)) { + nodP.get(i).supprimeAttribut("analyseStyle"); + } + } + + } else { // Si la boîte de dialogue est annulée ou fermée + + } + + + } +} diff --git a/src/fenetres/CustomInputDialogSimplePoint.java b/src/fenetres/CustomInputDialogSimplePoint.java new file mode 100644 index 0000000..70a0a39 --- /dev/null +++ b/src/fenetres/CustomInputDialogSimplePoint.java @@ -0,0 +1,66 @@ +package fenetres; + +import java.awt.Color; +import java.awt.Font; +import javax.swing.ImageIcon; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JTextField; +import javax.swing.SwingConstants; + +import cXML.node; + + +public class CustomInputDialogSimplePoint { + public static void showCustominputDialog(node nod, String nameMethod, String explication, ImageIcon icon) { + Integer initialValue = 0; + + if (nod.getAttributs().get(nameMethod) != null) { + initialValue = Integer.parseInt(nod.getAttributs().get(nameMethod)); + } + + JLabel lblTitre = new JLabel("

"+nameMethod+"

"); + lblTitre.setForeground(new Color(50,50,200)); + + JLabel lblExpliaction = new JLabel(explication); + lblExpliaction.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblExpliaction.setForeground(Color.blue); + + JTextField textField = new JTextField(String.valueOf(initialValue), 4); + textField.setFont(new Font("Tahoma", Font.BOLD, 14)); + textField.setHorizontalAlignment(SwingConstants.LEFT); + + Object[] message = { + lblTitre, + lblExpliaction, + "Quel est le nombre de points?", textField + }; + + String[] options = {"Ajouter", "Supprimer"}; + + int optionSelected = JOptionPane.showOptionDialog( + null, + message, + "Ajouter ou supprimer la méthode " + nameMethod, + JOptionPane.DEFAULT_OPTION, + JOptionPane.INFORMATION_MESSAGE, + icon, + options, + options[0]); + + if (optionSelected == 0) { // Bouton "Ajouter" sélectionné + try { + Integer inputValue = Integer.parseInt(textField.getText()); + nod.getAttributs().put(nameMethod, String.valueOf(inputValue)); + } catch (NumberFormatException e) { + JOptionPane.showMessageDialog(null, "Veuillez saisir un entier valide.", "Erreur", JOptionPane.ERROR_MESSAGE); + } + } else if (optionSelected == 1) { // Bouton "Supprimer" sélectionné + nod.supprimeAttribut(nameMethod); + } else { // Si la boîte de dialogue est annulée ou fermée + + } + + + } +} diff --git a/src/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java b/src/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java new file mode 100644 index 0000000..de029dd --- /dev/null +++ b/src/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java @@ -0,0 +1,94 @@ +package fenetres; + +import java.awt.Color; +import java.awt.Font; + +import javax.swing.ImageIcon; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JTextField; +import javax.swing.SwingConstants; + +import MEPTL.commandes; +import cXML.node; + + +public class CustomInputDialogSimplePointpourNumeroPageEtStructure { + public static void showCustominputDialog(node nod, String nameMethod, String explication, ImageIcon icon) { + Integer initialValue = 0; + + if (nod.getAttributs().get(nameMethod) != null) { + initialValue = Integer.parseInt(nod.getAttributs().get(nameMethod)); + } + + JLabel lblTitre = new JLabel("

"+nameMethod+"

"); + lblTitre.setForeground(new Color(50,50,200)); + + JLabel lblExpliaction = new JLabel(explication); + lblExpliaction.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblExpliaction.setForeground(Color.blue); + + JTextField textField = new JTextField(String.valueOf(initialValue), 4); + textField.setFont(new Font("Tahoma", Font.BOLD, 14)); + textField.setHorizontalAlignment(SwingConstants.LEFT); + + JCheckBox caseToutesLesPages = new JCheckBox("Sur toutes les pages"); + caseToutesLesPages.setFont(new Font("Tahoma", Font.BOLD, 12)); + caseToutesLesPages.setSelected(false); + + Object[] message = { + lblTitre, + lblExpliaction, + caseToutesLesPages, + "Quel est le nombre de points?", textField + }; + + String[] options = {"Ajouter", "Supprimer"}; + + int optionSelected = JOptionPane.showOptionDialog( + null, + message, + "Ajouter ou supprimer la méthode " + nameMethod, + JOptionPane.DEFAULT_OPTION, + JOptionPane.INFORMATION_MESSAGE, + icon, + options, + options[0]); + + if (optionSelected == 0) { // Bouton "Ajouter" sélectionné + try { + Integer inputValue = Integer.parseInt(textField.getText()); + if(!caseToutesLesPages.isSelected()) { + nod.getAttributs().put(nameMethod, String.valueOf(inputValue)); + }else{ + ajouteAToutesLesPages(inputValue,nameMethod); + } + + } catch (NumberFormatException e) { + JOptionPane.showMessageDialog(null, "Veuillez saisir un entier valide.", "Erreur", JOptionPane.ERROR_MESSAGE); + } + } else if (optionSelected == 1) { // Bouton "Supprimer" sélectionné + if(!caseToutesLesPages.isSelected()) { + nod.supprimeAttribut(nameMethod); + }else{ + ajouteAToutesLesPages(0,nameMethod); + } + } else { + + } + + } + + private static void ajouteAToutesLesPages(Integer point,String nameMethod) { + node structurepage = commandes.sujet.retourneFirstEnfantsByName("structurepage"); + for(int i=0; i < structurepage.getNodes().size();i++) { + if(point>0) { + structurepage.getNodes().get(i).getAttributs().put(nameMethod, String.valueOf(point)); + }else { + structurepage.getNodes().get(i).supprimeAttribut(nameMethod); + } + } + } + +} diff --git a/src/fenetres/attributs.java b/src/fenetres/attributs.java index 384af77..f7bd568 100644 --- a/src/fenetres/attributs.java +++ b/src/fenetres/attributs.java @@ -265,7 +265,7 @@ public class attributs extends JFrame { contentPane.add(scrollPaneCentre, BorderLayout.CENTER); scrollPaneCentre.setViewportView(panelCentre); - panelCentre.setLayout(new MigLayout("gap rel 0", "[20px:n,fill][100px:n,grow][100px:n,grow][32px:n][32px:n]", "[::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px]")); + panelCentre.setLayout(new MigLayout("gap rel 0", "[40px:n,fill][50px:n][100px:n,grow][40px:n][32px:n]", "[::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px]")); JLabel lblNewLabel0 = new JLabel("Supprime"); lblNewLabel0.setFont(new Font("Tahoma", Font.BOLD, 11)); @@ -361,7 +361,7 @@ public class attributs extends JFrame { //Enabled false les valeurs ne peuvent pas être modifiées. //Enabled false les evaluer si pas evaluable. for(int i = 0 ; i */ public create() { btnAllContent.setEnabled(false); - btnevalNameLegacyStyleTrue.setIcon(new ImageIcon(create.class.getResource("/resources/heritagestyletrue.png"))); + btnevalNameLegacyStyleTrue.setIcon(new ImageIcon(create.class.getResource("/resources/heritagestyle.png"))); btnevalNameLegacyStyleTrue.setEnabled(false); - btnevalNameLegacyStyleFalse.setIcon(new ImageIcon(create.class.getResource("/resources/heritagestylefalse.png"))); - btnevalNameLegacyStyleFalse.setEnabled(false); - btnanalyseStyletrue.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstyletrue.png"))); + btnanalyseStyletrue.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstyle.png"))); btnanalyseStyletrue.setEnabled(false); - btnanalyseStylefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstylefalse.png"))); - btnanalyseStylefalse.setEnabled(false); - btnevalSautPageColonnetrue.setIcon(new ImageIcon(create.class.getResource("/resources/sautpagecolonnetrue.png"))); + btnevalSautPageColonnetrue.setIcon(new ImageIcon(create.class.getResource("/resources/sautpagecolonne.png"))); btnevalSautPageColonnetrue.setEnabled(false); - btnevalSautPageColonnefalse.setIcon(new ImageIcon(create.class.getResource("/resources/sautpagecolonnefalse.png"))); - btnevalSautPageColonnefalse.setEnabled(false); - btnevalNameNodetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnodetrue.png"))); + btnevalNameNodetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnode.png"))); btnevalNameNodetrue.setEnabled(false); - btnevalNameNodefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalnodefalse.png"))); - btnevalNameNodefalse.setEnabled(false); - btnevalFormatageDirecttrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalformatagedirecttrue.png"))); + btnevalFormatageDirecttrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalformatagedirect.png"))); btnevalFormatageDirecttrue.setEnabled(false); - btnevalFormatageDirectfalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalformatagedirectfalse.png"))); - btnevalFormatageDirectfalse.setEnabled(false); - btnevalPlacementtrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalplacementparagraphetrue.png"))); + btnevalPlacementtrue.setIcon(new ImageIcon(create.class.getResource("/resources/ordreparagraphe.png"))); btnevalPlacementtrue.setEnabled(false); - btnevalPlacementfalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalplacementparagraphefalse.png"))); - btnevalPlacementfalse.setEnabled(false); - btnevalFirstChildtrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalFirstChildtrue.png"))); + btnevalFirstChildtrue.setIcon(new ImageIcon(create.class.getResource("/resources/premierenfant.png"))); btnevalFirstChildtrue.setEnabled(false); - btnevalFirstChildfalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalFirstChildfalse.png"))); - btnevalFirstChildfalse.setEnabled(false); - btnevalLastChildtrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalLastChildtrue.png"))); + btnevalLastChildtrue.setIcon(new ImageIcon(create.class.getResource("/resources/dernierenfant.png"))); btnevalLastChildtrue.setEnabled(false); - btnevalLastChildfalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalLastChildfalse.png"))); - btnevalLastChildfalse.setEnabled(false); - btnevalAncrageNumeroAbsoluePagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropageancragetrue.png"))); + btnevalAncrageNumeroAbsoluePagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropageancrage.png"))); btnevalAncrageNumeroAbsoluePagetrue.setEnabled(false); - btnevalAncrageNumeroAbsoluePagefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropageancragefalse.png"))); - btnevalAncrageNumeroAbsoluePagefalse.setEnabled(false); - btnevalPasParagrapheVidetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidetrue.png"))); + btnevalPasParagrapheVidetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalpasparagraphevide.png"))); btnevalPasParagrapheVidetrue.setEnabled(false); - btnevalPasParagrapheVidefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidefalse.png"))); - btnevalPasParagrapheVidefalse.setEnabled(false); - btnevalNamePagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepagetrue.png"))); + btnevalNamePagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepage.png"))); btnevalNamePagetrue.setEnabled(false); - btnevalNamePagefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepagefalse.png"))); - btnevalNamePagefalse.setEnabled(false); - btnevalNumeroPagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagetrue.png"))); + btnevalNumeroPagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropage.png"))); btnevalNumeroPagetrue.setEnabled(false); - btnevalNumeroPagefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagefalse.png"))); - btnevalNumeroPagefalse.setEnabled(false); - btnevalNumeroAbsoluePagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepagetrue.png"))); + btnevalNumeroAbsoluePagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepage.png"))); btnevalNumeroAbsoluePagetrue.setEnabled(false); - btnevalNumeroAbsoluePagefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepagefalse.png"))); - btnevalNumeroAbsoluePagefalse.setEnabled(false); - btnevalEnteteActivetrue.setIcon(new ImageIcon(create.class.getResource("/resources/actEvalEnteteActivetrue.png"))); + btnevalEnteteActivetrue.setIcon(new ImageIcon(create.class.getResource("/resources/enteteoui.png"))); btnevalEnteteActivetrue.setEnabled(false); - btnevalEnteteActivefalse.setIcon(new ImageIcon(create.class.getResource("/resources/actEvalEnteteActivefalse.png"))); - btnevalEnteteActivefalse.setEnabled(false); - btnevalEntetePasActivetrue.setIcon(new ImageIcon(create.class.getResource("/resources/actEvalEntetePasActivetrue.png"))); + btnevalEntetePasActivetrue.setIcon(new ImageIcon(create.class.getResource("/resources/entetenon.png"))); btnevalEntetePasActivetrue.setEnabled(false); - btnevalEntetePasActivefalse.setIcon(new ImageIcon(create.class.getResource("/resources/actEvalEntetePasActivefalse.png"))); - btnevalEntetePasActivefalse.setEnabled(false); - btnEvalPiedPageActivetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalPiedPageActivetrue.png"))); + btnEvalPiedPageActivetrue.setIcon(new ImageIcon(create.class.getResource("/resources/piedpageoui.png"))); btnEvalPiedPageActivetrue.setEnabled(false); - btnEvalPiedPageActivefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalPiedPageActivefalse.png"))); - btnEvalPiedPageActivefalse.setEnabled(false); - btnEvalPiedPagePasActivetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalPiedPagePasActivetrue.png"))); + btnEvalPiedPagePasActivetrue.setIcon(new ImageIcon(create.class.getResource("/resources/piedpagenon.png"))); btnEvalPiedPagePasActivetrue.setEnabled(false); - btnEvalPiedPagePasActivefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalPiedPagePasActivefalse.png"))); - btnEvalPiedPagePasActivefalse.setEnabled(false); - btnevalTABAlignementAGauchetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evaltabalgngauchetrue.png"))); + btnevalTABAlignementAGauchetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evaltabalgngauche.png"))); btnevalTABAlignementAGauchetrue.setEnabled(false); - btnevalTABAlignementAGauchefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evaltabalgngauchefalse.png"))); - btnevalTABAlignementAGauchefalse.setEnabled(false); - btnevalTABStyleLeaderDefaulttrue.setIcon(new ImageIcon(create.class.getResource("/resources/EvalTabDefautStyleLeadertrue.png"))); + btnevalTABStyleLeaderDefaulttrue.setIcon(new ImageIcon(create.class.getResource("/resources/evaltabstyleleader.png"))); btnevalTABStyleLeaderDefaulttrue.setEnabled(false); - btnevalTABStyleLeaderDefaultfalse.setIcon(new ImageIcon(create.class.getResource("/resources/EvalTabDefautStyleLeaderfalse.png"))); - btnevalTABStyleLeaderDefaultfalse.setEnabled(false); - btnEvaluerATraversAnalyseStyletrue.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestyletrue.png"))); + btnEvaluerATraversAnalyseStyletrue.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestyle.png"))); btnEvaluerATraversAnalyseStyletrue.setEnabled(false); - btnEvaluerATraversAnalyseStylefalse.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestylefalse.png"))); - btnEvaluerATraversAnalyseStylefalse.setEnabled(false); setBackground(new Color(255, 255, 255)); try { @@ -409,123 +328,63 @@ public final class create extends JFrame { btnevalNameNodetrue.setText(""); panelDroiteBoutons.add(btnevalNameNodetrue, "cell 2 1"); - btnevalNameNodefalse.setText(""); - panelDroiteBoutons.add(btnevalNameNodefalse, "cell 3 1"); btnevalNameLegacyStyleTrue.setText(""); - panelDroiteBoutons.add(btnevalNameLegacyStyleTrue, "cell 4 1"); - - btnevalNameLegacyStyleFalse.setText(""); - panelDroiteBoutons.add(btnevalNameLegacyStyleFalse, "cell 5 1"); - + panelDroiteBoutons.add(btnevalNameLegacyStyleTrue, "cell 3 1"); + btnanalyseStyletrue.setText(""); - panelDroiteBoutons.add(btnanalyseStyletrue, "cell 0 2"); - - btnanalyseStylefalse.setText(""); - panelDroiteBoutons.add(btnanalyseStylefalse, "cell 1 2"); - - btnevalSautPageColonnetrue.setText(""); - panelDroiteBoutons.add(btnevalSautPageColonnetrue, "cell 2 2"); - - btnevalSautPageColonnefalse.setText(""); - panelDroiteBoutons.add(btnevalSautPageColonnefalse, "cell 3 2"); - - btnevalFormatageDirecttrue.setText(""); - panelDroiteBoutons.add(btnevalFormatageDirecttrue, "cell 4 2"); - - btnevalFormatageDirectfalse.setText(""); - panelDroiteBoutons.add(btnevalFormatageDirectfalse, "cell 5 2"); - - btnevalPlacementtrue.setText(""); - panelDroiteBoutons.add(btnevalPlacementtrue, "cell 0 3"); - - btnevalPlacementfalse.setText(""); - panelDroiteBoutons.add(btnevalPlacementfalse, "cell 1 3"); + panelDroiteBoutons.add(btnanalyseStyletrue, "cell 4 1"); + + btnEvaluerATraversAnalyseStyletrue.setText(""); + panelDroiteBoutons.add(btnEvaluerATraversAnalyseStyletrue, "cell 5 1"); + + btnevalSautPageColonnetrue.setText(""); + panelDroiteBoutons.add(btnevalSautPageColonnetrue, "cell 0 2"); btnevalFirstChildtrue.setText(""); - panelDroiteBoutons.add(btnevalFirstChildtrue, "cell 2 3"); + panelDroiteBoutons.add(btnevalFirstChildtrue, "cell 1 2"); - btnevalFirstChildfalse.setText(""); - panelDroiteBoutons.add(btnevalFirstChildfalse, "cell 3 3"); - btnevalLastChildtrue.setText(""); - panelDroiteBoutons.add(btnevalLastChildtrue, "cell 4 3"); + panelDroiteBoutons.add(btnevalLastChildtrue, "cell 2 2"); - btnevalLastChildfalse.setText(""); - panelDroiteBoutons.add(btnevalLastChildfalse, "cell 5 3"); - - btnevalAncrageNumeroAbsoluePagetrue.setText(""); - panelDroiteBoutons.add(btnevalAncrageNumeroAbsoluePagetrue, "cell 0 4"); - - btnevalAncrageNumeroAbsoluePagefalse.setText(""); - panelDroiteBoutons.add(btnevalAncrageNumeroAbsoluePagefalse, "cell 1 4"); - - btnevalPasParagrapheVidetrue.setText(""); - panelDroiteBoutons.add(btnevalPasParagrapheVidetrue, "cell 2 4"); - - btnevalPasParagrapheVidefalse.setText(""); - panelDroiteBoutons.add(btnevalPasParagrapheVidefalse, "cell 3 4"); - - btnevalNamePagetrue.setText(""); - panelDroiteBoutons.add(btnevalNamePagetrue, "cell 4 4"); - - btnevalNamePagefalse.setText(""); - panelDroiteBoutons.add(btnevalNamePagefalse, "cell 5 4"); - - btnevalNumeroPagetrue.setText(""); - panelDroiteBoutons.add(btnevalNumeroPagetrue, "cell 0 5"); - - btnevalNumeroPagefalse.setText(""); - panelDroiteBoutons.add(btnevalNumeroPagefalse, "cell 1 5"); - - btnevalNumeroAbsoluePagetrue.setText(""); - panelDroiteBoutons.add(btnevalNumeroAbsoluePagetrue, "cell 2 5"); - - btnevalNumeroAbsoluePagefalse.setText(""); - panelDroiteBoutons.add(btnevalNumeroAbsoluePagefalse, "cell 3 5"); - - btnevalEnteteActivetrue.setText(""); - panelDroiteBoutons.add(btnevalEnteteActivetrue, "cell 4 5"); - - btnevalEnteteActivefalse.setText(""); - panelDroiteBoutons.add(btnevalEnteteActivefalse, "cell 5 5"); - - btnevalEntetePasActivetrue.setText(""); - panelDroiteBoutons.add(btnevalEntetePasActivetrue, "cell 0 6"); - - btnevalEntetePasActivefalse.setText(""); - panelDroiteBoutons.add(btnevalEntetePasActivefalse, "cell 1 6"); - - btnEvalPiedPageActivetrue.setText(""); - panelDroiteBoutons.add(btnEvalPiedPageActivetrue, "cell 2 6"); - - btnEvalPiedPageActivefalse.setText(""); - panelDroiteBoutons.add(btnEvalPiedPageActivefalse, "cell 3 6"); - - btnEvalPiedPagePasActivetrue.setText(""); - panelDroiteBoutons.add(btnEvalPiedPagePasActivetrue, "cell 4 6"); - - btnEvalPiedPagePasActivefalse.setText(""); - panelDroiteBoutons.add(btnEvalPiedPagePasActivefalse, "cell 5 6"); - - btnevalTABAlignementAGauchetrue.setText(""); - panelDroiteBoutons.add(btnevalTABAlignementAGauchetrue, "cell 0 7"); - - btnevalTABAlignementAGauchefalse.setText(""); - panelDroiteBoutons.add(btnevalTABAlignementAGauchefalse, "cell 1 7"); - - btnevalTABStyleLeaderDefaulttrue.setText(""); - panelDroiteBoutons.add(btnevalTABStyleLeaderDefaulttrue, "cell 2 7"); - - btnevalTABStyleLeaderDefaultfalse.setText(""); - panelDroiteBoutons.add(btnevalTABStyleLeaderDefaultfalse, "cell 3 7"); - - btnEvaluerATraversAnalyseStyletrue.setText(""); - panelDroiteBoutons.add(btnEvaluerATraversAnalyseStyletrue, "cell 4 7"); - - btnEvaluerATraversAnalyseStylefalse.setText(""); - panelDroiteBoutons.add(btnEvaluerATraversAnalyseStylefalse, "cell 5 7"); + btnevalPlacementtrue.setText(""); + panelDroiteBoutons.add(btnevalPlacementtrue, "cell 3 2"); + + btnevalFormatageDirecttrue.setText(""); + panelDroiteBoutons.add(btnevalFormatageDirecttrue, "cell 4 2"); + btnevalAncrageNumeroAbsoluePagetrue.setText(""); + panelDroiteBoutons.add(btnevalAncrageNumeroAbsoluePagetrue, "cell 5 2"); + + btnevalEnteteActivetrue.setText(""); + panelDroiteBoutons.add(btnevalEnteteActivetrue, "cell 0 3"); + + btnevalEntetePasActivetrue.setText(""); + panelDroiteBoutons.add(btnevalEntetePasActivetrue, "cell 1 3"); + + btnEvalPiedPageActivetrue.setText(""); + panelDroiteBoutons.add(btnEvalPiedPageActivetrue, "cell 2 3"); + + btnEvalPiedPagePasActivetrue.setText(""); + panelDroiteBoutons.add(btnEvalPiedPagePasActivetrue, "cell 3 3"); + + btnevalTABAlignementAGauchetrue.setText(""); + panelDroiteBoutons.add(btnevalTABAlignementAGauchetrue, "cell 4 3"); + + btnevalTABStyleLeaderDefaulttrue.setText(""); + panelDroiteBoutons.add(btnevalTABStyleLeaderDefaulttrue, "cell 5 3"); + + btnevalNamePagetrue.setText(""); + panelDroiteBoutons.add(btnevalNamePagetrue, "cell 0 4"); + + btnevalNumeroAbsoluePagetrue.setText(""); + panelDroiteBoutons.add(btnevalNumeroAbsoluePagetrue, "cell 1 4"); + + btnevalNumeroPagetrue.setText(""); + panelDroiteBoutons.add(btnevalNumeroPagetrue, "cell 2 4"); + + btnevalPasParagrapheVidetrue.setText(""); + panelDroiteBoutons.add(btnevalPasParagrapheVidetrue, "cell 3 4"); JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, ScrollPaneTableBouton ); splitPane2.setBounds(10, 10, 1364, 783); @@ -602,116 +461,81 @@ public final class create extends JFrame { textNodeSelect.refreshAffichage(nod); //affiche des informations sur le node. btnevalNameLegacyStyleTrue.setEnabled(false); - btnevalNameLegacyStyleFalse.setEnabled(false); btnanalyseStyletrue.setEnabled(false); - btnanalyseStylefalse.setEnabled(false); btnAllContent.setEnabled(false); btnevalSautPageColonnetrue.setEnabled(false); - btnevalSautPageColonnefalse.setEnabled(false); btnevalNameNodetrue.setEnabled(false); - btnevalNameNodefalse.setEnabled(false); btnevalFormatageDirecttrue.setEnabled(false); - btnevalFormatageDirectfalse.setEnabled(false); btnevalPlacementtrue.setEnabled(false); - btnevalPlacementfalse.setEnabled(false); btnevalFirstChildtrue.setEnabled(false); - btnevalFirstChildfalse.setEnabled(false); btnevalLastChildtrue.setEnabled(false); - btnevalLastChildfalse.setEnabled(false); btnevalAncrageNumeroAbsoluePagetrue.setEnabled(false); - btnevalAncrageNumeroAbsoluePagefalse.setEnabled(false); btnevalPasParagrapheVidetrue.setEnabled(false); - btnevalPasParagrapheVidefalse.setEnabled(false); btnevalNamePagetrue.setEnabled(false); - btnevalNamePagefalse.setEnabled(false); btnevalNumeroPagetrue.setEnabled(false); - btnevalNumeroPagefalse.setEnabled(false); btnevalNumeroAbsoluePagetrue.setEnabled(false); - btnevalNumeroAbsoluePagefalse.setEnabled(false); btnevalEnteteActivetrue.setEnabled(false); - btnevalEnteteActivefalse.setEnabled(false); btnevalEntetePasActivetrue.setEnabled(false); - btnevalEntetePasActivefalse.setEnabled(false); btnEvalPiedPageActivetrue.setEnabled(false); - btnEvalPiedPageActivefalse.setEnabled(false); btnEvalPiedPagePasActivetrue.setEnabled(false); - btnEvalPiedPagePasActivefalse.setEnabled(false); btnevalTABAlignementAGauchetrue.setEnabled(false); - btnevalTABAlignementAGauchefalse.setEnabled(false); btnevalTABStyleLeaderDefaulttrue.setEnabled(false); - btnevalTABStyleLeaderDefaultfalse.setEnabled(false); - btnEvaluerATraversAnalyseStyletrue.setEnabled(false); - btnEvaluerATraversAnalyseStylefalse.setEnabled(false); - + btnEvaluerATraversAnalyseStyletrue.setEnabled(false); if(listeDesNodesAllContent.isAllContent(nod)) { btnAllContent.setEnabled(true); } if(listeDesNodesFormatageDirect.isFormatageDirect(nod)) { btnevalNameLegacyStyleTrue.setEnabled(true); - btnevalNameLegacyStyleFalse.setEnabled(true); btnevalSautPageColonnetrue.setEnabled(true); - btnevalSautPageColonnefalse.setEnabled(true); btnevalFormatageDirecttrue.setEnabled(true); - btnevalFormatageDirectfalse.setEnabled(true); } if(listeDesNodesAnalyseStyle.isAnalyseStyle(nod)) { btnanalyseStyletrue.setEnabled(true); - btnanalyseStylefalse.setEnabled(true); } if(listeEvalNameNode.isNodeEvalNameNode(nod)) { btnevalNameNodetrue.setEnabled(true); - btnevalNameNodefalse.setEnabled(true); } if(listeDesNodesEvalPlacement.isPlacement(nod)) { btnevalPlacementtrue.setEnabled(true); - btnevalPlacementfalse.setEnabled(true); if(nod.retourneLeNodeFrereAvant()==null) { btnevalFirstChildtrue.setEnabled(true); - btnevalFirstChildfalse.setEnabled(true); } if(nod.retourneLeNodeFrereApres()==null) { btnevalLastChildtrue.setEnabled(true); - btnevalLastChildfalse.setEnabled(true); } } if(listeDesNodesAncrable.isAncrable(nod)) { btnevalAncrageNumeroAbsoluePagetrue.setEnabled(true); - btnevalAncrageNumeroAbsoluePagefalse.setEnabled(true); } if(listeDesNodesPourEvaluerPage.isPage(nod)) { btnevalPasParagrapheVidetrue.setEnabled(true); - btnevalPasParagrapheVidefalse.setEnabled(true); btnevalNamePagetrue.setEnabled(true); - btnevalNamePagefalse.setEnabled(true); btnevalNumeroPagetrue.setEnabled(true); - btnevalNumeroPagefalse.setEnabled(true); btnevalNumeroAbsoluePagetrue.setEnabled(true); - btnevalNumeroAbsoluePagefalse.setEnabled(true); } if(listeDesNodesPourEvaluationEntetePage.isEntete(nod)) { - btnevalEnteteActivetrue.setEnabled(true); - btnevalEnteteActivefalse.setEnabled(true); - btnevalEntetePasActivetrue.setEnabled(true); - btnevalEntetePasActivefalse.setEnabled(true); + if(nod.isHasEnfant()) { + btnevalEnteteActivetrue.setEnabled(true); + }else { + btnevalEntetePasActivetrue.setEnabled(true); + } } if(listeDesNodesPourEvaluerPiedDePage.isPiedDePage(nod)){ - btnEvalPiedPageActivetrue.setEnabled(true); - btnEvalPiedPageActivefalse.setEnabled(true); - btnEvalPiedPagePasActivetrue.setEnabled(true); - btnEvalPiedPagePasActivefalse.setEnabled(true); + if(nod.isHasEnfant()) { + btnEvalPiedPageActivetrue.setEnabled(true); + }else { + btnEvalPiedPagePasActivetrue.setEnabled(true); + } } if(listeDesNodesTabStop.AlignementDefaut(nod)) { btnevalTABAlignementAGauchetrue.setEnabled(true); - btnevalTABAlignementAGauchefalse.setEnabled(true); } if(listeDesNodesTabStop.RemplissageDefaut(nod)) { btnevalTABStyleLeaderDefaulttrue.setEnabled(true); - btnevalTABStyleLeaderDefaultfalse.setEnabled(true); } if(nod.getNomElt().equals("style:style")) { btnEvaluerATraversAnalyseStyletrue.setEnabled(true); - btnEvaluerATraversAnalyseStylefalse.setEnabled(true); } } } diff --git a/src/list/listeAttributWriterValeurPasModifiable.java b/src/list/listeAttributWriterValeurPasModifiable.java index dabb99c..115f2e8 100644 --- a/src/list/listeAttributWriterValeurPasModifiable.java +++ b/src/list/listeAttributWriterValeurPasModifiable.java @@ -15,6 +15,7 @@ public class listeAttributWriterValeurPasModifiable { switch (nameAttribut) { case "style:name": return true; + case "style:class": return true; case "style:display-name": return true; case "style:next-style-name": return true; case "style:parent-style-name": return true; @@ -31,23 +32,6 @@ public class listeAttributWriterValeurPasModifiable { default: return false; } - - -// -// if(nameAttribut.equals("style:name")) return true; -// if(nameAttribut.equals("style:display-name")) return true; -// if(nameAttribut.equals("style:next-style-name")) return true; -// if(nameAttribut.equals("style:parent-style-name")) return true; -// if(nameAttribut.equals("style:family")) return true; -// if(nameAttribut.equals("style:master-page-name")) return true; -// if(nameAttribut.equals("style:page_number"))return true; -// if(nameAttribut.equals("style:page-layout-name")) return true; -// if(nameAttribut.equals("numeroabsolue")) return true; -// if(nameAttribut.equals("numero")) return true; -// if(nameAttribut.equals("draw:style-name")) return true; -// if(nameAttribut.equals("text:style-name")) return true; -// if(nameAttribut.equals("text:name")) return true; -// return false; } } diff --git a/src/list/listeDesNodesEvalPlacement.java b/src/list/listeDesNodesEvalPlacement.java index 74520b7..baf835c 100644 --- a/src/list/listeDesNodesEvalPlacement.java +++ b/src/list/listeDesNodesEvalPlacement.java @@ -12,7 +12,6 @@ public class listeDesNodesEvalPlacement { String nameNode = nod.getNomElt(); switch (nameNode) { - case "page": return true; case "text:p": return true; case "text:h": return true; case "text:list": return true; diff --git a/src/resources/EvalTabDefautStyleLeaderfalse.png b/src/resources/EvalTabDefautStyleLeaderfalse.png deleted file mode 100644 index 1482d65..0000000 Binary files a/src/resources/EvalTabDefautStyleLeaderfalse.png and /dev/null differ diff --git a/src/resources/EvalTabDefautStyleLeaderfalsemini.png b/src/resources/EvalTabDefautStyleLeaderfalsemini.png deleted file mode 100644 index ebb47dc..0000000 Binary files a/src/resources/EvalTabDefautStyleLeaderfalsemini.png and /dev/null differ diff --git a/src/resources/EvalTabDefautStyleLeadertrue.png b/src/resources/EvalTabDefautStyleLeadertrue.png deleted file mode 100644 index dc6bf18..0000000 Binary files a/src/resources/EvalTabDefautStyleLeadertrue.png and /dev/null differ diff --git a/src/resources/EvalTabDefautStyleLeadertruemini.png b/src/resources/EvalTabDefautStyleLeadertruemini.png deleted file mode 100644 index 52ec5f1..0000000 Binary files a/src/resources/EvalTabDefautStyleLeadertruemini.png and /dev/null differ diff --git a/src/resources/actEvalEnteteActivefalse.png b/src/resources/actEvalEnteteActivefalse.png deleted file mode 100644 index 36307a4..0000000 Binary files a/src/resources/actEvalEnteteActivefalse.png and /dev/null differ diff --git a/src/resources/actEvalEnteteActivefalsemini.png b/src/resources/actEvalEnteteActivefalsemini.png deleted file mode 100644 index af3295e..0000000 Binary files a/src/resources/actEvalEnteteActivefalsemini.png and /dev/null differ diff --git a/src/resources/actEvalEnteteActivetrue.png b/src/resources/actEvalEnteteActivetrue.png deleted file mode 100644 index c445ec1..0000000 Binary files a/src/resources/actEvalEnteteActivetrue.png and /dev/null differ diff --git a/src/resources/actEvalEnteteActivetruemini.png b/src/resources/actEvalEnteteActivetruemini.png deleted file mode 100644 index 34f5cdb..0000000 Binary files a/src/resources/actEvalEnteteActivetruemini.png and /dev/null differ diff --git a/src/resources/actEvalEntetePasActivefalse.png b/src/resources/actEvalEntetePasActivefalse.png deleted file mode 100644 index c3574f3..0000000 Binary files a/src/resources/actEvalEntetePasActivefalse.png and /dev/null differ diff --git a/src/resources/actEvalEntetePasActivefalsemini.png b/src/resources/actEvalEntetePasActivefalsemini.png deleted file mode 100644 index 297879f..0000000 Binary files a/src/resources/actEvalEntetePasActivefalsemini.png and /dev/null differ diff --git a/src/resources/actEvalEntetePasActivetrue.png b/src/resources/actEvalEntetePasActivetrue.png deleted file mode 100644 index 065d1ff..0000000 Binary files a/src/resources/actEvalEntetePasActivetrue.png and /dev/null differ diff --git a/src/resources/actEvalEntetePasActivetruemini.png b/src/resources/actEvalEntetePasActivetruemini.png deleted file mode 100644 index 283f4b8..0000000 Binary files a/src/resources/actEvalEntetePasActivetruemini.png and /dev/null differ diff --git a/src/resources/atraversanalysestylefalse.png b/src/resources/atraversanalysestylefalse.png deleted file mode 100644 index 2ac6c5a..0000000 Binary files a/src/resources/atraversanalysestylefalse.png and /dev/null differ diff --git a/src/resources/atraversanalysestylefalsemini.png b/src/resources/atraversanalysestylefalsemini.png deleted file mode 100644 index b7ffb6e..0000000 Binary files a/src/resources/atraversanalysestylefalsemini.png and /dev/null differ diff --git a/src/resources/atraversanalysestyletrue.png b/src/resources/atraversanalysestyletrue.png deleted file mode 100644 index c0e52b3..0000000 Binary files a/src/resources/atraversanalysestyletrue.png and /dev/null differ diff --git a/src/resources/atraversanalysestyletruemini.png b/src/resources/atraversanalysestyletruemini.png deleted file mode 100644 index 3099742..0000000 Binary files a/src/resources/atraversanalysestyletruemini.png and /dev/null differ diff --git a/src/resources/dernierenfant.png b/src/resources/dernierenfant.png index ce03155..8db441c 100644 Binary files a/src/resources/dernierenfant.png and b/src/resources/dernierenfant.png differ diff --git a/src/resources/dernierenfantmini.png b/src/resources/dernierenfantmini.png index 6580c0e..d2a6139 100644 Binary files a/src/resources/dernierenfantmini.png and b/src/resources/dernierenfantmini.png differ diff --git a/src/resources/evalFirstChildfalse.png b/src/resources/evalFirstChildfalse.png deleted file mode 100644 index 98a0c8b..0000000 Binary files a/src/resources/evalFirstChildfalse.png and /dev/null differ diff --git a/src/resources/evalFirstChildfalsemini.png b/src/resources/evalFirstChildfalsemini.png deleted file mode 100644 index 32fb2de..0000000 Binary files a/src/resources/evalFirstChildfalsemini.png and /dev/null differ diff --git a/src/resources/evalFirstChildtrue.png b/src/resources/evalFirstChildtrue.png deleted file mode 100644 index 9af1829..0000000 Binary files a/src/resources/evalFirstChildtrue.png and /dev/null differ diff --git a/src/resources/evalFirstChildtruemini.png b/src/resources/evalFirstChildtruemini.png deleted file mode 100644 index 4b8e83a..0000000 Binary files a/src/resources/evalFirstChildtruemini.png and /dev/null differ diff --git a/src/resources/evalLastChildfalse.png b/src/resources/evalLastChildfalse.png deleted file mode 100644 index f6ac558..0000000 Binary files a/src/resources/evalLastChildfalse.png and /dev/null differ diff --git a/src/resources/evalLastChildfalsemini.png b/src/resources/evalLastChildfalsemini.png deleted file mode 100644 index 2d94b3d..0000000 Binary files a/src/resources/evalLastChildfalsemini.png and /dev/null differ diff --git a/src/resources/evalLastChildtrue.png b/src/resources/evalLastChildtrue.png deleted file mode 100644 index d810078..0000000 Binary files a/src/resources/evalLastChildtrue.png and /dev/null differ diff --git a/src/resources/evalLastChildtruemini.png b/src/resources/evalLastChildtruemini.png deleted file mode 100644 index a8b09a4..0000000 Binary files a/src/resources/evalLastChildtruemini.png and /dev/null differ diff --git a/src/resources/evalPiedPageActivefalse.png b/src/resources/evalPiedPageActivefalse.png deleted file mode 100644 index a61525c..0000000 Binary files a/src/resources/evalPiedPageActivefalse.png and /dev/null differ diff --git a/src/resources/evalPiedPageActivefalsemini.png b/src/resources/evalPiedPageActivefalsemini.png deleted file mode 100644 index c12e566..0000000 Binary files a/src/resources/evalPiedPageActivefalsemini.png and /dev/null differ diff --git a/src/resources/evalPiedPageActivetrue.png b/src/resources/evalPiedPageActivetrue.png deleted file mode 100644 index e236b93..0000000 Binary files a/src/resources/evalPiedPageActivetrue.png and /dev/null differ diff --git a/src/resources/evalPiedPageActivetruemini.png b/src/resources/evalPiedPageActivetruemini.png deleted file mode 100644 index 280a629..0000000 Binary files a/src/resources/evalPiedPageActivetruemini.png and /dev/null differ diff --git a/src/resources/evalPiedPagePasActivefalse.png b/src/resources/evalPiedPagePasActivefalse.png deleted file mode 100644 index 42457a7..0000000 Binary files a/src/resources/evalPiedPagePasActivefalse.png and /dev/null differ diff --git a/src/resources/evalPiedPagePasActivefalsemini.png b/src/resources/evalPiedPagePasActivefalsemini.png deleted file mode 100644 index a9e5e5e..0000000 Binary files a/src/resources/evalPiedPagePasActivefalsemini.png and /dev/null differ diff --git a/src/resources/evalPiedPagePasActivetrue.png b/src/resources/evalPiedPagePasActivetrue.png deleted file mode 100644 index 4f4414f..0000000 Binary files a/src/resources/evalPiedPagePasActivetrue.png and /dev/null differ diff --git a/src/resources/evalPiedPagePasActivetruemini.png b/src/resources/evalPiedPagePasActivetruemini.png deleted file mode 100644 index 7da61bc..0000000 Binary files a/src/resources/evalPiedPagePasActivetruemini.png and /dev/null differ diff --git a/src/resources/evalformatagedirectfalse.png b/src/resources/evalformatagedirectfalse.png deleted file mode 100644 index 369369a..0000000 Binary files a/src/resources/evalformatagedirectfalse.png and /dev/null differ diff --git a/src/resources/evalformatagedirectfalsemini.png b/src/resources/evalformatagedirectfalsemini.png deleted file mode 100644 index 4c559e8..0000000 Binary files a/src/resources/evalformatagedirectfalsemini.png and /dev/null differ diff --git a/src/resources/evalformatagedirecttrue.png b/src/resources/evalformatagedirecttrue.png deleted file mode 100644 index 36ce2c7..0000000 Binary files a/src/resources/evalformatagedirecttrue.png and /dev/null differ diff --git a/src/resources/evalformatagedirecttruemini.png b/src/resources/evalformatagedirecttruemini.png deleted file mode 100644 index 926424b..0000000 Binary files a/src/resources/evalformatagedirecttruemini.png and /dev/null differ diff --git a/src/resources/evalnamepagefalse.png b/src/resources/evalnamepagefalse.png deleted file mode 100644 index e3f22ae..0000000 Binary files a/src/resources/evalnamepagefalse.png and /dev/null differ diff --git a/src/resources/evalnamepagefalsemini.png b/src/resources/evalnamepagefalsemini.png deleted file mode 100644 index 643e898..0000000 Binary files a/src/resources/evalnamepagefalsemini.png and /dev/null differ diff --git a/src/resources/evalnamepagetrue.png b/src/resources/evalnamepagetrue.png deleted file mode 100644 index faa836b..0000000 Binary files a/src/resources/evalnamepagetrue.png and /dev/null differ diff --git a/src/resources/evalnamepagetruemini.png b/src/resources/evalnamepagetruemini.png deleted file mode 100644 index a379a46..0000000 Binary files a/src/resources/evalnamepagetruemini.png and /dev/null differ diff --git a/src/resources/evalnode.png b/src/resources/evalnode.png new file mode 100644 index 0000000..bee3ec2 Binary files /dev/null and b/src/resources/evalnode.png differ diff --git a/src/resources/evalnodefalse.png b/src/resources/evalnodefalse.png deleted file mode 100644 index f523d12..0000000 Binary files a/src/resources/evalnodefalse.png and /dev/null differ diff --git a/src/resources/evalnodefalsemini.png b/src/resources/evalnodefalsemini.png deleted file mode 100644 index b45734a..0000000 Binary files a/src/resources/evalnodefalsemini.png and /dev/null differ diff --git a/src/resources/evalnodemini.png b/src/resources/evalnodemini.png index 35776fd..22f355d 100644 Binary files a/src/resources/evalnodemini.png and b/src/resources/evalnodemini.png differ diff --git a/src/resources/evalnodetrue.png b/src/resources/evalnodetrue.png deleted file mode 100644 index 6cb569b..0000000 Binary files a/src/resources/evalnodetrue.png and /dev/null differ diff --git a/src/resources/evalnodetruemini.png b/src/resources/evalnodetruemini.png deleted file mode 100644 index acb5ca9..0000000 Binary files a/src/resources/evalnodetruemini.png and /dev/null differ diff --git a/src/resources/evalnumeroabsoluepagefalse.png b/src/resources/evalnumeroabsoluepagefalse.png deleted file mode 100644 index 16cb8e1..0000000 Binary files a/src/resources/evalnumeroabsoluepagefalse.png and /dev/null differ diff --git a/src/resources/evalnumeroabsoluepagefalsemini.png b/src/resources/evalnumeroabsoluepagefalsemini.png deleted file mode 100644 index 5ec0dc6..0000000 Binary files a/src/resources/evalnumeroabsoluepagefalsemini.png and /dev/null differ diff --git a/src/resources/evalnumeroabsoluepagetrue.png b/src/resources/evalnumeroabsoluepagetrue.png deleted file mode 100644 index 0989d16..0000000 Binary files a/src/resources/evalnumeroabsoluepagetrue.png and /dev/null differ diff --git a/src/resources/evalnumeroabsoluepagetruemini.png b/src/resources/evalnumeroabsoluepagetruemini.png deleted file mode 100644 index 94b0ade..0000000 Binary files a/src/resources/evalnumeroabsoluepagetruemini.png and /dev/null differ diff --git a/src/resources/evalnumeropageancragefalse.png b/src/resources/evalnumeropageancragefalse.png deleted file mode 100644 index 06ff5de..0000000 Binary files a/src/resources/evalnumeropageancragefalse.png and /dev/null differ diff --git a/src/resources/evalnumeropageancragefalsemini.png b/src/resources/evalnumeropageancragefalsemini.png deleted file mode 100644 index be80433..0000000 Binary files a/src/resources/evalnumeropageancragefalsemini.png and /dev/null differ diff --git a/src/resources/evalnumeropageancragetrue.png b/src/resources/evalnumeropageancragetrue.png deleted file mode 100644 index 8c9ebb3..0000000 Binary files a/src/resources/evalnumeropageancragetrue.png and /dev/null differ diff --git a/src/resources/evalnumeropageancragetruemini.gng b/src/resources/evalnumeropageancragetruemini.gng deleted file mode 100644 index 2835ece..0000000 Binary files a/src/resources/evalnumeropageancragetruemini.gng and /dev/null differ diff --git a/src/resources/evalnumeropagefalse.png b/src/resources/evalnumeropagefalse.png deleted file mode 100644 index 46c3f50..0000000 Binary files a/src/resources/evalnumeropagefalse.png and /dev/null differ diff --git a/src/resources/evalnumeropagefalsemini.png b/src/resources/evalnumeropagefalsemini.png deleted file mode 100644 index b8fd380..0000000 Binary files a/src/resources/evalnumeropagefalsemini.png and /dev/null differ diff --git a/src/resources/evalnumeropagetrue.png b/src/resources/evalnumeropagetrue.png deleted file mode 100644 index 58ddf62..0000000 Binary files a/src/resources/evalnumeropagetrue.png and /dev/null differ diff --git a/src/resources/evalnumeropagetruemini.png b/src/resources/evalnumeropagetruemini.png deleted file mode 100644 index bba6b30..0000000 Binary files a/src/resources/evalnumeropagetruemini.png and /dev/null differ diff --git a/src/resources/evalpasparagraphevidefalse.png b/src/resources/evalpasparagraphevidefalse.png deleted file mode 100644 index 6193003..0000000 Binary files a/src/resources/evalpasparagraphevidefalse.png and /dev/null differ diff --git a/src/resources/evalpasparagraphevidefalsemini.png b/src/resources/evalpasparagraphevidefalsemini.png deleted file mode 100644 index 311752b..0000000 Binary files a/src/resources/evalpasparagraphevidefalsemini.png and /dev/null differ diff --git a/src/resources/evalpasparagraphevidetrue.png b/src/resources/evalpasparagraphevidetrue.png deleted file mode 100644 index fc65743..0000000 Binary files a/src/resources/evalpasparagraphevidetrue.png and /dev/null differ diff --git a/src/resources/evalpasparagraphevidetruemini.png b/src/resources/evalpasparagraphevidetruemini.png deleted file mode 100644 index 9d976b7..0000000 Binary files a/src/resources/evalpasparagraphevidetruemini.png and /dev/null differ diff --git a/src/resources/evalplacementparagraphefalse.png b/src/resources/evalplacementparagraphefalse.png deleted file mode 100644 index 0e618fc..0000000 Binary files a/src/resources/evalplacementparagraphefalse.png and /dev/null differ diff --git a/src/resources/evalplacementparagraphefalsemini.png b/src/resources/evalplacementparagraphefalsemini.png deleted file mode 100644 index aea3a33..0000000 Binary files a/src/resources/evalplacementparagraphefalsemini.png and /dev/null differ diff --git a/src/resources/evalplacementparagraphetrue.png b/src/resources/evalplacementparagraphetrue.png deleted file mode 100644 index cd59b59..0000000 Binary files a/src/resources/evalplacementparagraphetrue.png and /dev/null differ diff --git a/src/resources/evalplacementparagraphetruemini.png b/src/resources/evalplacementparagraphetruemini.png deleted file mode 100644 index a67a78c..0000000 Binary files a/src/resources/evalplacementparagraphetruemini.png and /dev/null differ diff --git a/src/resources/evaltabalgngauchefalse.png b/src/resources/evaltabalgngauchefalse.png deleted file mode 100644 index 114e245..0000000 Binary files a/src/resources/evaltabalgngauchefalse.png and /dev/null differ diff --git a/src/resources/evaltabalgngauchefalsemini.png b/src/resources/evaltabalgngauchefalsemini.png deleted file mode 100644 index 270a6e2..0000000 Binary files a/src/resources/evaltabalgngauchefalsemini.png and /dev/null differ diff --git a/src/resources/evaltabalgngauchetrue.png b/src/resources/evaltabalgngauchetrue.png deleted file mode 100644 index f88191f..0000000 Binary files a/src/resources/evaltabalgngauchetrue.png and /dev/null differ diff --git a/src/resources/evaltabalgngauchetruemini.png b/src/resources/evaltabalgngauchetruemini.png deleted file mode 100644 index 4cf3a99..0000000 Binary files a/src/resources/evaltabalgngauchetruemini.png and /dev/null differ diff --git a/src/resources/evaluerspan.png b/src/resources/evaluerspan.png deleted file mode 100644 index b301bb5..0000000 Binary files a/src/resources/evaluerspan.png and /dev/null differ diff --git a/src/resources/evaluerstylefalse.png b/src/resources/evaluerstylefalse.png deleted file mode 100644 index 81a46dd..0000000 Binary files a/src/resources/evaluerstylefalse.png and /dev/null differ diff --git a/src/resources/evaluerstylefalsemini.png b/src/resources/evaluerstylefalsemini.png deleted file mode 100644 index df052e3..0000000 Binary files a/src/resources/evaluerstylefalsemini.png and /dev/null differ diff --git a/src/resources/evaluerstyletrue.png b/src/resources/evaluerstyletrue.png deleted file mode 100644 index 0b07670..0000000 Binary files a/src/resources/evaluerstyletrue.png and /dev/null differ diff --git a/src/resources/evaluerstyletruemini.png b/src/resources/evaluerstyletruemini.png deleted file mode 100644 index 2275ddf..0000000 Binary files a/src/resources/evaluerstyletruemini.png and /dev/null differ diff --git a/src/resources/heritagestylefalse.png b/src/resources/heritagestylefalse.png deleted file mode 100644 index 260d254..0000000 Binary files a/src/resources/heritagestylefalse.png and /dev/null differ diff --git a/src/resources/heritagestylefalsemini.png b/src/resources/heritagestylefalsemini.png deleted file mode 100644 index 230958f..0000000 Binary files a/src/resources/heritagestylefalsemini.png and /dev/null differ diff --git a/src/resources/heritagestyletrue.png b/src/resources/heritagestyletrue.png deleted file mode 100644 index a6a1114..0000000 Binary files a/src/resources/heritagestyletrue.png and /dev/null differ diff --git a/src/resources/heritagestyletruemini.png b/src/resources/heritagestyletruemini.png deleted file mode 100644 index 6482a84..0000000 Binary files a/src/resources/heritagestyletruemini.png and /dev/null differ diff --git a/src/resources/premierenfant.png b/src/resources/premierenfant.png index 641b2ad..37fec37 100644 Binary files a/src/resources/premierenfant.png and b/src/resources/premierenfant.png differ diff --git a/src/resources/premierenfantmini.png b/src/resources/premierenfantmini.png index df96977..eefeacd 100644 Binary files a/src/resources/premierenfantmini.png and b/src/resources/premierenfantmini.png differ diff --git a/src/resources/sautpagecolonnefalse.png b/src/resources/sautpagecolonnefalse.png deleted file mode 100644 index c0f3e3a..0000000 Binary files a/src/resources/sautpagecolonnefalse.png and /dev/null differ diff --git a/src/resources/sautpagecolonnefalsemini.png b/src/resources/sautpagecolonnefalsemini.png deleted file mode 100644 index 6b01cd5..0000000 Binary files a/src/resources/sautpagecolonnefalsemini.png and /dev/null differ diff --git a/src/resources/sautpagecolonnetrue.png b/src/resources/sautpagecolonnetrue.png deleted file mode 100644 index 021e4f6..0000000 Binary files a/src/resources/sautpagecolonnetrue.png and /dev/null differ diff --git a/src/resources/sautpagecolonnetruemini.png b/src/resources/sautpagecolonnetruemini.png deleted file mode 100644 index 35d5e82..0000000 Binary files a/src/resources/sautpagecolonnetruemini.png and /dev/null differ