diff --git a/.classpath b/.classpath
index 869a31d..033eb86 100644
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,6 @@
-
+
diff --git a/Menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java b/Menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java
index debea82..f8a976a 100644
--- a/Menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java
+++ b/Menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java
@@ -3,7 +3,6 @@ package menucontextuel;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
-import action.actAllContentChilds;
import cXML.node;
import fenetres.create;
import list.listeDesNodesPourEvaluerPage;
@@ -33,8 +32,6 @@ public class MnGroupeMethodeEvaluerMultiple {
mnGroupeMethodeEvaluerMultiple.setIcon( new ImageIcon(create.class.getResource("/resources/evaluatemultiplemini.png")));
if(nod.getNomElt().equals("structurepage")) {
- mnGroupeMethodeEvaluerMultiple.addSeparator();
- mnGroupeMethodeEvaluerMultiple.add(new actAllContentChilds());
mnGroupeMethodeEvaluerMultiple.addSeparator();
mnGroupeMethodeEvaluerMultiple.add(mnEvalNamePage.menu());
mnGroupeMethodeEvaluerMultiple.addSeparator();
@@ -51,8 +48,6 @@ public class MnGroupeMethodeEvaluerMultiple {
if(nod.getNomElt().equals("text:p") || nod.getNomElt().equals("text:h") || nod.getNomElt().equals("text:list")
|| nod.getNomElt().equals("text:list-item") || nod.getNomElt().equals("text:index-body") ) {
mnGroupeMethodeEvaluerMultiple.addSeparator();
- mnGroupeMethodeEvaluerMultiple.add(new actAllContentChilds());
- mnGroupeMethodeEvaluerMultiple.addSeparator();
mnGroupeMethodeEvaluerMultiple.add(mnEvalNameNodeEnfants.menu());
mnGroupeMethodeEvaluerMultiple.addSeparator();
mnGroupeMethodeEvaluerMultiple.add(mnEvalPlacementDesEnfants.menu());
@@ -60,8 +55,6 @@ public class MnGroupeMethodeEvaluerMultiple {
if(listeDesNodesPourEvaluerPage.isPage(nod)) {
- mnGroupeMethodeEvaluerMultiple.addSeparator();
- mnGroupeMethodeEvaluerMultiple.add(new actAllContentChilds());
mnGroupeMethodeEvaluerMultiple.addSeparator();
mnGroupeMethodeEvaluerMultiple.add(mnEvalNameNodeEnfants.menu());
mnGroupeMethodeEvaluerMultiple.addSeparator();
diff --git a/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java b/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java
index 418cd81..45b0c6e 100644
--- a/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java
+++ b/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java
@@ -3,7 +3,7 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
-import action.actEvalFormatageDirectOui;
+import action.actEvalFormatageDirect;
import fenetres.create;
/**
@@ -17,8 +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/sautpagecolonnemini.png")));
- mnEvalFormatageDirect.add(new actEvalFormatageDirectOui());
+ mnEvalFormatageDirect.setIcon( new ImageIcon(create.class.getResource("/resources/evalformatagedirectmini.png")));
+ mnEvalFormatageDirect.add(new actEvalFormatageDirect());
return mnEvalFormatageDirect;
}
}
diff --git a/Menu/sousmenuEvaluation/mnEvalTousParagraphes.java b/Menu/sousmenuEvaluation/mnEvalTousParagraphes.java
index 86096c6..d45d19e 100644
--- a/Menu/sousmenuEvaluation/mnEvalTousParagraphes.java
+++ b/Menu/sousmenuEvaluation/mnEvalTousParagraphes.java
@@ -3,7 +3,6 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
-import action.actAllContentChilds;
import fenetres.create;
/**
@@ -15,8 +14,6 @@ public class mnEvalTousParagraphes {
public static JMenu menu() {
JMenu mnEvalTousParagraphes = new JMenu("Tous les paragraphes de texte");
mnEvalTousParagraphes.setIcon( new ImageIcon(create.class.getResource("/resources/menuEvalTousParagraphemini.png")));
- mnEvalTousParagraphes.add(new actAllContentChilds());
- mnEvalTousParagraphes.addSeparator();
mnEvalTousParagraphes.add(mnEvalNameLegacyStyleTousLesNodes.menu());
mnEvalTousParagraphes.addSeparator();
mnEvalTousParagraphes.add(mnEvalFormatageDirectTousLesNodes.menu());
diff --git a/analyseWriter.exe b/analyseWriter.exe
index 5d1e831..f33012d 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/bin/.gitignore b/bin/.gitignore
index 067a124..b76e7e4 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,159 +1,8 @@
/MEPTL/
/OnLineVersions/
/action/
-/auteurcreateurmini.png
-/auteurediteur.png
-/auteurediteur.svg
-/auteurediteurmini.png
/baseEvaluations/
-/biblio.png
-/biblio.svg
/calcul/
-/chargehistoriqueevaluation.png
-/chargehistoriqueevaluationmini.png
-/collapseAll.svg
-/collapseNode.svg
-/collapseallmini.png
-/collapsenodemini.png
-/configuration.png
-/configuration.svg
-/content.png
-/content.svg
-/copy.png
-/couleur.png
-/couleur.svg
-/couleurmini.png
-/csvstudent.png
-/csvstudent.svg
-/csvstudentmini.png
-/cut.png
-/defautBaseEvaluation.png
-/defautBaseEvaluation.svg
-/dernierenfant.png
-/dernierenfant.svg
-/dernierenfantmini.png
-/dessin.svgparamètres évaluation et feedback.svg
-/detailfeedback.png
-/detailfeedbackmini.png
-/documentation.pdf
-/documentation.png
-/documentation.svg
-/documentationmax.png
-/documentationmini.png
-/dossieretudiant.png
-/dossieretudiant.svg
-/dossieretudiantmin.png
-/dossieretudiantmini.png
-/downnode.png
-/downnode.svg
-/downnodemini.png
-/entetenon.png
-/entetenon.svg
-/entetenonmini.png
-/enteteoui.png
-/enteteoui.svg
-/enteteouimini.png
-/et.png
-/et.svg
-/etmini.png
-/evalFirstChildfalse.png
-/evalFirstChildfalsemini.png
-/evalFirstChildtrue.png
-/evalFirstChildtruemini.png
-/evalLastChildfalse.png
-/evalLastChildfalsemini.png
-/evalLastChildtrue.png
-/evalLastChildtruemini.png
-/evalPiedPageActivefalse.png
-/evalPiedPageActivefalsemini.png
-/evalPiedPageActiveoui.png
-/evalPiedPageActiveouimini.png
-/evalPiedPageActivetrue.png
-/evalPiedPageActivetruemini.png
-/evalPiedPagePasActivefalse.png
-/evalPiedPagePasActivefalsemini.png
-/evalPiedPagePasActivetrue.png
-/evalPiedPagePasActivetruemini.png
-/evalcalc.png
-/evalformatagedirect.png
-/evalformatagedirect.svg
-/evalformatagedirectfalse.png
-/evalformatagedirectfalsemini.png
-/evalformatagedirectmini.png
-/evalformatagedirecttrue.png
-/evalformatagedirecttruemini.png
-/evalnamepage.png
-/evalnamepage.svg
-/evalnamepagefalse.png
-/evalnamepagefalsemini.png
-/evalnamepagemini.png
-/evalnamepagetrue.png
-/evalnamepagetruemini.png
-/evalnamesequence.png
-/evalnamesequence.svg
-/evalnamesequencemini.png
-/evalnode.svg
-/evalnodefalse.png
-/evalnodefalsemini.png
-/evalnodemini.png
-/evalnodetrue.png
-/evalnodetruemini.png
-/evalnombredepagemaxi.png
-/evalnombredepagemaxi.svg
-/evalnombredepagemaximini.png
-/evalnombredepagemini.png
-/evalnombredepageminimini.png
-/evalnumeroabsoluepage.png
-/evalnumeroabsoluepage.svg
-/evalnumeroabsoluepagefalse.png
-/evalnumeroabsoluepagefalsemini.png
-/evalnumeroabsoluepagemini.png
-/evalnumeroabsoluepagetrue.png
-/evalnumeroabsoluepagetruemini.png
-/evalnumeropage.png
-/evalnumeropage.svg
-/evalnumeropageancrage.png
-/evalnumeropageancrage.svg
-/evalnumeropageancragefalse.png
-/evalnumeropageancragefalsemini.png
-/evalnumeropageancragemini.png
-/evalnumeropageancragetrue.png
-/evalnumeropageancragetruemini.png
-/evalnumeropagefalse.png
-/evalnumeropagefalsemini.png
-/evalnumeropagemini.png
-/evalnumeropagetrue.png
-/evalnumeropagetruemini.png
-/evalpasparagraphevide.png
-/evalpasparagraphevide.svg
-/evalpasparagraphevidefalse.png
-/evalpasparagraphevidefalsemini.png
-/evalpasparagraphevidemini.png
-/evalpasparagraphevidetrue.png
-/evalpasparagraphevidetruemini.png
-/evalplacementparagraphefalse.png
-/evalplacementparagraphefalsemini.png
-/evalplacementparagraphetrue.png
-/evalplacementparagraphetruemini.png
-/evaltabalgngauche.png
-/evaltabalgngauchefalse.png
-/evaltabalgngauchefalsemini.png
-/evaltabalgngauchemini.png
-/evaltabalgngauchetrue.png
-/evaltabalgngauchetruemini.png
-/evaltabaligngauche.svg
-/evaltabstyleleader.png
-/evaltabstyleleader.svg
-/evaltabstyleleadermini.png
-/evaltextuserdefined.png
-/evaltextuserdefined.svg
-/evaltextuserdefinedmini.png
-/evaluate.png
-/evaluate.svg
-/evaluatemax.png
-/evaluatemini.png
-/evaluatemultiple.png
-/evaluatemultiple.svg
/evaluatemultiplemax.png
/evaluatemultiplemini.png
/evaluer.png
@@ -466,6 +315,9 @@
/styleparagraphe.png
/styleparagraphe.svg
/supprime.svg
+/supprimeAttribut.png
+/supprimeAttribut.svg
+/supprimeAttributmini.png
/supprimemini.png
/textclean.png
/textclean.svg
@@ -528,15 +380,3 @@
/zipstudent.png
/zipstudent.svg
/zipstudentmini.png
-/resources/
-/EvalTabDefautStyleLeaderfalse.png
-/EvalTabDefautStyleLeaderfalsemini.png
-/EvalTabDefautStyleLeadertrue.png
-/EvalTabDefautStyleLeadertruemini.png
-/supprimeAttribut.png
-/supprimeAttribut.svg
-/supprimeAttributmini.png
-/atraversanalysestylefalse.png
-/atraversanalysestylefalsemini.png
-/atraversanalysestyletrue.png
-/atraversanalysestyletruemini.png
diff --git a/bin/EvalTabDefautStyleLeaderfalse.png b/bin/EvalTabDefautStyleLeaderfalse.png
new file mode 100644
index 0000000..1482d65
Binary files /dev/null and b/bin/EvalTabDefautStyleLeaderfalse.png differ
diff --git a/bin/EvalTabDefautStyleLeaderfalsemini.png b/bin/EvalTabDefautStyleLeaderfalsemini.png
new file mode 100644
index 0000000..ebb47dc
Binary files /dev/null and b/bin/EvalTabDefautStyleLeaderfalsemini.png differ
diff --git a/bin/EvalTabDefautStyleLeadertrue.png b/bin/EvalTabDefautStyleLeadertrue.png
new file mode 100644
index 0000000..dc6bf18
Binary files /dev/null and b/bin/EvalTabDefautStyleLeadertrue.png differ
diff --git a/bin/EvalTabDefautStyleLeadertruemini.png b/bin/EvalTabDefautStyleLeadertruemini.png
new file mode 100644
index 0000000..52ec5f1
Binary files /dev/null and b/bin/EvalTabDefautStyleLeadertruemini.png differ
diff --git a/bin/atraversanalysestylefalse.png b/bin/atraversanalysestylefalse.png
new file mode 100644
index 0000000..2ac6c5a
Binary files /dev/null and b/bin/atraversanalysestylefalse.png differ
diff --git a/bin/atraversanalysestylefalsemini.png b/bin/atraversanalysestylefalsemini.png
new file mode 100644
index 0000000..b7ffb6e
Binary files /dev/null and b/bin/atraversanalysestylefalsemini.png differ
diff --git a/bin/atraversanalysestyletrue.png b/bin/atraversanalysestyletrue.png
new file mode 100644
index 0000000..c0e52b3
Binary files /dev/null and b/bin/atraversanalysestyletrue.png differ
diff --git a/bin/atraversanalysestyletruemini.png b/bin/atraversanalysestyletruemini.png
new file mode 100644
index 0000000..3099742
Binary files /dev/null and b/bin/atraversanalysestyletruemini.png differ
diff --git a/bin/evalPiedPageActivefalse.png b/bin/evalPiedPageActivefalse.png
new file mode 100644
index 0000000..a61525c
Binary files /dev/null and b/bin/evalPiedPageActivefalse.png differ
diff --git a/bin/evalPiedPageActivefalsemini.png b/bin/evalPiedPageActivefalsemini.png
new file mode 100644
index 0000000..c12e566
Binary files /dev/null and b/bin/evalPiedPageActivefalsemini.png differ
diff --git a/bin/evalPiedPageActiveoui.png b/bin/evalPiedPageActiveoui.png
new file mode 100644
index 0000000..e236b93
Binary files /dev/null and b/bin/evalPiedPageActiveoui.png differ
diff --git a/bin/evalPiedPageActiveouimini.png b/bin/evalPiedPageActiveouimini.png
new file mode 100644
index 0000000..280a629
Binary files /dev/null and b/bin/evalPiedPageActiveouimini.png differ
diff --git a/bin/evalPiedPageActivetrue.png b/bin/evalPiedPageActivetrue.png
new file mode 100644
index 0000000..e236b93
Binary files /dev/null and b/bin/evalPiedPageActivetrue.png differ
diff --git a/bin/evalPiedPageActivetruemini.png b/bin/evalPiedPageActivetruemini.png
new file mode 100644
index 0000000..280a629
Binary files /dev/null and b/bin/evalPiedPageActivetruemini.png differ
diff --git a/bin/evalPiedPagePasActivefalse.png b/bin/evalPiedPagePasActivefalse.png
new file mode 100644
index 0000000..42457a7
Binary files /dev/null and b/bin/evalPiedPagePasActivefalse.png differ
diff --git a/bin/evalPiedPagePasActivefalsemini.png b/bin/evalPiedPagePasActivefalsemini.png
new file mode 100644
index 0000000..a9e5e5e
Binary files /dev/null and b/bin/evalPiedPagePasActivefalsemini.png differ
diff --git a/bin/evalPiedPagePasActivetrue.png b/bin/evalPiedPagePasActivetrue.png
new file mode 100644
index 0000000..4f4414f
Binary files /dev/null and b/bin/evalPiedPagePasActivetrue.png differ
diff --git a/bin/evalPiedPagePasActivetruemini.png b/bin/evalPiedPagePasActivetruemini.png
new file mode 100644
index 0000000..7da61bc
Binary files /dev/null and b/bin/evalPiedPagePasActivetruemini.png differ
diff --git a/bin/evalnode.png b/bin/evalnode.png
new file mode 100644
index 0000000..bee3ec2
Binary files /dev/null and b/bin/evalnode.png differ
diff --git a/bin/evaltabalgngauchefalse.png b/bin/evaltabalgngauchefalse.png
new file mode 100644
index 0000000..114e245
Binary files /dev/null and b/bin/evaltabalgngauchefalse.png differ
diff --git a/bin/evaltabalgngauchefalsemini.png b/bin/evaltabalgngauchefalsemini.png
new file mode 100644
index 0000000..270a6e2
Binary files /dev/null and b/bin/evaltabalgngauchefalsemini.png differ
diff --git a/bin/evaltabalgngauchetrue.png b/bin/evaltabalgngauchetrue.png
new file mode 100644
index 0000000..f88191f
Binary files /dev/null and b/bin/evaltabalgngauchetrue.png differ
diff --git a/bin/evaltabalgngauchetruemini.png b/bin/evaltabalgngauchetruemini.png
new file mode 100644
index 0000000..4cf3a99
Binary files /dev/null and b/bin/evaltabalgngauchetruemini.png differ
diff --git a/bin/resources/evalnode.png b/bin/resources/evalnode.png
new file mode 100644
index 0000000..bee3ec2
Binary files /dev/null and b/bin/resources/evalnode.png differ
diff --git a/bin/resources/supprimeAttributmini.png b/bin/resources/supprimeAttributmini.png
new file mode 100644
index 0000000..9198ac5
Binary files /dev/null and b/bin/resources/supprimeAttributmini.png differ
diff --git a/src/action/actAllContent.java b/src/action/actAllContent.java
index 988ed01..c6f0b94 100644
--- a/src/action/actAllContent.java
+++ b/src/action/actAllContent.java
@@ -31,7 +31,7 @@ public class actAllContent extends AbstractAction{
public void actionPerformed(ActionEvent e) {
node nod = (node) fenetres.create.getSelectNode().getUserObject();
if(listeDesNodesAllContent.isAllContent(nod)) {
- new allContent(nod,fenetres.create.getTextNodeSelect(),false);
+ new allContent(nod,fenetres.create.getTextNodeSelect());
}
}
}
diff --git a/src/action/actAllContentChilds.java b/src/action/actAllContentChilds.java
deleted file mode 100644
index 3cfa180..0000000
--- a/src/action/actAllContentChilds.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.allContent;
-import fenetres.create;
-
-public class actAllContentChilds extends AbstractAction{
- {
- putValue( Action.NAME, "Evaluer le contenu de tous les nodes enfants" );
- putValue( Action.SHORT_DESCRIPTION, "Evaluer le contenu de tous les nodes enfants" );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/allcontentchildsmini.png")) );
- }
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- @Override
- public void actionPerformed(ActionEvent e) {
- node nod = (node) fenetres.create.getSelectNode().getUserObject();
- new allContent(nod,fenetres.create.getTextNodeSelect(),true);
- }
-
-}
diff --git a/src/action/actEvalAncrageNumeroAbsoluePageOui.java b/src/action/actEvalAncrageNumeroAbsoluePageOui.java
index e82d818..070e85d 100644
--- a/src/action/actEvalAncrageNumeroAbsoluePageOui.java
+++ b/src/action/actEvalAncrageNumeroAbsoluePageOui.java
@@ -28,7 +28,7 @@ public class actEvalAncrageNumeroAbsoluePageOui extends AbstractAction{
"
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",
+ + "d'évaluation evalAncrageNumeroAbsoluePage