diff --git a/src/Main.java b/src/Main.java index 38e3a3fd1adfba25f96a277b3445fbbdb5518166..3f07619d4c1c01b67e3957e9e1764deda194d987 100755 --- a/src/Main.java +++ b/src/Main.java @@ -232,7 +232,7 @@ public class Main implements ActionListener { if (args[i].compareTo("-proverif") ==0 ) { proverif = true; System.out.println("ProVerif activated - these are beta features that are meant to be used only for research purpose"); - }*/ + } if (args[i].compareTo("-noproverif") ==0 ) { proverif = false; diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java index c7876393f0d91184b6a3f9ffc36951b8e8650d35..588b78a63c8f00b55034cfd3f1b545401361bbaa 100755 --- a/src/ui/MainGUI.java +++ b/src/ui/MainGUI.java @@ -3955,32 +3955,24 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe public void avatarExecutableCodeGeneration() { TraceManager.addDev("Avatar code generation"); - JDialogAvatarExecutableCodeGeneration jgen = new JDialogAvatarExecutableCodeGeneration(frame, this, "Executable Code generation, compilation and execution", ConfigurationTTool.AVATARExecutableCodeHost, -ConfigurationTTool.AVATARExecutableCodeDirectory, -ConfigurationTTool.AVATARExecutableCodeCompileCommand, -ConfigurationTTool.AVATARExecutableCodeExecuteCommand, -ConfigurationTTool.AVATARExecutableSoclibCodeCompileCommand, -ConfigurationTTool.AVATARExecutableSoclibCodeExecuteCommand, -ConfigurationTTool.AVATARExecutableSoclibTraceFile); + JDialogAvatarExecutableCodeGeneration jgen = new JDialogAvatarExecutableCodeGeneration(frame, this, "Executable Code generation, compilation and execution", ConfigurationTTool.AVATARExecutableCodeHost, ConfigurationTTool.AVATARExecutableCodeDirectory, ConfigurationTTool.AVATARExecutableCodeCompileCommand, ConfigurationTTool.AVATARExecutableCodeExecuteCommand, ConfigurationTTool.AVATARExecutableSoclibCodeCompileCommand, ConfigurationTTool.AVATARExecutableSoclibCodeExecuteCommand, ConfigurationTTool.AVATARExecutableSoclibTraceFile); jgen.setSize(500, 450); GraphicLib.centerOnParent(jgen); jgen.setVisible(true); dtree.toBeUpdated(); } - // DG - public void avatarddExecutableCodeGeneration(){ +// julien -------------------------------------------------------------- + + + public void avatarddExecutableCodeGeneration(){ TraceManager.addDev("Avatar code generation"); - JDialogAvatarddExecutableCodeGeneration jgen = new JDialogAvatarddExecutableCodeGeneration(frame, this, "Executable Code generation, compilation and execution", -ConfigurationTTool.AVATARExecutableCodeHost, -ConfigurationTTool.AVATARMPSoCCodeDirectory, -ConfigurationTTool.AVATARMPSoCCompileCommand, -ConfigurationTTool.AVATARExecutableSoclibCodeExecuteCommand); + JDialogAvatarddExecutableCodeGeneration jgen = new JDialogAvatarddExecutableCodeGeneration(frame, this, "Executable Code generation", ConfigurationTTool.AVATARExecutableCodeHost,"" , ConfigurationTTool.AVATARExecutableCodeDirectory,"",""); jgen.setSize(500, 450); GraphicLib.centerOnParent(jgen); jgen.setVisible(true); dtree.toBeUpdated(); - } + } // ---------------------------------------------------------------------