|
|
@ -1414,6 +1414,10 @@ public class Prism extends PrismComponent implements PrismSettingsListener |
|
|
try { |
|
|
try { |
|
|
// parse file |
|
|
// parse file |
|
|
modulesFile = prismParser.parseModulesFile(strModel, typeOverride); |
|
|
modulesFile = prismParser.parseModulesFile(strModel, typeOverride); |
|
|
|
|
|
|
|
|
|
|
|
if (modulesFile != null) |
|
|
|
|
|
modulesFile.setLocation(file.toPath().toAbsolutePath()); |
|
|
|
|
|
|
|
|
} finally { |
|
|
} finally { |
|
|
// release prism parser |
|
|
// release prism parser |
|
|
releasePrismParser(); |
|
|
releasePrismParser(); |
|
|
@ -1510,7 +1514,10 @@ public class Prism extends PrismComponent implements PrismSettingsListener |
|
|
PrismLanguageTranslator importer = createPrismLanguageTranslator(lang); |
|
|
PrismLanguageTranslator importer = createPrismLanguageTranslator(lang); |
|
|
importer.load(file); |
|
|
importer.load(file); |
|
|
String prismModelString = importer.translateToString(); |
|
|
String prismModelString = importer.translateToString(); |
|
|
return parseModelString(prismModelString); |
|
|
|
|
|
|
|
|
ModulesFile result = parseModelString(prismModelString); |
|
|
|
|
|
if (result != null) |
|
|
|
|
|
result.setLocation(file.toPath().toAbsolutePath()); |
|
|
|
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -1561,7 +1568,11 @@ public class Prism extends PrismComponent implements PrismSettingsListener |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Parse string as PRISM model and return |
|
|
// Parse string as PRISM model and return |
|
|
return parseModelString(modelString); |
|
|
|
|
|
|
|
|
ModulesFile result = parseModelString(modelString); |
|
|
|
|
|
if (result != null) |
|
|
|
|
|
result.setLocation(file.toPath().toAbsolutePath()); |
|
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -1600,6 +1611,8 @@ public class Prism extends PrismComponent implements PrismSettingsListener |
|
|
try { |
|
|
try { |
|
|
// parse file |
|
|
// parse file |
|
|
propertiesFile = prismParser.parsePropertiesFile(modelInfo, strProperties); |
|
|
propertiesFile = prismParser.parsePropertiesFile(modelInfo, strProperties); |
|
|
|
|
|
if (propertiesFile != null) |
|
|
|
|
|
propertiesFile.setLocation(file.toPath().toAbsolutePath()); |
|
|
} finally { |
|
|
} finally { |
|
|
// release prism parser |
|
|
// release prism parser |
|
|
releasePrismParser(); |
|
|
releasePrismParser(); |
|
|
|