MAJ V4.5.0

This commit is contained in:
pablo rodriguez 2024-06-28 19:01:56 +02:00
parent 3a9421c61d
commit c027ca1987
8 changed files with 7 additions and 8 deletions

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19">
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/miglayout15-swing.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/zip4j-1.2.7.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/cXML.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/cXML.jar" sourcepath="/cXML"/>
<classpathentry exported="true" kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/miglayout15-swing.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/libs/zip4j-1.2.7.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/jre-image/
/archive des bases .zip
/saveExport.xml
/base_listes_etudiants - Copie.xml

Binary file not shown.

Binary file not shown.

2
bin/.gitignore vendored
View File

@ -1,2 +1,2 @@
/analyseWriter/
/resources/
/analyseWriter/

Binary file not shown.

View File

@ -13,9 +13,9 @@
<attribute name="Class-Path" value="."/>
</manifest>
<fileset dir="${dir.jarfile}/bin"/>
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/cXML.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/miglayout15-swing.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/zip4j-1.2.7.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/libs/cXML.jar"/>
</jar>
</target>
</project>

View File

@ -791,7 +791,6 @@ public class rechercherUnNodeStudent {
if(nod2Student!=null) nodStudent = a.retourneFirstNodeByFindContent2(nod2Student.getNodes(), contenuSujet,commandes.tolerance_characters,commandes.tolerance_text);
if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContent2(nod1Student.getNodes(), contenuSujet,commandes.tolerance_characters,commandes.tolerance_text);
if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByFindContent2(nod0Student.getNodes(), contenuSujet,commandes.tolerance_characters,commandes.tolerance_text);
return nodStudent;
}
@ -830,7 +829,6 @@ public class rechercherUnNodeStudent {
if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod2Student, nameNode, "table:style-name", nodSujet.getAttributs().get("table:style-name"));
if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod1Student, nameNode, "table:style-name", nodSujet.getAttributs().get("table:style-name"));
if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod0Student, nameNode, "table:style-name", nodSujet.getAttributs().get("table:style-name"));
return nodStudent;
}