diff --git a/bin/.gitignore b/bin/.gitignore
index 0de8298..5bdc3d2 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,5 +1,3 @@
-/list/
+/outils/
/fenetres/
/nodeAC/
-/outils/
-/AnalyseCalc/
diff --git a/bin/list/listeAttributCalcValeurPasModifiable.class b/bin/list/listeAttributCalcValeurPasModifiable.class
new file mode 100644
index 0000000..3a52a48
Binary files /dev/null and b/bin/list/listeAttributCalcValeurPasModifiable.class differ
diff --git a/bin/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.class b/bin/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.class
new file mode 100644
index 0000000..2b8ec95
Binary files /dev/null and b/bin/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.class differ
diff --git a/bin/list/listeAttributsAnalyseCalc.class b/bin/list/listeAttributsAnalyseCalc.class
new file mode 100644
index 0000000..94958bd
Binary files /dev/null and b/bin/list/listeAttributsAnalyseCalc.class differ
diff --git a/bin/list/listeEvalNameNode.class b/bin/list/listeEvalNameNode.class
new file mode 100644
index 0000000..fdd0442
Binary files /dev/null and b/bin/list/listeEvalNameNode.class differ
diff --git a/bin/list/listeNodeAnalyseWriter.class b/bin/list/listeNodeAnalyseWriter.class
new file mode 100644
index 0000000..26b8d95
Binary files /dev/null and b/bin/list/listeNodeAnalyseWriter.class differ
diff --git a/bin/list/listeNodeFormatageDirectDeWriter.class b/bin/list/listeNodeFormatageDirectDeWriter.class
new file mode 100644
index 0000000..f0c1c00
Binary files /dev/null and b/bin/list/listeNodeFormatageDirectDeWriter.class differ
diff --git a/bin/list/listeRechercheParAnchorPageNumber.class b/bin/list/listeRechercheParAnchorPageNumber.class
new file mode 100644
index 0000000..3a55d05
Binary files /dev/null and b/bin/list/listeRechercheParAnchorPageNumber.class differ
diff --git a/bin/outils/HTML.class b/bin/outils/HTML.class
index 650342b..d218589 100644
Binary files a/bin/outils/HTML.class and b/bin/outils/HTML.class differ
diff --git a/bin/outils/verificationFichierAnalyse.class b/bin/outils/verificationFichierAnalyse.class
index faae62a..c5db61f 100644
Binary files a/bin/outils/verificationFichierAnalyse.class and b/bin/outils/verificationFichierAnalyse.class differ
diff --git a/src/fenetres/afficheText.java b/src/fenetres/afficheText.java
index 8ff4032..cef07d4 100644
--- a/src/fenetres/afficheText.java
+++ b/src/fenetres/afficheText.java
@@ -360,7 +360,7 @@ public class afficheText extends JEditorPane {
text.append("
");
text.append("Verification de la presence metaSujet : " + calc.commandes.analyse_presenceMetaSujet + "
");
text.append("
");
- text.append("Contrôle la date de céation : " + calc.commandes.analyse_controleDateCreation+ "
");
+ text.append("Contrôle la date de création : " + calc.commandes.analyse_controleDateCreation+ "
");
text.append("
");
text.append("Contrôle l'auteur initial du fichier : " + calc.commandes.analyse_controle_Initial_Creator + "
");
text.append("
");
diff --git a/src/fenetres/attributs.java b/src/fenetres/attributs.java
index 7d5fbf5..fa14274 100644
--- a/src/fenetres/attributs.java
+++ b/src/fenetres/attributs.java
@@ -183,7 +183,7 @@ public class attributs extends JFrame {
JButton btnTouText = new JButton("Tout text");
btnTouText.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- int j = Lesvaleurs.get(indexSelect).getCaretPosition();
+// int j = Lesvaleurs.get(indexSelect).getCaretPosition();
Lesvaleurs.get(indexSelect).setText(Lesvaleurs.get(indexSelect).getText() + "†");
}
});
@@ -269,7 +269,7 @@ public class attributs extends JFrame {
String codeEvaluateur = "‽";
- System.out.println("code évaluateur = " + codeEvaluateur);
+// System.out.println("code évaluateur = " + codeEvaluateur);
for(int i = 0 ; i*** Veuillez charger un fichier d'analyse ***
");
+ txtpnmessages.setText(baliseStyle.balise() + "
*** Veuillez charger une évaluation ***
");
}
diff --git a/src/outils/HTML.java b/src/outils/HTML.java
index b4ad6a2..c74b4da 100644
--- a/src/outils/HTML.java
+++ b/src/outils/HTML.java
@@ -305,57 +305,300 @@ public class HTML {
// image du logo de la fac
public static String imgLogos() {
- return "\r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " image/svg+xml\r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- " \r\n" +
- "\r\n" +
- "";
+ return "\r\n"
+ + "\r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " image/svg+xml\r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " analyseWriter\r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + " \r\n"
+ + "\r\n"
+ + "";
}
public static String imgProgression() {
diff --git a/src/outils/verificationFichierAnalyse.java b/src/outils/verificationFichierAnalyse.java
index f159980..9f49b30 100644
--- a/src/outils/verificationFichierAnalyse.java
+++ b/src/outils/verificationFichierAnalyse.java
@@ -151,6 +151,15 @@ public class verificationFichierAnalyse {
JOptionPane.showMessageDialog(null, "Il manque la variable contrôle de l'auteur initial (créateur).
Veuillez l'ajouter dans les propriétés du fichier d'analyse.", "Avertissement", JOptionPane.WARNING_MESSAGE);
}
+ if(attributs.get("analyse_exclure_name_creator")!=null) {
+ String p = attributs.get("analyse_exclure_name_creator");
+ if(!(p.equals("true")||p.equals("false"))) {
+ JOptionPane.showMessageDialog(null, "Problème avec la valeur de la variable analyse_exclure_name_creator.
Veuillez la modifier dans les propriétés du fichier d'analyse.", "Avertissement", JOptionPane.WARNING_MESSAGE);
+ }
+ }else {
+ JOptionPane.showMessageDialog(null, "Il manque la variable analyse_exclure_name_creator.
Veuillez l'ajouter dans les propriétés du fichier d'analyse.", "Avertissement", JOptionPane.WARNING_MESSAGE);
+ }
+
if(attributs.get("historiquePresent")!=null) {
String p = attributs.get("historiquePresent");
if(!(p.equals("true")||p.equals("false"))) {