MAJ V4.4.2 - Amélioration des text:tab, et text:p vide en doublon dans
le texte
This commit is contained in:
parent
9148a5e556
commit
ab14e62680
@ -12,6 +12,6 @@
|
|||||||
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
|
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
|
||||||
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
|
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
|
||||||
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
|
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
|
||||||
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
|
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
|
||||||
<classpathentry kind="output" path="bin"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
Binary file not shown.
Binary file not shown.
10
bin/.gitignore
vendored
10
bin/.gitignore
vendored
@ -3,13 +3,3 @@
|
|||||||
/evaluer/
|
/evaluer/
|
||||||
/fenetres/
|
/fenetres/
|
||||||
/list/
|
/list/
|
||||||
/voir.svg
|
|
||||||
/voirmini.png
|
|
||||||
/what.svg
|
|
||||||
/whatmini.png
|
|
||||||
/zip.png
|
|
||||||
/zip.svg
|
|
||||||
/zipmini.png
|
|
||||||
/zipstudent.png
|
|
||||||
/zipstudent.svg
|
|
||||||
/zipstudentmini.png
|
|
||||||
|
Binary file not shown.
@ -78,9 +78,9 @@ public class rechercherUnNodeStudent {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//************************************************************************************************
|
//**********************************************************************************************************
|
||||||
//** Recherche les nodes text:p, text:h, text:span, text:list, text:note par le contenu textuel **
|
//** Recherche les nodes text:p, text:h, text:span, text:list, text:note, text:tab par le contenu textuel **
|
||||||
//************************************************************************************************
|
//**********************************************************************************************************
|
||||||
if(nodSujet.getNomElt().contains("text:")) {
|
if(nodSujet.getNomElt().contains("text:")) {
|
||||||
nodStudent = findNodeByContenuTextuel(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
|
nodStudent = findNodeByContenuTextuel(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
|
||||||
if(nameNode.equals("text:line-break")) return nodStudent;
|
if(nameNode.equals("text:line-break")) return nodStudent;
|
||||||
@ -241,7 +241,7 @@ public class rechercherUnNodeStudent {
|
|||||||
*/
|
*/
|
||||||
private static node findNodeByContenuTextuel(String nameNode, node nodSujet,node nod0Student, node nod1Student, node nod2Student, Run a) {
|
private static node findNodeByContenuTextuel(String nameNode, node nodSujet,node nod0Student, node nod1Student, node nod2Student, Run a) {
|
||||||
node nodStudent = null;
|
node nodStudent = null;
|
||||||
if(nodSujet.retourneLesContenusEnfants("").length()<1) return null;
|
// if(nodSujet.retourneLesContenusEnfants("").length()<1) return null;
|
||||||
String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants(""));
|
String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants(""));
|
||||||
|
|
||||||
Pattern p = Pattern.compile("^text:p$|^text:h$|^text:span$|^text:list|^text:line-break$|^text:note$|^text:tab$"); //le node qui peuvent rechercher par le contenu textuel
|
Pattern p = Pattern.compile("^text:p$|^text:h$|^text:span$|^text:list|^text:line-break$|^text:note$|^text:tab$"); //le node qui peuvent rechercher par le contenu textuel
|
||||||
|
Loading…
x
Reference in New Issue
Block a user