diff --git a/analyseWriter.exe b/analyseWriter.exe index cd90c9e..d51ddf4 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 9a2ba82..e5a3cf5 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/MEPTL/commandes.class b/bin/MEPTL/commandes.class index a4d19ee..6881d41 100644 Binary files a/bin/MEPTL/commandes.class and b/bin/MEPTL/commandes.class differ diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class index facee79..905e24e 100644 Binary files a/bin/MEPTL/meptl.class and b/bin/MEPTL/meptl.class differ diff --git a/src/MEPTL/commandes.java b/src/MEPTL/commandes.java index 8feb224..239cf16 100644 --- a/src/MEPTL/commandes.java +++ b/src/MEPTL/commandes.java @@ -257,7 +257,7 @@ public class commandes { System.exit(0); } - public static void clotureWithErrorFile(String filename) { + public static void ErrorFile(String filename) { int nbespace = 30-filename.length(); if (nbespace<0) nbespace=1; System.out.println(); @@ -276,7 +276,6 @@ public class commandes { commandes.message.append("\n*************************"); commandes.message.append("\n"); - if(commandes.console) System.exit(0); } diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java index 00cb0ce..37504b7 100644 --- a/src/MEPTL/meptl.java +++ b/src/MEPTL/meptl.java @@ -2189,6 +2189,7 @@ public class meptl { * @throws IOException */ public static node chargementFichierCSV() { + node nodeCVS = null; String targetString = ""; String cheminVersLeFichierCSV = ""; @@ -2212,13 +2213,14 @@ public class meptl { br.close(); } catch (IOException e) { - commandes.clotureWithErrorFile(cheminVersLeFichierCSV); + commandes.ErrorFile(cheminVersLeFichierCSV); e.printStackTrace(); + return nodeCVS; } String[] target = targetString.split("\\n"); - node nodeCVS = new node(); + nodeCVS = new node(); nodeCVS.setNomElt("fileCSV"); String[] line1 = target[0].split(";"); for(int i = 1 ; i < target.length ; i++) { @@ -2257,7 +2259,7 @@ public class meptl { br.close(); } catch (IOException e) { - commandes.clotureWithErrorFile(commandes.nameSVG); + commandes.ErrorFile(commandes.nameSVG); e.printStackTrace(); } return targetString; diff --git a/src/evaluer/evaluerLesFichiersEtudiants.java b/src/evaluer/evaluerLesFichiersEtudiants.java index 585e11a..6b38692 100644 --- a/src/evaluer/evaluerLesFichiersEtudiants.java +++ b/src/evaluer/evaluerLesFichiersEtudiants.java @@ -75,7 +75,8 @@ public class evaluerLesFichiersEtudiants implements Runnable{ //** Chargement et verification du CVS fourni ** //********************************************** if(commandes.fourniCSV) { - commandes.nodeCSV = meptl.chargementFichierCSV(); + node A = meptl.chargementFichierCSV(); + if(A!=null) commandes.nodeCSV = A; }