From fe9100f3b4fa25bc1e04f4f522349f7368a75011 Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr> Date: Fri, 5 Jun 2015 12:11:08 +0000 Subject: [PATCH] Update on TMLCP code generation --- src/tmltranslator/TMLCPTextSpecification.java | 49 +- src/ui/ConfigurationTTool.java | 1016 ++++++++--------- 2 files changed, 516 insertions(+), 549 deletions(-) diff --git a/src/tmltranslator/TMLCPTextSpecification.java b/src/tmltranslator/TMLCPTextSpecification.java index 56c7fc8f69..52ccbee1bc 100755 --- a/src/tmltranslator/TMLCPTextSpecification.java +++ b/src/tmltranslator/TMLCPTextSpecification.java @@ -387,7 +387,7 @@ public class TMLCPTextSpecification { sb.append(parseElement2(currentElement, met)); - return sb.toString() + TAB + "><"; + return sb.toString() + CR + TAB + "><"; } private String parseElement2(TMLCPElement currentElement, ArrayList<TMLCPElement> met) { @@ -407,8 +407,8 @@ public class TMLCPTextSpecification { met.add(currentElement); if (currentElement instanceof TMLCPStop) { - return ""; - //return( TAB + "><" ); + //return ""; + return( TAB + "><" ); } if (currentElement instanceof TMLCPFork) { @@ -426,46 +426,10 @@ public class TMLCPTextSpecification { String ret = parseSequence(currentElement); - ret += SEQUENCE_OP; + //ret += SEQUENCE_OP; ret += parseElement2(currentElement.getNextElements().get(0), met); return ret; - - /*ArrayList<TMLCPElement> nextElements; - - while( (!(currentElement instanceof TMLCPStop)) && (currentElement != null)) { - nextElements = currentElement.getNextElements(); - - if (currentElement instanceof TMLCPFork) { - sbFork = new StringBuffer(); - currentElement = parseFork2( nextElements ); // currentElement is the closing join, use attribute sbFork - sb.append( sbFork.toString() ); - sbFork.setLength(0); - } else if (currentElement instanceof ) { - - - - }else if( nextElements.size() > 1 ) { // currentElement is a fork node - sbFork = new StringBuffer(); - sb.append(currentElement = parseFork( nextElements ); // currentElement is the closing join, use attribute sbFork - sb.append( sbFork.toString() ); - sbFork.setLength(0); - } - else { // currentElement is either a refToDiag or a junction - if( isAJunction( currentElement ) ) { - String s = ( (TMLCPRefAD) currentElement ).getName(); - sb.append( s + ";" + CR ); - } - else { - sb.append( parseSequence( currentElement ) ); - } - } - currentElement = currentElement.getNextElements().get(0); - - - - }*/ - } private String parseChoice2(TMLCPChoice choice, ArrayList<TMLCPElement> met) { @@ -476,7 +440,7 @@ public class TMLCPTextSpecification { int index = 0; for( TMLCPElement element: branches ) { - sb.append( CR + TAB2 + guards.get(index) + SP ); + sb.append( CR + TAB2 + guards.get(index) + SP); sb.append(parseElement2(element, met)); index ++; } @@ -531,6 +495,9 @@ public class TMLCPTextSpecification { return sb.toString(); } + + + private String makeSingleActivityDiagram( TMLCPActivityDiagram ad ) { StringBuffer sb = new StringBuffer( TAB + CR + TAB + "<>; " ); diff --git a/src/ui/ConfigurationTTool.java b/src/ui/ConfigurationTTool.java index df62481dd6..1f42f0aa59 100755 --- a/src/ui/ConfigurationTTool.java +++ b/src/ui/ConfigurationTTool.java @@ -1,47 +1,47 @@ /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille -* -* ludovic.apvrille AT enst.fr -* -* This software is a computer program whose purpose is to allow the -* edition of TURTLE analysis, design and deployment diagrams, to -* allow the generation of RT-LOTOS or Java code from this diagram, -* and at last to allow the analysis of formal validation traces -* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP -* from INRIA Rhone-Alpes. -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited -* liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* /** -* Class ConfigurationTTool -* Creation: 21/12/2003 -* Version 1.0 -* @author Ludovic APVRILLE -* @see -*/ + * + * ludovic.apvrille AT enst.fr + * + * This software is a computer program whose purpose is to allow the + * edition of TURTLE analysis, design and deployment diagrams, to + * allow the generation of RT-LOTOS or Java code from this diagram, + * and at last to allow the analysis of formal validation traces + * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP + * from INRIA Rhone-Alpes. + * + * This software is governed by the CeCILL license under French law and + * abiding by the rules of distribution of free software. You can use, + * modify and/ or redistribute the software under the terms of the CeCILL + * license as circulated by CEA, CNRS and INRIA at the following URL + * "http://www.cecill.info". + * + * As a counterpart to the access to the source code and rights to copy, + * modify and redistribute granted by the license, users are provided only + * with a limited warranty and the software's author, the holder of the + * economic rights, and the successive licensors have only limited + * liability. + * + * In this respect, the user's attention is drawn to the risks associated + * with loading, using, modifying and/or developing or reproducing the + * software by the user in light of its specific status of free software, + * that may mean that it is complicated to manipulate, and that also + * therefore means that it is reserved for developers and experienced + * professionals having in-depth computer knowledge. Users are therefore + * encouraged to load and test the software's suitability as regards their + * requirements in conditions enabling the security of their systems and/or + * data to be ensured and, more generally, to use and operate it in the + * same conditions as regards security. + * + * The fact that you are presently reading this means that you have had + * knowledge of the CeCILL license and that you accept its terms. + * + * /** + * Class ConfigurationTTool + * Creation: 21/12/2003 + * Version 1.0 + * @author Ludovic APVRILLE + * @see + */ package ui; @@ -55,14 +55,14 @@ import javax.xml.parsers.*; import myutil.*; /** -* Class -* -* @author Ludovic APVRILLE -* @see -*/ + * Class + * + * @author Ludovic APVRILLE + * @see + */ public class ConfigurationTTool { - - public static String LauncherPort = ""; + + public static String LauncherPort = ""; public static String RTLHost = ""; public static String RTLPath = ""; public static String DTA2DOTPath = ""; @@ -71,7 +71,7 @@ public class ConfigurationTTool { public static String AldebaranHost = ""; public static String AldebaranPath = ""; public static String BcgioPath = ""; // Same host as aldebaran - public static String BisimulatorPath = ""; + public static String BisimulatorPath = ""; public static String BcgminPath = ""; // Same host as aldebaran public static String BcgmergePath = ""; // Same host as aldebaran public static String CaesarPath = ""; // Same host as aldebaran @@ -95,124 +95,124 @@ public class ConfigurationTTool { public static String TToolSimuClassPath = ""; public static String JavaExecutePath = ""; public static String JavaHeader = ""; - public static String NCDirectory = ""; + public static String NCDirectory = ""; public static String SystemCCodeDirectory = ""; - public static String TMLCodeDirectory = ""; - public static String CcodeDirectory = ""; + public static String TMLCodeDirectory = ""; + public static String CcodeDirectory = ""; public static String SystemCCodeCompileCommand = ""; public static String SystemCCodeExecuteCommand = ""; - public static String SystemCCodeInteractiveExecuteCommand = ""; + public static String SystemCCodeInteractiveExecuteCommand = ""; public static String SystemCHost = ""; - public static String VCDPath = ""; + public static String VCDPath = ""; public static String GTKWavePath = ""; public static String UPPAALCodeDirectory = ""; - public static String UPPAALVerifierPath = ""; - public static String UPPAALVerifierHost = ""; - public static String ProVerifCodeDirectory = ""; - public static String ProVerifVerifierPath = ""; - public static String ProVerifVerifierHost = ""; - public static String ExternalCommand1Host = ""; - public static String ExternalCommand2Host = ""; - public static String ExternalCommand1 = ""; - public static String ExternalCommand2 = ""; - - // AVATAR Simulation - public static String AVATARSimulationHost = ""; - public static String AVATARCPPSIMCodeDirectory = ""; - public static String AVATARCPPSIMCompileCommand = ""; - public static String AVATARCPPSIMCodeExecuteCommand = ""; - public static String AVATARCPPSIMInteractiveExecuteCommand = ""; - - // AVATAR Code generation - public static String AVATARExecutableCodeDirectory = ""; - public static String AVATARExecutableCodeHost = ""; - public static String AVATARExecutableCodeCompileCommand = ""; - public static String AVATARExecutableCodeExecuteCommand = ""; - public static String AVATARExecutableSoclibCodeCompileCommand = ""; - public static String AVATARExecutableSoclibCodeExecuteCommand = ""; - public static String AVATARExecutableSoclibTraceFile = ""; - - - // Ontology - public static String RequirementOntologyWebsite = ""; - public static String AttackOntologyWebsite = ""; - + public static String UPPAALVerifierPath = ""; + public static String UPPAALVerifierHost = ""; + public static String ProVerifCodeDirectory = ""; + public static String ProVerifVerifierPath = ""; + public static String ProVerifVerifierHost = ""; + public static String ExternalCommand1Host = ""; + public static String ExternalCommand2Host = ""; + public static String ExternalCommand1 = ""; + public static String ExternalCommand2 = ""; + + // AVATAR Simulation + public static String AVATARSimulationHost = ""; + public static String AVATARCPPSIMCodeDirectory = ""; + public static String AVATARCPPSIMCompileCommand = ""; + public static String AVATARCPPSIMCodeExecuteCommand = ""; + public static String AVATARCPPSIMInteractiveExecuteCommand = ""; + + // AVATAR Code generation + public static String AVATARExecutableCodeDirectory = ""; + public static String AVATARExecutableCodeHost = ""; + public static String AVATARExecutableCodeCompileCommand = ""; + public static String AVATARExecutableCodeExecuteCommand = ""; + public static String AVATARExecutableSoclibCodeCompileCommand = ""; + public static String AVATARExecutableSoclibCodeExecuteCommand = ""; + public static String AVATARExecutableSoclibTraceFile = ""; + + + // Ontology + public static String RequirementOntologyWebsite = ""; + public static String AttackOntologyWebsite = ""; + public static String LastOpenFile = ""; public static boolean LastOpenFileDefined = false; - - public static String LastWindowAttributesX="", LastWindowAttributesY= ""; - public static String LastWindowAttributesWidth="", LastWindowAttributesHeight= ""; - public static String LastWindowAttributesMax=""; - + + public static String LastWindowAttributesX="", LastWindowAttributesY= ""; + public static String LastWindowAttributesWidth="", LastWindowAttributesHeight= ""; + public static String LastWindowAttributesMax=""; + public static String fileName = ""; - public static String ExternalServer=""; - + public static String ExternalServer=""; + public static void makeDefaultConfiguration() { - //System.out.println(Paths.get("").toAbsolutePath().toString()); - //System.out.println("User.dir path:" + System.getProperty("user.dir")); - //Path currentRelativePath = Paths.get(""); - //String s = currentRelativePath.toAbsolutePath().toString(); - //String s = System.getProperty("user.dir"); - //IMGPath = s; - - } - - + //System.out.println(Paths.get("").toAbsolutePath().toString()); + //System.out.println("User.dir path:" + System.getProperty("user.dir")); + //Path currentRelativePath = Paths.get(""); + //String s = currentRelativePath.toAbsolutePath().toString(); + //String s = System.getProperty("user.dir"); + //IMGPath = s; + + } + + public static void loadConfiguration(String _fileName, boolean systemcOn) throws MalformedConfigurationException { fileName = _fileName; - + File f = new File(fileName); - + if (!FileUtils.checkFileForOpen(f)) { throw new MalformedConfigurationException("Filepb"); } - + String data = FileUtils.loadFileData(f); - + if (data == null) { throw new MalformedConfigurationException("Filepb"); } - + loadConfigurationFromXML(data, systemcOn); } - + public static void saveConfiguration() throws MalformedConfigurationException { int index0, index1, index2, index3; - String tmp, tmp1, tmp2, location; + String tmp, tmp1, tmp2, location; File f = new File(fileName); - boolean write = false; - + boolean write = false; + if (!FileUtils.checkFileForOpen(f)) { throw new MalformedConfigurationException("Filepb"); } - + String data = FileUtils.loadFileData(f); - + if (data == null) { throw new MalformedConfigurationException("Filepb"); } - + index0 = data.indexOf("LastOpenFile"); - + //sb.append("data = " + data + " ConfigurationTTool.LastOpenFile=" + ConfigurationTTool.LastOpenFile); - + if (index0 > -1) { index1 = data.indexOf('"', index0); if (index1 > -1) { index2 = data.indexOf('"', index1 + 1); if (index2 > -1) { - tmp = data.substring(index2, data.length()); - data = data.substring(0, index1+1) + ConfigurationTTool.LastOpenFile+ tmp; - //sb.append("data = " + data); - write = true; - /*try { - FileOutputStream fos = new FileOutputStream(f); - fos.write(data.getBytes()); - fos.close(); - } catch (Exception e) { - throw new MalformedConfigurationException("Saving file failed"); - }*/ + tmp = data.substring(index2, data.length()); + data = data.substring(0, index1+1) + ConfigurationTTool.LastOpenFile+ tmp; + //sb.append("data = " + data); + write = true; + /*try { + FileOutputStream fos = new FileOutputStream(f); + fos.write(data.getBytes()); + fos.close(); + } catch (Exception e) { + throw new MalformedConfigurationException("Saving file failed"); + }*/ } } } @@ -230,223 +230,223 @@ public class ConfigurationTTool { data = data.substring(0, index1+1) + ConfigurationTTool.ExternalServer+ tmp; //sb.append("data = " + data); write = true; - /*try { - FileOutputStream fos = new FileOutputStream(f); - fos.write(data.getBytes()); - fos.close(); - } catch (Exception e) { - throw new MalformedConfigurationException("Saving file failed"); - }*/ + /*try { + FileOutputStream fos = new FileOutputStream(f); + fos.write(data.getBytes()); + fos.close(); + } catch (Exception e) { + throw new MalformedConfigurationException("Saving file failed"); + }*/ } } } //-------------------------- - - index0 = data.indexOf("LastWindowAttributes"); - if (index0 > -1) { - tmp1 = data.substring(0, index0+20); - tmp2 = data.substring(index0+20, data.length()); - index1 = tmp2.indexOf("/>"); - if (index1 > -1) { - tmp2 = tmp2.substring(index1, tmp2.length()); - location = " x=\"" + LastWindowAttributesX; - location += "\" y=\"" + LastWindowAttributesY; - location += "\" width=\"" + LastWindowAttributesWidth; - location += "\" height=\"" + LastWindowAttributesHeight; - location += "\" max=\"" + LastWindowAttributesMax + "\" "; - data = tmp1 + location + tmp2; - write = true; - } - } else { - index1= data.indexOf("</TURTLECONFIGURATION>"); - if (index1 > -1) { - location = "<LastWindowAttributes x=\"" + LastWindowAttributesX; - location += "\" y=\"" + LastWindowAttributesY; - location += "\" width=\"" + LastWindowAttributesWidth; - location += "\" height=\"" + LastWindowAttributesHeight; - location += "\" max=\"" + LastWindowAttributesMax + "\"/>\n\n"; - data = data.substring(0, index1) + location + data.substring(index1, data.length()); - write = true; - } - } - - if (write) { - //sb.append("Writing data=" + data); - try { - FileOutputStream fos = new FileOutputStream(f); - fos.write(data.getBytes()); - fos.close(); - } catch (Exception e) { - throw new MalformedConfigurationException("Saving file failed"); - } - } else { - TraceManager.addError("Configuration could not be saved"); - } - - } - - public static boolean configSizeAvailable() { - if (LastWindowAttributesX.length() == 0) { - return false; - } - - if (LastWindowAttributesY.length() == 0) { - return false; - } - - if (LastWindowAttributesWidth.length() == 0) { - return false; - } - - if (LastWindowAttributesHeight.length() == 0) { - return false; - } - - return true; - } - - public static void printConfiguration(boolean systemcOn) { - System.out.println(getConfiguration(systemcOn)); - } - + + index0 = data.indexOf("LastWindowAttributes"); + if (index0 > -1) { + tmp1 = data.substring(0, index0+20); + tmp2 = data.substring(index0+20, data.length()); + index1 = tmp2.indexOf("/>"); + if (index1 > -1) { + tmp2 = tmp2.substring(index1, tmp2.length()); + location = " x=\"" + LastWindowAttributesX; + location += "\" y=\"" + LastWindowAttributesY; + location += "\" width=\"" + LastWindowAttributesWidth; + location += "\" height=\"" + LastWindowAttributesHeight; + location += "\" max=\"" + LastWindowAttributesMax + "\" "; + data = tmp1 + location + tmp2; + write = true; + } + } else { + index1= data.indexOf("</TURTLECONFIGURATION>"); + if (index1 > -1) { + location = "<LastWindowAttributes x=\"" + LastWindowAttributesX; + location += "\" y=\"" + LastWindowAttributesY; + location += "\" width=\"" + LastWindowAttributesWidth; + location += "\" height=\"" + LastWindowAttributesHeight; + location += "\" max=\"" + LastWindowAttributesMax + "\"/>\n\n"; + data = data.substring(0, index1) + location + data.substring(index1, data.length()); + write = true; + } + } + + if (write) { + //sb.append("Writing data=" + data); + try { + FileOutputStream fos = new FileOutputStream(f); + fos.write(data.getBytes()); + fos.close(); + } catch (Exception e) { + throw new MalformedConfigurationException("Saving file failed"); + } + } else { + TraceManager.addError("Configuration could not be saved"); + } + + } + + public static boolean configSizeAvailable() { + if (LastWindowAttributesX.length() == 0) { + return false; + } + + if (LastWindowAttributesY.length() == 0) { + return false; + } + + if (LastWindowAttributesWidth.length() == 0) { + return false; + } + + if (LastWindowAttributesHeight.length() == 0) { + return false; + } + + return true; + } + + public static void printConfiguration(boolean systemcOn) { + System.out.println(getConfiguration(systemcOn)); + } + public static String getConfiguration(boolean systemcOn) { - StringBuffer sb = new StringBuffer(""); - - sb.append("Launcher:\n"); - sb.append("LauncherPort: " + LauncherPort + "\n"); - // Formal verification - sb.append("RTL:\n"); + StringBuffer sb = new StringBuffer(""); + + sb.append("Launcher:\n"); + sb.append("LauncherPort: " + LauncherPort + "\n"); + // Formal verification + sb.append("RTL:\n"); sb.append("RTLHost: " + RTLHost + "\n"); sb.append("RTLPath: " + RTLPath + "\n"); sb.append("DTA2DOTPath: " + DTA2DOTPath + "\n"); sb.append("RG2TLSAPath: " + RG2TLSAPath + "\n"); sb.append("RGSTRAPPath: " + RGSTRAPPath + "\n"); - sb.append("\nCADP:\n"); + sb.append("\nCADP:\n"); sb.append("AldebaranHost: " + AldebaranHost + "\n"); sb.append("AldebaranPath: " + AldebaranPath + "\n"); sb.append("BcgioPath: " + BcgioPath + "\n" ); sb.append("BcgminPath: " + BcgminPath + "\n" ); - sb.append("BisimulatorPath: " + BisimulatorPath + "\n" ); + sb.append("BisimulatorPath: " + BisimulatorPath + "\n" ); sb.append("BcgmergePath: " + BcgmergePath + "\n"); sb.append("CaesarPath: " + CaesarPath + "\n"); sb.append("CaesarOpenPath: " + CaesarOpenPath + "\n"); - sb.append("\nDotty:\n"); + sb.append("\nDotty:\n"); sb.append("DOTTYHost: " + DOTTYHost + "\n"); sb.append("DOTTYPath: " + DOTTYPath + "\n"); - // UPPAAL - sb.append("\nUPPAAL:\n"); + // UPPAAL + sb.append("\nUPPAAL:\n"); sb.append("UPPAALCodeDirectory: " + UPPAALCodeDirectory + "\n"); - sb.append("UPPAALVerifierPATH: " + UPPAALVerifierPath + "\n"); - sb.append("AVATARCPPSIMCompileCommand: " + AVATARCPPSIMCompileCommand + "\n"); - sb.append("AVATARCPPSIMCodeExecuteCommand: " + AVATARCPPSIMCodeExecuteCommand + "\n"); - sb.append("AVATARCPPSIMInteractiveExecuteCommand: " + AVATARCPPSIMInteractiveExecuteCommand + "\n"); - - // AVATAR: simulation - sb.append("\nAVATAR (simulation):\n"); + sb.append("UPPAALVerifierPATH: " + UPPAALVerifierPath + "\n"); + sb.append("AVATARCPPSIMCompileCommand: " + AVATARCPPSIMCompileCommand + "\n"); + sb.append("AVATARCPPSIMCodeExecuteCommand: " + AVATARCPPSIMCodeExecuteCommand + "\n"); + sb.append("AVATARCPPSIMInteractiveExecuteCommand: " + AVATARCPPSIMInteractiveExecuteCommand + "\n"); + + // AVATAR: simulation + sb.append("\nAVATAR (simulation):\n"); sb.append("AVATARSimulationHost: " + AVATARSimulationHost + "\n"); - sb.append("AVATARCPPSIMCodeDirectory: " + AVATARCPPSIMCodeDirectory + "\n"); - sb.append("UPPAALVerifierHOST: " + UPPAALVerifierHost + "\n"); - - // AVATAR: executable code - sb.append("\nAVATAR (executable code):\n"); + sb.append("AVATARCPPSIMCodeDirectory: " + AVATARCPPSIMCodeDirectory + "\n"); + sb.append("UPPAALVerifierHOST: " + UPPAALVerifierHost + "\n"); + + // AVATAR: executable code + sb.append("\nAVATAR (executable code):\n"); sb.append("AVATARExecutableCodeDirectory: " + AVATARExecutableCodeDirectory + "\n"); - sb.append("AVATARExecutableCodeHost: " + AVATARExecutableCodeHost + "\n"); - sb.append("AVATARExecutableCodeCompileCommand: " + AVATARExecutableCodeCompileCommand + "\n"); - sb.append("AVATARExecutableCodeExecuteCommand: " + AVATARExecutableCodeExecuteCommand + "\n"); - sb.append("AVATARExecutableSocLibCodeCompileCommand: " + AVATARExecutableSoclibCodeCompileCommand + "\n"); - sb.append("AVATARExecutableSocLibCodeExecuteCommand: " + AVATARExecutableSoclibCodeExecuteCommand + "\n"); - sb.append("AVATARExecutableSocLibCodeTraceFile: " + AVATARExecutableSoclibTraceFile + "\n"); - - sb.append("\nProVerif:\n"); + sb.append("AVATARExecutableCodeHost: " + AVATARExecutableCodeHost + "\n"); + sb.append("AVATARExecutableCodeCompileCommand: " + AVATARExecutableCodeCompileCommand + "\n"); + sb.append("AVATARExecutableCodeExecuteCommand: " + AVATARExecutableCodeExecuteCommand + "\n"); + sb.append("AVATARExecutableSocLibCodeCompileCommand: " + AVATARExecutableSoclibCodeCompileCommand + "\n"); + sb.append("AVATARExecutableSocLibCodeExecuteCommand: " + AVATARExecutableSoclibCodeExecuteCommand + "\n"); + sb.append("AVATARExecutableSocLibCodeTraceFile: " + AVATARExecutableSoclibTraceFile + "\n"); + + sb.append("\nProVerif:\n"); sb.append("ProVerifCodeDirectory: " + ProVerifCodeDirectory + "\n"); - sb.append("ProVerifVerifierPATH: " + ProVerifVerifierPath + "\n"); - sb.append("ProVerifVerifierHOST: " + ProVerifVerifierHost + "\n"); - - sb.append("\nYour files (modeling, librairies, etc.):\n"); + sb.append("ProVerifVerifierPATH: " + ProVerifVerifierPath + "\n"); + sb.append("ProVerifVerifierHOST: " + ProVerifVerifierHost + "\n"); + + sb.append("\nYour files (modeling, librairies, etc.):\n"); sb.append("FILEPath: " + FILEPath + "\n"); sb.append("LOTOSPath: " + LOTOSPath + "\n"); sb.append("LIBPath: " + LIBPath + "\n"); sb.append("IMGPath: " + IMGPath + "\n"); sb.append("GGraphPath: " + GGraphPath + "\n"); sb.append("TGraphPath: " + TGraphPath + "\n"); - sb.append("\nTTool update:\n"); + sb.append("\nTTool update:\n"); sb.append("TToolUpdateURL: " + TToolUpdateURL + "\n"); sb.append("TToolUpdateProxy: " + TToolUpdateProxy + "\n"); sb.append("TToolUpdateProxyPort: " + TToolUpdateProxyPort + "\n"); sb.append("TToolUpdateProxyHost: " + TToolUpdateProxyHost + "\n"); - sb.append("\nJava prototyping:\n"); + sb.append("\nJava prototyping:\n"); sb.append("JavaCodeDirectory: " + JavaCodeDirectory + "\n"); - sb.append("JavaHeader: " + JavaHeader + "\n"); + sb.append("JavaHeader: " + JavaHeader + "\n"); sb.append("JavaCompilerPath: " + JavaCompilerPath + "\n"); sb.append("TToolClassPath: " + TToolClassPath + "\n"); sb.append("JavaExecutePath: " + JavaExecutePath + "\n"); sb.append("SimuJavaCodeDirectory: " + SimuJavaCodeDirectory + "\n"); sb.append("TToolSimuClassPath: " + TToolSimuClassPath + "\n"); - - sb.append("\nDIPLODOCUS:\n"); + + sb.append("\nDIPLODOCUS:\n"); if (systemcOn) { sb.append("SystemCCodeDirectory: " + SystemCCodeDirectory + "\n"); sb.append("SystemCHost: " + SystemCHost + "\n"); sb.append("SystemCCodeCompileCommand: " + SystemCCodeCompileCommand + "\n"); sb.append("SystemCCodeExecuteCommand: " + SystemCCodeExecuteCommand + "\n"); - sb.append("SystemCCodeInteractiveExecuteCommand: " + SystemCCodeInteractiveExecuteCommand + "\n"); + sb.append("SystemCCodeInteractiveExecuteCommand: " + SystemCCodeInteractiveExecuteCommand + "\n"); sb.append("GTKWavePath: " + GTKWavePath + "\n"); + // TML + sb.append("TMLCodeDirectory: " + TMLCodeDirectory + "\n"); + + //Application C code + sb.append("CcodeDirectory: " + CcodeDirectory + "\n"); } - - // TML - - sb.append("TMLCodeDirectory" + TMLCodeDirectory + "\n"); - - //Application C code - sb.append("CcodeDirectory" + CcodeDirectory + "\n"); - - // VCD - sb.append("VCDPath: " + VCDPath + "\n"); - - // NC - sb.append("\nNetwork calculus:\n"); - sb.append("NCDirectory: " + NCDirectory + "\n"); - - - // Ontology - sb.append("\nOntologies:\n"); - sb.append("Requirement ontology website: " + RequirementOntologyWebsite + "\n"); - sb.append("Attack ontology website: " + AttackOntologyWebsite + "\n"); - - - sb.append("\nCustom external commands:\n"); - sb.append("ExternalCommand1Host: " + ExternalCommand1Host + "\n"); - sb.append("ExternalCommand1: " + ExternalCommand1 + "\n"); - sb.append("ExternalCommand2Host: " + ExternalCommand2Host + "\n"); - sb.append("ExternalCommand2: " + ExternalCommand2 + "\n"); - + + + + // VCD + sb.append("VCDPath: " + VCDPath + "\n"); + + // NC + sb.append("\nNetwork calculus:\n"); + sb.append("NCDirectory: " + NCDirectory + "\n"); + + + // Ontology + sb.append("\nOntologies:\n"); + sb.append("Requirement ontology website: " + RequirementOntologyWebsite + "\n"); + sb.append("Attack ontology website: " + AttackOntologyWebsite + "\n"); + + + sb.append("\nCustom external commands:\n"); + sb.append("ExternalCommand1Host: " + ExternalCommand1Host + "\n"); + sb.append("ExternalCommand1: " + ExternalCommand1 + "\n"); + sb.append("ExternalCommand2Host: " + ExternalCommand2Host + "\n"); + sb.append("ExternalCommand2: " + ExternalCommand2 + "\n"); + sb.append("\nInformation saved by TTool:\n"); sb.append("LastOpenFile: " + LastOpenFile + "\n"); - sb.append("LastWindowAttributesX: " + LastWindowAttributesX + "\n"); - sb.append("LastWindowAttributesY: " + LastWindowAttributesY + "\n"); - sb.append("LastWindowAttributesWidth: " + LastWindowAttributesWidth + "\n"); - sb.append("LastWindowAttributesHeight: " + LastWindowAttributesHeight + "\n"); - sb.append("LastWindowAttributesMax: " + LastWindowAttributesMax + "\n"); - - //Huy Truong - sb.append("ExternalServer " + ExternalServer + "\n"); - - return sb.toString(); - - } - + sb.append("LastWindowAttributesX: " + LastWindowAttributesX + "\n"); + sb.append("LastWindowAttributesY: " + LastWindowAttributesY + "\n"); + sb.append("LastWindowAttributesWidth: " + LastWindowAttributesWidth + "\n"); + sb.append("LastWindowAttributesHeight: " + LastWindowAttributesHeight + "\n"); + sb.append("LastWindowAttributesMax: " + LastWindowAttributesMax + "\n"); + + //Huy Truong + sb.append("ExternalServer " + ExternalServer + "\n"); + + return sb.toString(); + + } + public static void loadConfigurationFromXML(String data, boolean systemcOn) throws MalformedConfigurationException { - + try { ByteArrayInputStream bais = new ByteArrayInputStream(data.getBytes()); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = dbf.newDocumentBuilder();; - + // building nodes from xml String Document doc = db.parse(bais); NodeList nl; - - nl = doc.getElementsByTagName("LauncherPort"); + + nl = doc.getElementsByTagName("LauncherPort"); if (nl.getLength() > 0) LauncherPort(nl); nl = doc.getElementsByTagName("RTLHost"); @@ -479,7 +479,7 @@ public class ConfigurationTTool { nl = doc.getElementsByTagName("BcgminPath"); if (nl.getLength() > 0) BcgminPath(nl); - nl = doc.getElementsByTagName("BisimulatorPath"); + nl = doc.getElementsByTagName("BisimulatorPath"); if (nl.getLength() > 0) BisimulatorPath(nl); nl = doc.getElementsByTagName("CaesarPath"); @@ -527,7 +527,7 @@ public class ConfigurationTTool { nl = doc.getElementsByTagName("JavaCodeDirectory"); if (nl.getLength() > 0) JavaCodeDirectory(nl); - nl = doc.getElementsByTagName("JavaHeader"); + nl = doc.getElementsByTagName("JavaHeader"); if (nl.getLength() > 0) JavaHeader(nl); nl = doc.getElementsByTagName("JavaCompilerPath"); @@ -545,152 +545,152 @@ public class ConfigurationTTool { nl = doc.getElementsByTagName("JavaExecutePath"); if (nl.getLength() > 0) JavaExecutePath(nl); - nl = doc.getElementsByTagName("NCDirectory"); + nl = doc.getElementsByTagName("NCDirectory"); if (nl.getLength() > 0) NCDirectory(nl); nl = doc.getElementsByTagName("SystemCCodeDirectory"); if (nl.getLength() > 0) SystemCCodeDirectory(nl); - - // AVATAR Simulation - nl = doc.getElementsByTagName("AVATARSimulationHost"); + + // AVATAR Simulation + nl = doc.getElementsByTagName("AVATARSimulationHost"); if (nl.getLength() > 0) AVATARSimulationHost(nl); - nl = doc.getElementsByTagName("AVATARCPPSIMCodeDirectory"); + nl = doc.getElementsByTagName("AVATARCPPSIMCodeDirectory"); if (nl.getLength() > 0) AVATARCPPSIMCodeDirectory(nl); - nl = doc.getElementsByTagName("AVATARCPPSIMCompileCommand"); + nl = doc.getElementsByTagName("AVATARCPPSIMCompileCommand"); if (nl.getLength() > 0) AVATARCPPSIMCompileCommand(nl); - nl = doc.getElementsByTagName("AVATARCPPSIMCodeExecuteCommand"); + nl = doc.getElementsByTagName("AVATARCPPSIMCodeExecuteCommand"); if (nl.getLength() > 0) AVATARCPPSIMCodeExecuteCommand(nl); - nl = doc.getElementsByTagName("AVATARCPPSIMInteractiveExecuteCommand"); + nl = doc.getElementsByTagName("AVATARCPPSIMInteractiveExecuteCommand"); if (nl.getLength() > 0) AVATARCPPSIMInteractiveExecuteCommand(nl); - - // AVATAR Executable code - nl = doc.getElementsByTagName("AVATARExecutableCodeDirectory"); + + // AVATAR Executable code + nl = doc.getElementsByTagName("AVATARExecutableCodeDirectory"); if (nl.getLength() > 0) AVATARExecutableCodeDirectory(nl); - nl = doc.getElementsByTagName("AVATARExecutableCodeHost"); + nl = doc.getElementsByTagName("AVATARExecutableCodeHost"); if (nl.getLength() > 0) AVATARExecutableCodeHost(nl); - nl = doc.getElementsByTagName("AVATARExecutableCodeCompileCommand"); + nl = doc.getElementsByTagName("AVATARExecutableCodeCompileCommand"); if (nl.getLength() > 0) AVATARExecutableCodeCompileCommand(nl); - nl = doc.getElementsByTagName("AVATARExecutableCodeExecuteCommand"); + nl = doc.getElementsByTagName("AVATARExecutableCodeExecuteCommand"); if (nl.getLength() > 0) AVATARExecutableCodeExecuteCommand(nl); - nl = doc.getElementsByTagName("AVATARExecutableSoclibCodeCompileCommand"); + nl = doc.getElementsByTagName("AVATARExecutableSoclibCodeCompileCommand"); if (nl.getLength() > 0) AVATARExecutableSoclibCodeCompileCommand(nl); - nl = doc.getElementsByTagName("AVATARExecutableSoclibCodeExecuteCommand"); + nl = doc.getElementsByTagName("AVATARExecutableSoclibCodeExecuteCommand"); if (nl.getLength() > 0) AVATARExecutableSoclibCodeExecuteCommand(nl); - nl = doc.getElementsByTagName("AVATARExecutableSoclibTraceFile"); + nl = doc.getElementsByTagName("AVATARExecutableSoclibTraceFile"); if (nl.getLength() > 0) AVATARExecutableSoclibTraceFile(nl); - - if (systemcOn) { - nl = doc.getElementsByTagName("SystemCHost"); - if (nl.getLength() > 0) - SystemCHost(nl); - nl = doc.getElementsByTagName("SystemCCodeCompileCommand"); - if (nl.getLength() > 0) - SystemCCodeCompileCommand(nl); - nl = doc.getElementsByTagName("SystemCCodeExecuteCommand"); - if (nl.getLength() > 0) - SystemCCodeExecuteCommand(nl); - nl = doc.getElementsByTagName("SystemCCodeInteractiveExecuteCommand"); - if (nl.getLength() > 0) - SystemCCodeInteractiveExecuteCommand(nl); - nl = doc.getElementsByTagName("GTKWavePath"); - if (nl.getLength() > 0) - GTKWavePath(nl); - } - - nl = doc.getElementsByTagName("TMLCodeDirectory"); - if (nl.getLength() > 0) - TMLCodeDirectory(nl); - - nl = doc.getElementsByTagName("CcodeDirectory"); - if (nl.getLength() > 0) - CcodeDirectory(nl); - - nl = doc.getElementsByTagName("VCDPath"); - if (nl.getLength() > 0) - VCDPath(nl); - - nl = doc.getElementsByTagName("UPPAALCodeDirectory"); - if (nl.getLength() > 0) - UPPAALCodeDirectory(nl); - - nl = doc.getElementsByTagName("UPPAALVerifierPath"); - if (nl.getLength() > 0) - UPPAALVerifierPath(nl); - - nl = doc.getElementsByTagName("UPPAALVerifierHost"); - if (nl.getLength() > 0) - UPPAALVerifierHost(nl); - - nl = doc.getElementsByTagName("ProVerifCodeDirectory"); - if (nl.getLength() > 0) - ProVerifCodeDirectory(nl); - - nl = doc.getElementsByTagName("ProVerifVerifierPath"); - if (nl.getLength() > 0) - ProVerifVerifierPath(nl); - - nl = doc.getElementsByTagName("ProVerifVerifierHost"); - if (nl.getLength() > 0) - ProVerifVerifierHost(nl); - - - // Ontologies - nl = doc.getElementsByTagName("RequirementOntologyWebsite"); - if (nl.getLength() > 0) - RequirementOntologyWebsite(nl); - - nl = doc.getElementsByTagName("AttackOntologyWebsite"); - if (nl.getLength() > 0) - AttackOntologyWebsite(nl); - - nl = doc.getElementsByTagName("ExternalCommand1Host"); - if (nl.getLength() > 0) - ExternalCommand1Host(nl); - - nl = doc.getElementsByTagName("ExternalCommand1"); - if (nl.getLength() > 0) - ExternalCommand1(nl); - - nl = doc.getElementsByTagName("ExternalCommand2Host"); - if (nl.getLength() > 0) - ExternalCommand2Host(nl); - - nl = doc.getElementsByTagName("ExternalCommand2"); - if (nl.getLength() > 0) - ExternalCommand2(nl); - - nl = doc.getElementsByTagName("LastOpenFile"); - if (nl.getLength() > 0) - LastOpenFile(nl); - - nl = doc.getElementsByTagName("LastWindowAttributes"); - if (nl.getLength() > 0) - LastWindowAttributes(nl); - - nl = doc.getElementsByTagName("ExternalServer"); - if (nl.getLength() >0) - ExternalServer(nl); - - - } catch (Exception e) { - throw new MalformedConfigurationException(e.getMessage()); - } - } - - private static void LauncherPort(NodeList nl) throws MalformedConfigurationException { + + if (systemcOn) { + nl = doc.getElementsByTagName("SystemCHost"); + if (nl.getLength() > 0) + SystemCHost(nl); + nl = doc.getElementsByTagName("SystemCCodeCompileCommand"); + if (nl.getLength() > 0) + SystemCCodeCompileCommand(nl); + nl = doc.getElementsByTagName("SystemCCodeExecuteCommand"); + if (nl.getLength() > 0) + SystemCCodeExecuteCommand(nl); + nl = doc.getElementsByTagName("SystemCCodeInteractiveExecuteCommand"); + if (nl.getLength() > 0) + SystemCCodeInteractiveExecuteCommand(nl); + nl = doc.getElementsByTagName("GTKWavePath"); + if (nl.getLength() > 0) + GTKWavePath(nl); + } + + nl = doc.getElementsByTagName("TMLCodeDirectory"); + if (nl.getLength() > 0) + TMLCodeDirectory(nl); + + nl = doc.getElementsByTagName("CcodeDirectory"); + if (nl.getLength() > 0) + CcodeDirectory(nl); + + nl = doc.getElementsByTagName("VCDPath"); + if (nl.getLength() > 0) + VCDPath(nl); + + nl = doc.getElementsByTagName("UPPAALCodeDirectory"); + if (nl.getLength() > 0) + UPPAALCodeDirectory(nl); + + nl = doc.getElementsByTagName("UPPAALVerifierPath"); + if (nl.getLength() > 0) + UPPAALVerifierPath(nl); + + nl = doc.getElementsByTagName("UPPAALVerifierHost"); + if (nl.getLength() > 0) + UPPAALVerifierHost(nl); + + nl = doc.getElementsByTagName("ProVerifCodeDirectory"); + if (nl.getLength() > 0) + ProVerifCodeDirectory(nl); + + nl = doc.getElementsByTagName("ProVerifVerifierPath"); + if (nl.getLength() > 0) + ProVerifVerifierPath(nl); + + nl = doc.getElementsByTagName("ProVerifVerifierHost"); + if (nl.getLength() > 0) + ProVerifVerifierHost(nl); + + + // Ontologies + nl = doc.getElementsByTagName("RequirementOntologyWebsite"); + if (nl.getLength() > 0) + RequirementOntologyWebsite(nl); + + nl = doc.getElementsByTagName("AttackOntologyWebsite"); + if (nl.getLength() > 0) + AttackOntologyWebsite(nl); + + nl = doc.getElementsByTagName("ExternalCommand1Host"); + if (nl.getLength() > 0) + ExternalCommand1Host(nl); + + nl = doc.getElementsByTagName("ExternalCommand1"); + if (nl.getLength() > 0) + ExternalCommand1(nl); + + nl = doc.getElementsByTagName("ExternalCommand2Host"); + if (nl.getLength() > 0) + ExternalCommand2Host(nl); + + nl = doc.getElementsByTagName("ExternalCommand2"); + if (nl.getLength() > 0) + ExternalCommand2(nl); + + nl = doc.getElementsByTagName("LastOpenFile"); + if (nl.getLength() > 0) + LastOpenFile(nl); + + nl = doc.getElementsByTagName("LastWindowAttributes"); + if (nl.getLength() > 0) + LastWindowAttributes(nl); + + nl = doc.getElementsByTagName("ExternalServer"); + if (nl.getLength() >0) + ExternalServer(nl); + + + } catch (Exception e) { + throw new MalformedConfigurationException(e.getMessage()); + } + } + + private static void LauncherPort(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); LauncherPort = elt.getAttribute("data"); @@ -698,7 +698,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void RTLHOST(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -707,7 +707,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void RTLPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -716,7 +716,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void DTA2DOTPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -725,7 +725,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void RG2TLSAPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -734,7 +734,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void RGSTRAPPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -743,7 +743,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void AldebaranPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -752,7 +752,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void AldebaranHost(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -761,7 +761,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void BcgioPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -770,7 +770,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void BcgmergePath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -779,7 +779,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void BcgminPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -788,8 +788,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void BisimulatorPath(NodeList nl) throws MalformedConfigurationException { + + private static void BisimulatorPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); BisimulatorPath = elt.getAttribute("data"); @@ -797,7 +797,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void CaesarPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -806,7 +806,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void CaesarOpenPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -815,7 +815,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void DOTTYHost(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -824,7 +824,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void DOTTYPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -833,7 +833,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void FILEPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -842,7 +842,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void LOTOSPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -851,7 +851,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void LIBPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -860,7 +860,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void IMGPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -869,7 +869,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void GGraphPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -878,7 +878,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void TGraphPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -887,7 +887,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void TToolUpdateURL(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -896,7 +896,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void TToolUpdateProxy(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -905,7 +905,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void TToolUpdateProxyPort(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -914,7 +914,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void TToolUpdateProxyHost(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -923,7 +923,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void JavaCodeDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -932,7 +932,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void JavaHeader(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -941,7 +941,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void JavaCompilerPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -953,7 +953,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void TToolClassPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -962,7 +962,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void SimuJavaCodeDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -971,7 +971,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void TToolSimuClassPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -980,7 +980,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void JavaExecutePath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -992,7 +992,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void NCDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1001,7 +1001,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void SystemCCodeDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1010,7 +1010,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void SystemCHost(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1019,7 +1019,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void SystemCCodeCompileCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1028,7 +1028,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void SystemCCodeExecuteCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1037,8 +1037,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void SystemCCodeInteractiveExecuteCommand(NodeList nl) throws MalformedConfigurationException { + + private static void SystemCCodeInteractiveExecuteCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); SystemCCodeInteractiveExecuteCommand = elt.getAttribute("data"); @@ -1046,7 +1046,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void GTKWavePath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1055,7 +1055,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void TMLCodeDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1073,8 +1073,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void VCDPath(NodeList nl) throws MalformedConfigurationException { + + private static void VCDPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); VCDPath = elt.getAttribute("data"); @@ -1082,7 +1082,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void UPPAALCodeDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1091,8 +1091,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void UPPAALVerifierPath(NodeList nl) throws MalformedConfigurationException { + + private static void UPPAALVerifierPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); UPPAALVerifierPath = elt.getAttribute("data"); @@ -1100,8 +1100,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void UPPAALVerifierHost(NodeList nl) throws MalformedConfigurationException { + + private static void UPPAALVerifierHost(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); UPPAALVerifierHost = elt.getAttribute("data"); @@ -1109,8 +1109,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARSimulationHost(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARSimulationHost(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARSimulationHost = elt.getAttribute("data"); @@ -1118,8 +1118,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARCPPSIMCodeDirectory(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARCPPSIMCodeDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARCPPSIMCodeDirectory = elt.getAttribute("data"); @@ -1127,8 +1127,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARCPPSIMCompileCommand(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARCPPSIMCompileCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARCPPSIMCompileCommand = elt.getAttribute("data"); @@ -1136,8 +1136,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARCPPSIMCodeExecuteCommand(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARCPPSIMCodeExecuteCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARCPPSIMCodeExecuteCommand = elt.getAttribute("data"); @@ -1145,8 +1145,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARCPPSIMInteractiveExecuteCommand(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARCPPSIMInteractiveExecuteCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARCPPSIMInteractiveExecuteCommand = elt.getAttribute("data"); @@ -1154,8 +1154,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARExecutableCodeDirectory(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARExecutableCodeDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARExecutableCodeDirectory = elt.getAttribute("data"); @@ -1163,8 +1163,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARExecutableCodeHost(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARExecutableCodeHost(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARExecutableCodeHost = elt.getAttribute("data"); @@ -1172,8 +1172,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARExecutableCodeCompileCommand(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARExecutableCodeCompileCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARExecutableCodeCompileCommand = elt.getAttribute("data"); @@ -1181,8 +1181,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARExecutableCodeExecuteCommand(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARExecutableCodeExecuteCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARExecutableCodeExecuteCommand = elt.getAttribute("data"); @@ -1190,8 +1190,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARExecutableSoclibCodeCompileCommand(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARExecutableSoclibCodeCompileCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARExecutableSoclibCodeCompileCommand = elt.getAttribute("data"); @@ -1199,8 +1199,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARExecutableSoclibCodeExecuteCommand(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARExecutableSoclibCodeExecuteCommand(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARExecutableSoclibCodeExecuteCommand = elt.getAttribute("data"); @@ -1208,8 +1208,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void AVATARExecutableSoclibTraceFile(NodeList nl) throws MalformedConfigurationException { + + private static void AVATARExecutableSoclibTraceFile(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); AVATARExecutableSoclibTraceFile = elt.getAttribute("data"); @@ -1217,7 +1217,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void ProVerifCodeDirectory(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1226,8 +1226,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void ProVerifVerifierPath(NodeList nl) throws MalformedConfigurationException { + + private static void ProVerifVerifierPath(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); ProVerifVerifierPath = elt.getAttribute("data"); @@ -1235,8 +1235,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void ProVerifVerifierHost(NodeList nl) throws MalformedConfigurationException { + + private static void ProVerifVerifierHost(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); ProVerifVerifierHost = elt.getAttribute("data"); @@ -1244,7 +1244,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void RequirementOntologyWebsite(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1253,7 +1253,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void AttackOntologyWebsite(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1262,8 +1262,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void ExternalCommand1Host(NodeList nl) throws MalformedConfigurationException { + + private static void ExternalCommand1Host(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); ExternalCommand1Host = elt.getAttribute("data"); @@ -1271,8 +1271,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void ExternalCommand1(NodeList nl) throws MalformedConfigurationException { + + private static void ExternalCommand1(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); ExternalCommand1 = elt.getAttribute("data"); @@ -1280,8 +1280,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void ExternalCommand2Host(NodeList nl) throws MalformedConfigurationException { + + private static void ExternalCommand2Host(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); ExternalCommand2Host = elt.getAttribute("data"); @@ -1289,8 +1289,8 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void ExternalCommand2(NodeList nl) throws MalformedConfigurationException { + + private static void ExternalCommand2(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); ExternalCommand2 = elt.getAttribute("data"); @@ -1298,7 +1298,7 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void LastOpenFile(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); @@ -1308,20 +1308,20 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - - private static void LastWindowAttributes(NodeList nl) throws MalformedConfigurationException { + + private static void LastWindowAttributes(NodeList nl) throws MalformedConfigurationException { try { Element elt = (Element)(nl.item(0)); LastWindowAttributesX = elt.getAttribute("x"); - LastWindowAttributesY = elt.getAttribute("y"); - LastWindowAttributesWidth = elt.getAttribute("width"); - LastWindowAttributesHeight = elt.getAttribute("height"); - LastWindowAttributesMax = elt.getAttribute("max"); + LastWindowAttributesY = elt.getAttribute("y"); + LastWindowAttributesWidth = elt.getAttribute("width"); + LastWindowAttributesHeight = elt.getAttribute("height"); + LastWindowAttributesMax = elt.getAttribute("max"); } catch (Exception e) { throw new MalformedConfigurationException(e.getMessage()); } } - + private static void ExternalServer(NodeList nl) throws MalformedConfigurationException { try { @@ -1333,9 +1333,9 @@ public class ConfigurationTTool { throw new MalformedConfigurationException(e.getMessage()); } } - + public static boolean isConfigured(String s) { - return ((s != null) && (s.trim().length() > 0)); + return ((s != null) && (s.trim().length() > 0)); } - + } // -- GitLab