Commit 369195a4 authored by Pietro Braghieri's avatar Pietro Braghieri

Merge branch '34-add-quotes-to-o-option-of-fbk-tools' into 'master'

Resolve "Add quotes to -o option of fbk tools"

Closes #34

See merge request ESProjects/SDE!36
parents 34e608e4 07e8a596
......@@ -180,7 +180,7 @@ public class CheckModel extends NuxmvFunction
setResultFile(FileUtils.generateRandomFile(getSessionWorkspaceDir(),"result_","xml").toString());
}
commands.add(new ToolCommand("show_traces").addArgument("-p","4").addArgument("-o", getResultFile()));
commands.add(new ToolCommand("show_traces").addArgument("-p","4").addArgument("-o", quote(getResultFile())));
commands.add(new ToolCommand("quit"));
}
......
......@@ -118,7 +118,7 @@ public class CheckContractCompositeImplementation extends OcraFunction
}
command.addArgument("-f", "xml");
command.addArgument("-o", getResultFile());
command.addArgument("-o", quote(getResultFile()));
commands.add(new ToolCommand("set on_failure_script_quits"));
......
......@@ -134,7 +134,7 @@ public class CheckContractImplementation extends OcraFunction
}
command.addArgument("-f", "xml");
command.addArgument("-o", getResultFile());
command.addArgument("-o", quote(getResultFile()));
commands.add(new ToolCommand("set on_failure_script_quits"));
......
......@@ -81,7 +81,7 @@ public class CheckContractRefinement extends OcraFunction
}
command.addArgument("-f", "xml");
command.addArgument("-o", getResultFile());
command.addArgument("-o", quote(getResultFile()));
commands.add(new ToolCommand("set on_failure_script_quits"));
commands.add(command);
......
......@@ -162,7 +162,7 @@ public class CheckValidationProperty extends OcraFunction
}
command.addArgument("-f", "xml");
command.addArgument("-o", getResultFile());
command.addArgument("-o", quote(getResultFile()));
commands.add(new ToolCommand("set on_failure_script_quits"));
commands.add(command);
......
......@@ -70,7 +70,7 @@ public class ComputeContractFaultTree extends OcraFunction
}
command.addArgument("-f", "xml");
command.addArgument("-o", getResultFile());
command.addArgument("-o", quote(getResultFile()));
commands.add(new ToolCommand("set on_failure_script_quits"));
......
......@@ -44,7 +44,7 @@ public class GetParametersFromParamArchitecture extends OcraFunction {
if (getContractModel() != null)
{
command.addArgument("-i", getLocalFile(getContractModel()));
command.addArgument("-i", quote(getLocalFile(getContractModel())));
}
if (getBoundLength() != null) {
......@@ -56,7 +56,7 @@ public class GetParametersFromParamArchitecture extends OcraFunction {
setResultFile(FileUtils.generateRandomFile(getSessionWorkspaceDir(),"result_","csv").toString());
}
command.addArgument("-o", getResultFile());
command.addArgument("-o", quote(getResultFile()));
commands.add(new ToolCommand("set on_failure_script_quits"));
commands.add(command);
......
......@@ -63,12 +63,12 @@ public class InstantiateParamArchitecture extends OcraFunction
if( getContractModel() != null )
{
command.addArgument("-i", getLocalFile(getContractModel()));
command.addArgument("-i", quote(getLocalFile(getContractModel())));
}
if( getArchitectureParameters() != null )
{
command.addArgument("-I", getLocalFile(getArchitectureParameters()));
command.addArgument("-I", quote(getLocalFile(getArchitectureParameters())));
}
if( StringUtils.isBlank(getResultFile()) )
......@@ -76,7 +76,7 @@ public class InstantiateParamArchitecture extends OcraFunction
setResultFile(FileUtils.generateRandomFile(getSessionWorkspaceDir(),"result_","oss").toString());
}
command.addArgument("-o", getResultFile());
command.addArgument("-o", quote(getResultFile()));
commands.add(new ToolCommand("set on_failure_script_quits"));
commands.add(command);
......
......@@ -107,7 +107,7 @@ public class PrintSystemImplementation extends OcraFunction
setResultFile(FileUtils.generateRandomFile(getSessionWorkspaceDir(),"result_","smv").toString());
}
command.addArgument("-o", getResultFile());
command.addArgument("-o", quote(getResultFile()));
commands.add(new ToolCommand("set on_failure_script_quits"));
......
......@@ -168,7 +168,7 @@ public class ComputeFaultTree extends XsapFunction
}
final String outputConsole = FileUtils.generateRandomFile(getSessionWorkspaceDir(),"output_","txt").toString();
computeFtCmd.addArgument("-o", outputConsole);
computeFtCmd.addArgument("-o", quote(outputConsole));
final String resultFilePrefix = "SDE_";
......
......@@ -131,7 +131,7 @@ public class ComputeFmeaTable extends XsapFunction
}
final String outputConsole = FileUtils.generateRandomFile(getSessionWorkspaceDir(),"output_","txt").toString();
computeFtCmd.addArgument("-o", outputConsole);
computeFtCmd.addArgument("-o", quote(outputConsole));
final String resultFilePrefix = "SDE_";
......
......@@ -110,7 +110,7 @@ public class ExpandFei extends ToolFunction
{
final ToolCommand command = new ToolCommand();
command.addArgument("-p","dummy");
command.addArgument("--xml-fei",getLocalFile(faultExtensions));
command.addArgument("--xml-fei",quote(getLocalFile(faultExtensions)));
command.addArgument("-d",".");
commands.add(command);
......
......@@ -108,7 +108,7 @@ public class ExtendModel extends XsapFunction
final ToolCommand feExtendCmd = new ToolCommand("fe_extend_module");
feExtendCmd.addArgument("-m", quote(getLocalFile(getFaultModes())));
feExtendCmd.addArgument("-o", extendedModel);
feExtendCmd.addArgument("-o", quote(extendedModel));
commands.add(feExtendCmd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment