diff --git a/.classpath b/.classpath index 148593c..4b5675b 100644 --- a/.classpath +++ b/.classpath @@ -12,6 +12,6 @@ - + diff --git a/analyseWriter.exe b/analyseWriter.exe index 2953904..0acc13d 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index a6ad0d7..ae5479d 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 27c8b35..919491a 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,16 +1,4 @@ +/calcul/ +/evaluer/ /fenetres/ /list/ -/evaluer/ -/MEPTL/ -/resources/ -/dernierenfant.png -/dernierenfant.svg -/dernierenfantmini.png -/information.png -/information.svg -/informationmaxi.png -/informationmini.png -/premierenfant.png -/premierenfant.svg -/premierenfantmini.png -/calcul/ diff --git a/bin/dernierenfant.png b/bin/dernierenfant.png new file mode 100644 index 0000000..9194d93 Binary files /dev/null and b/bin/dernierenfant.png differ diff --git a/bin/dernierenfant.svg b/bin/dernierenfant.svg new file mode 100644 index 0000000..51943c2 --- /dev/null +++ b/bin/dernierenfant.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + diff --git a/bin/dernierenfantmini.png b/bin/dernierenfantmini.png new file mode 100644 index 0000000..8ec0970 Binary files /dev/null and b/bin/dernierenfantmini.png differ diff --git a/bin/fenetres/create_act/actNewFichierAnalyse.class b/bin/fenetres/create_act/actNewFichierAnalyse.class index 6b06ddd..a0ddaf6 100644 Binary files a/bin/fenetres/create_act/actNewFichierAnalyse.class and b/bin/fenetres/create_act/actNewFichierAnalyse.class differ diff --git a/bin/fenetres/evaluerLesFichiersEtudiants.class b/bin/fenetres/evaluerLesFichiersEtudiants.class index 4011f15..26d0348 100644 Binary files a/bin/fenetres/evaluerLesFichiersEtudiants.class and b/bin/fenetres/evaluerLesFichiersEtudiants.class differ diff --git a/bin/information.png b/bin/information.png new file mode 100644 index 0000000..d386f4d Binary files /dev/null and b/bin/information.png differ diff --git a/bin/information.svg b/bin/information.svg new file mode 100644 index 0000000..f274821 --- /dev/null +++ b/bin/information.svg @@ -0,0 +1,72 @@ + + + + diff --git a/bin/informationmaxi.png b/bin/informationmaxi.png new file mode 100644 index 0000000..f8a63e6 Binary files /dev/null and b/bin/informationmaxi.png differ diff --git a/bin/informationmini.png b/bin/informationmini.png new file mode 100644 index 0000000..dd71230 Binary files /dev/null and b/bin/informationmini.png differ diff --git a/bin/premierenfant.png b/bin/premierenfant.png new file mode 100644 index 0000000..f5cfc58 Binary files /dev/null and b/bin/premierenfant.png differ diff --git a/bin/premierenfant.svg b/bin/premierenfant.svg new file mode 100644 index 0000000..2df4fd4 --- /dev/null +++ b/bin/premierenfant.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + diff --git a/bin/premierenfantmini.png b/bin/premierenfantmini.png new file mode 100644 index 0000000..4e6241c Binary files /dev/null and b/bin/premierenfantmini.png differ diff --git a/bin/resources/dernierenfant.png b/bin/resources/dernierenfant.png new file mode 100644 index 0000000..9194d93 Binary files /dev/null and b/bin/resources/dernierenfant.png differ diff --git a/bin/resources/dernierenfantmini.png b/bin/resources/dernierenfantmini.png new file mode 100644 index 0000000..8ec0970 Binary files /dev/null and b/bin/resources/dernierenfantmini.png differ diff --git a/bin/resources/information.png b/bin/resources/information.png new file mode 100644 index 0000000..d386f4d Binary files /dev/null and b/bin/resources/information.png differ diff --git a/bin/resources/informationmaxi.png b/bin/resources/informationmaxi.png new file mode 100644 index 0000000..f8a63e6 Binary files /dev/null and b/bin/resources/informationmaxi.png differ diff --git a/bin/resources/informationmini.png b/bin/resources/informationmini.png new file mode 100644 index 0000000..dd71230 Binary files /dev/null and b/bin/resources/informationmini.png differ diff --git a/bin/resources/premierenfant.png b/bin/resources/premierenfant.png new file mode 100644 index 0000000..f5cfc58 Binary files /dev/null and b/bin/resources/premierenfant.png differ diff --git a/bin/resources/premierenfantmini.png b/bin/resources/premierenfantmini.png new file mode 100644 index 0000000..4e6241c Binary files /dev/null and b/bin/resources/premierenfantmini.png differ diff --git a/src/fenetres/create_act/actNewFichierAnalyse.java b/src/fenetres/create_act/actNewFichierAnalyse.java index 40cd57a..e7fdfbd 100644 --- a/src/fenetres/create_act/actNewFichierAnalyse.java +++ b/src/fenetres/create_act/actNewFichierAnalyse.java @@ -79,11 +79,11 @@ public class actNewFichierAnalyse extends AbstractAction{ //Supprime l'historique des modifications commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); -// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:deletion"); -// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-start"); -// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-end"); -// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); -// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change"); + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:deletion"); + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-start"); + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-end"); + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change"); commandes.sujet = meptl.LectureFichierEtudiantSousFormeDeNode(commandes.sujet,b,0); diff --git a/src/fenetres/evaluerLesFichiersEtudiants.java b/src/fenetres/evaluerLesFichiersEtudiants.java index 4593836..41a4824 100644 --- a/src/fenetres/evaluerLesFichiersEtudiants.java +++ b/src/fenetres/evaluerLesFichiersEtudiants.java @@ -152,6 +152,11 @@ public class evaluerLesFichiersEtudiants implements Runnable{ try { //Supprime l'historique des modifications nod.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); + nod.supprimeTousLesNodesEnfantWithThisName("text:deletion"); + nod.supprimeTousLesNodesEnfantWithThisName("text:change-start"); + nod.supprimeTousLesNodesEnfantWithThisName("text:change-end"); + nod.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); + nod.supprimeTousLesNodesEnfantWithThisName("text:change"); //Création du node de l'étudiant nodStudent = meptl.LectureFichierEtudiantSousFormeDeNode(nod,a,i); } catch (IOException e1) {