From 6079b3c8ddff996a64105ca05040cf01d071b304 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 21 Mar 2019 15:05:28 +0100 Subject: Do not throw exception for empty package names in application configuration files --- .../scoping/ApplicationConfigurationScopeProvider.xtend | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend index b049b4c9..35a747c8 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend @@ -112,7 +112,7 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura private def getViatraPackageScope(EObject context, EReference reference, ConfigurationScript document) { val patternModelNameConverter = [ PatternModel patternModel | - qualifiedNameConverter.toQualifiedName(patternModel.packageName) + toQualifiedNameOrNull(patternModel.packageName) ] Scopes.scopeFor(document.allViatraPackages, patternModelNameConverter, super.getScope(context, reference)) } @@ -129,7 +129,7 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura private def getCftPackageScope(EObject context, EReference reference, ConfigurationScript document) { val cftModelNameConverter = [ CftModel cftModel | - qualifiedNameConverter.toQualifiedName(cftModel.packageName) + toQualifiedNameOrNull(cftModel.packageName) ] Scopes.scopeFor(document.allCftPackages, cftModelNameConverter, super.getScope(context, reference)) } @@ -143,4 +143,12 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura } Scopes.scopeFor(transformations) } + + private def toQualifiedNameOrNull(String packageName) { + if (packageName === null) { + null + } else { + qualifiedNameConverter.toQualifiedName(packageName) + } + } } -- cgit v1.2.3-54-g00ecf