diff --git a/analyseWriter.jar b/analyseWriter.jar index a442e77..e787d9d 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/MEPTL/commandes.class b/bin/MEPTL/commandes.class index 43f3b8c..d18a205 100644 Binary files a/bin/MEPTL/commandes.class and b/bin/MEPTL/commandes.class differ diff --git a/bin/fenetres/create_act/actSave.class b/bin/fenetres/create_act/actSave.class index 9d98acc..34e989d 100644 Binary files a/bin/fenetres/create_act/actSave.class and b/bin/fenetres/create_act/actSave.class differ diff --git a/bin/fenetres/create_act/actSaveAs.class b/bin/fenetres/create_act/actSaveAs.class index 5ca2599..601ce91 100644 Binary files a/bin/fenetres/create_act/actSaveAs.class and b/bin/fenetres/create_act/actSaveAs.class differ diff --git a/bin/fenetres/filechooserXML.class b/bin/fenetres/filechooserXML.class index fd567e3..5483b70 100644 Binary files a/bin/fenetres/filechooserXML.class and b/bin/fenetres/filechooserXML.class differ diff --git a/bin/fenetres/mainApp$1.class b/bin/fenetres/mainApp$1.class index 340e137..e309d87 100644 Binary files a/bin/fenetres/mainApp$1.class and b/bin/fenetres/mainApp$1.class differ diff --git a/bin/fenetres/mainApp$2.class b/bin/fenetres/mainApp$2.class index db0f05a..d79db37 100644 Binary files a/bin/fenetres/mainApp$2.class and b/bin/fenetres/mainApp$2.class differ diff --git a/bin/fenetres/mainApp.class b/bin/fenetres/mainApp.class index 617afb6..7ff3d23 100644 Binary files a/bin/fenetres/mainApp.class and b/bin/fenetres/mainApp.class differ diff --git a/src/MEPTL/commandes.java b/src/MEPTL/commandes.java index fd8752a..b91fba5 100644 --- a/src/MEPTL/commandes.java +++ b/src/MEPTL/commandes.java @@ -68,6 +68,7 @@ public class commandes { public static String pathDestination =""; //Pour le mode console uniquement public static String nomDeLaBranch = "Origin"; //Branche de développement public static String Command =""; //récupère le texte de la commande dans la console + public static String os = System.getProperty("os.name"); //** setting valeur par défaut public static String culture = "FR"; diff --git a/src/fenetres/create_act/actSave.java b/src/fenetres/create_act/actSave.java index 81f0c94..c82f491 100644 --- a/src/fenetres/create_act/actSave.java +++ b/src/fenetres/create_act/actSave.java @@ -50,7 +50,8 @@ public class actSave extends AbstractAction{ if(input==0) { try { verificationFichierAnalyse.MiseAJourHashNomFichierAnalyse(commandes.nameSujet); - Run.ecritureNodeEnXML(commandes.sujet, commandes.nameSujet ,commandes.PathFilenameAnalysis,"sujet"); + + Run.ecritureNodeEnXML(commandes.sujet, commandes.nameSujet,commandes.PathFilenameAnalysis,"sujet"); if(m.find()) { fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + " a été réenregistré.\n\n" diff --git a/src/fenetres/create_act/actSaveAs.java b/src/fenetres/create_act/actSaveAs.java index c63b48a..aaa40f3 100644 --- a/src/fenetres/create_act/actSaveAs.java +++ b/src/fenetres/create_act/actSaveAs.java @@ -36,6 +36,7 @@ public class actSaveAs extends AbstractAction{ if(!commandes.nameSujet.isEmpty()) { file = new File(commandes.PathFilenameAnalysis ); //+ "\\" + utils.filename + ".xml" + System.out.println("commandes.PathFilenameAnalysis="+commandes.PathFilenameAnalysis); } @@ -50,11 +51,22 @@ public class actSaveAs extends AbstractAction{ verificationFichierAnalyse.MiseAJourHashNomFichierAnalyse(fileToSave.getName()); - - Run.ecritureNodeEnXML(commandes.sujet, fileToSave.getName(), fileToSave.getPath().substring(0,fileToSave.getPath().lastIndexOf("\\")),"sujet" ); + if(commandes.os.contains("Mac")||commandes.os.contains("Li")) { + Run.ecritureNodeEnXML(commandes.sujet, fileToSave.getName(), fileToSave.getPath().substring(0,fileToSave.getPath().lastIndexOf("/")),"sujet" ); + } + if(commandes.os.contains("Win")) { + Run.ecritureNodeEnXML(commandes.sujet, fileToSave.getName(), fileToSave.getPath().substring(0,fileToSave.getPath().lastIndexOf("\\")),"sujet" ); + } commandes.nameSujet = fileToSave.getName(); - commandes.PathFilenameAnalysis = fileToSave.getPath().substring(0,fileToSave.getPath().lastIndexOf("\\")); + + if(commandes.os.contains("Win")) { + commandes.PathFilenameAnalysis = fileToSave.getPath().substring(0,fileToSave.getPath().lastIndexOf("\\")); + } + if(commandes.os.contains("Mac")||commandes.os.contains("Li")) { + commandes.PathFilenameAnalysis = fileToSave.getPath().substring(0,fileToSave.getPath().lastIndexOf("/")); + } + Pattern p = Pattern.compile("[.xml]\\b"); Matcher m = p.matcher(commandes.nameSujet); diff --git a/src/fenetres/filechooserXML.java b/src/fenetres/filechooserXML.java index 49daf80..4be0aeb 100644 --- a/src/fenetres/filechooserXML.java +++ b/src/fenetres/filechooserXML.java @@ -60,10 +60,12 @@ public class filechooserXML extends JFileChooser { private void openFileXML(File file) { commandes.fichierAnalyseValide=true; System.out.println("commandes.path="+file.getPath()); - if(file.getPath().lastIndexOf("\\")>0) { + + if(commandes.os.contains("Win")) { commandes.path = file.getPath().substring(0,file.getPath().lastIndexOf("\\")); // Sur Windows - }else { - commandes.path = file.getPath(); // Sur mac + } + if(commandes.os.contains("Mac")||commandes.os.contains("Li")) { + commandes.path = file.getPath().substring(0,file.getPath().lastIndexOf("/")); // Sur mac } commandes.PathFilenameAnalysis = getCurrentDirectory().getPath(); diff --git a/src/fenetres/mainApp.java b/src/fenetres/mainApp.java index 9945460..7aa121f 100644 --- a/src/fenetres/mainApp.java +++ b/src/fenetres/mainApp.java @@ -33,6 +33,7 @@ public class mainApp extends JFrame implements ActionListener{ commandes.console=false; try { mainApp window = new mainApp(); + System.out.println(commandes.os); window.frmEvalwriter.setVisible(true); } catch (Exception e) { e.printStackTrace();