diff --git a/.classpath b/.classpath index 6f7f355..256905e 100644 --- a/.classpath +++ b/.classpath @@ -10,6 +10,6 @@ - + diff --git a/analyseWriter.jar b/analyseWriter.jar index 90daf37..3714db2 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..4c2dcb6 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,2 @@ +/app/ +/MEPTL/ diff --git a/bin/MEPTL/analyseLesNodesPrincipaux.class b/bin/MEPTL/analyseLesNodesPrincipaux.class index a61aa26..280530a 100644 Binary files a/bin/MEPTL/analyseLesNodesPrincipaux.class and b/bin/MEPTL/analyseLesNodesPrincipaux.class differ diff --git a/bin/MEPTL/rechercherUnNodeStudent.class b/bin/MEPTL/rechercherUnNodeStudent.class index 19065c7..6c33b0f 100644 Binary files a/bin/MEPTL/rechercherUnNodeStudent.class and b/bin/MEPTL/rechercherUnNodeStudent.class differ diff --git a/bin/app/attributs$10.class b/bin/app/attributs$10.class index 0abdfef..fca4bdf 100644 Binary files a/bin/app/attributs$10.class and b/bin/app/attributs$10.class differ diff --git a/bin/app/attributs$11.class b/bin/app/attributs$11.class index e4332ed..e5ed750 100644 Binary files a/bin/app/attributs$11.class and b/bin/app/attributs$11.class differ diff --git a/bin/app/attributs$MyMouseListener.class b/bin/app/attributs$MyMouseListener.class index 153473f..ab995c8 100644 Binary files a/bin/app/attributs$MyMouseListener.class and b/bin/app/attributs$MyMouseListener.class differ diff --git a/bin/app/attributs.class b/bin/app/attributs.class index 7ef48e7..46c70e5 100644 Binary files a/bin/app/attributs.class and b/bin/app/attributs.class differ diff --git a/bin/app/create.class b/bin/app/create.class index cb14b30..5dd59f1 100644 Binary files a/bin/app/create.class and b/bin/app/create.class differ diff --git a/src/MEPTL/analyseLesNodesPrincipaux.java b/src/MEPTL/analyseLesNodesPrincipaux.java index f059e62..5939e85 100644 --- a/src/MEPTL/analyseLesNodesPrincipaux.java +++ b/src/MEPTL/analyseLesNodesPrincipaux.java @@ -428,73 +428,6 @@ public class analyseLesNodesPrincipaux { section = analyseLesNodesEnfants.nodeNext(section, "ana:section", sectionStudent, null, null, sectionSujet, null, null,nodmenu, a); -// // les enfants du premier niveau du node -// for(int j = 0 ; j < sectionSujet.getNodes().size();j++ ) { //niveau 2 -// -// node nodSujet = sectionSujet.getNodes().get(j); -// String nameNode = nodSujet.getNomElt(); -// node nodStudent = null; -// -// if(sectionStudent!=null) nodStudent = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodSujet,null,null,sectionStudent,a); -// -// //insère un saut si titre pas vide et saut=true -// section=addNodeSautTitre(nodSujet, section); -// -// -// // analyse attribut et contenu des enfants du premier niveau -// section = analyseLesAttributEtContenuDuNode(nodStudent, nodSujet, section, "ana:section",nameNode); -// -// -// for(int k = 0 ; k < nodSujet.getNodes().size();k++) { //niveau 3 -// node nod2Sujet = nodSujet.getNodes().get(k); -// String nameNode2 = nod2Sujet.getNomElt(); -// node nod2Student = null; -// -// if(sectionStudent!=null) nod2Student = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode2,nod2Sujet,null,sectionStudent,nodStudent,a); -// -// //insère un saut si titre pas vide et saut=true -// section=addNodeSautTitre(nod2Sujet, section); -// -// // analyse attribut et contenu des enfants du second niveau -// section = analyseLesAttributEtContenuDuNode(nod2Student, nod2Sujet, section, "ana:section",nameNode2 ); -// -// -// for(int l = 0 ; l < nod2Sujet.getNodes().size();l++) { //niveau 4 -// node nod3Sujet = nod2Sujet.getNodes().get(l); -// String nameNode3 = nod3Sujet.getNomElt(); -// node nod3Student = null; -// -// if(sectionStudent!=null) nod3Student = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode3,nod3Sujet,sectionStudent,nodStudent,nod2Student,a); -// -// //insère un saut si titre pas vide et saut=true -// section=addNodeSautTitre(nod3Sujet, section); -// -// // analyse attribut et contenu des enfants du second niveau -// section = analyseLesAttributEtContenuDuNode(nod3Student, nod3Sujet, section, "ana:section", nameNode3); -// -// -// for(int m = 0 ; m < nod3Sujet.getNodes().size();m++) { //niveau 5 -// node nod4Sujet = nod3Sujet.getNodes().get(m); -// String nameNode4 = nod4Sujet.getNomElt(); -// node nod4Student = null; -// -// if(sectionStudent!=null) nod4Student = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode4,nod4Sujet,nodStudent,nod2Student,nod3Student,a); -// -// //insère un saut si titre pas vide et saut=true -// section=addNodeSautTitre(nod4Sujet, section); -// -// // analyse attribut et contenu des enfants du second niveau -// section = analyseLesAttributEtContenuDuNode(nod4Student, nod4Sujet, section, "ana:section", nameNode4); -// -// } -// -// -// } -// -// } -// -// } - //**************************************************************** //** Insère les attributs des points dans les node de l'analyse ** //**************************************************************** diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/MEPTL/rechercherUnNodeStudent.java index f61184c..77e2346 100644 --- a/src/MEPTL/rechercherUnNodeStudent.java +++ b/src/MEPTL/rechercherUnNodeStudent.java @@ -399,17 +399,20 @@ public class rechercherUnNodeStudent { */ private static node findDrawFrame(String nameNode, node nodSujet,node nod0Student, node nod1Student, node nod2Student, Run a) { node nodStudent = null; + String nameDraw = outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("draw:name")); + System.out.println("recherche image ou cadre =" nameDraw); //recherche par le nom de l'objet draw:name par défaut - if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod2Student, nameNode, "draw:name", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("draw:name"))); - if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod1Student, nameNode, "draw:name", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("draw:name"))); - if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod0Student, nameNode, "draw:name", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("draw:name"))); + if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod2Student, nameNode, "draw:name", nameDraw); + if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod1Student, nameNode, "draw:name", nameDraw); + if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod0Student, nameNode, "draw:name", nameDraw); if(nodStudent!=null) return nodStudent; - + if(nodSujet.getAttributs().get("recherche_anchor-page-number")!=null) if(nodSujet.getAttributs().get("recherche_anchor-page-number").equalsIgnoreCase("true")) { - if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod2Student, nameNode, "text:anchor-page-number", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("text:anchor-page-number"))); - if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod1Student, nameNode, "text:anchor-page-number", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("text:anchor-page-number"))); - if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod0Student, nameNode, "text:anchor-page-number", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("text:anchor-page-number"))); + String AncragePage = outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("text:anchor-page-number")); + if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod2Student, nameNode, "text:anchor-page-number", AncragePage); + if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod1Student, nameNode, "text:anchor-page-number", AncragePage); + if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod0Student, nameNode, "text:anchor-page-number", AncragePage); } return nodStudent; diff --git a/src/app/attributs.java b/src/app/attributs.java index 020a4e1..fa3581e 100644 --- a/src/app/attributs.java +++ b/src/app/attributs.java @@ -289,17 +289,19 @@ public class attributs extends JFrame { String codeEvaluateur = "‽"; - node nodStyleParent = nod.retourneParentAyantLAttribut("style:name"); - - if(nodStyleParent!=null) { - String nomDuStle = nodStyleParent.getAttributs().get("style:name"); - Pattern p = Pattern.compile("^P[0-9]{1,}$|^T[0-9]{1,}$"); - Matcher m = p.matcher(nomDuStle); - if(m.find()) { - codeEvaluateur = "‼"; + // Le code evaluateur ‼ que dans les nodes des styles de paragraphe + if(nod.chemin().contains("style:paragraph")) { + node nodStyleParent = nod.retourneParentAyantLAttribut("style:name"); + if(nodStyleParent!=null) { + String nomDuStle = nodStyleParent.getAttributs().get("style:name"); + Pattern p = Pattern.compile("^P[0-9]{1,}$|^T[0-9]{1,}$"); + Matcher m = p.matcher(nomDuStle); + if(m.find()) { + codeEvaluateur = "‼"; + } } } - + for(int i = 0 ; i