From b4586542870d0e27b3d6da9fbd3eb30fd36d1d7f Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Tue, 8 May 2018 17:27:14 +0200 Subject: Regenerated Application Configuration Language --- .../application/validation/MetamodelValidator.java | 48 +++++++++------------- .../validation/QueryAndMetamodelValidator.java | 23 ++++------- 2 files changed, 27 insertions(+), 44 deletions(-) (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/MetamodelValidator.java b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/MetamodelValidator.java index 44d86022..2a2e1047 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/MetamodelValidator.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/MetamodelValidator.java @@ -20,19 +20,11 @@ import org.eclipse.xtext.xbase.lib.Extension; public class MetamodelValidator { public LinkedList validateMetamodel(final EcoreMetamodelDescriptor descriptor) { final LinkedList errors = new LinkedList(); - List _classes = descriptor.getClasses(); - this.allSupertypesAreIncluded(_classes, errors); - List _enums = descriptor.getEnums(); - List _literals = descriptor.getLiterals(); - this.allEnumTypesareIncluded(_enums, _literals, errors); - List _classes_1 = descriptor.getClasses(); - List _references = descriptor.getReferences(); - this.referenceEndpointsAreIncluded(_classes_1, _references, errors); - List _classes_2 = descriptor.getClasses(); - List _attributes = descriptor.getAttributes(); - this.attributeSourcePontIsIncluded(_classes_2, _attributes, errors); - List _attributes_1 = descriptor.getAttributes(); - this.attributeTargetIsSupported(_attributes_1, errors); + this.allSupertypesAreIncluded(descriptor.getClasses(), errors); + this.allEnumTypesareIncluded(descriptor.getEnums(), descriptor.getLiterals(), errors); + this.referenceEndpointsAreIncluded(descriptor.getClasses(), descriptor.getReferences(), errors); + this.attributeSourcePontIsIncluded(descriptor.getClasses(), descriptor.getAttributes(), errors); + this.attributeTargetIsSupported(descriptor.getAttributes(), errors); return errors; } @@ -57,10 +49,10 @@ public class MetamodelValidator { StringConcatenation _builder = new StringConcatenation(); _builder.append("Metamodel contains \""); String _name = c.getName(); - _builder.append(_name, ""); + _builder.append(_name); _builder.append("\" but not contains its supertype \""); String _name_1 = s.getName(); - _builder.append(_name_1, ""); + _builder.append(_name_1); _builder.append("\"!"); errors.add(_builder.toString()); } @@ -70,18 +62,16 @@ public class MetamodelValidator { public void allEnumTypesareIncluded(final List enums, final List literals, final List errors) { for (final EEnumLiteral l : literals) { - EEnum _eEnum = l.getEEnum(); - boolean _contains = enums.contains(_eEnum); + boolean _contains = enums.contains(l.getEEnum()); boolean _not = (!_contains); if (_not) { StringConcatenation _builder = new StringConcatenation(); _builder.append("Metamodel contains literal \""); String _name = l.getName(); - _builder.append(_name, ""); + _builder.append(_name); _builder.append("\" but does not contains enum \""); - EEnum _eEnum_1 = l.getEEnum(); - String _name_1 = _eEnum_1.getName(); - _builder.append(_name_1, ""); + String _name_1 = l.getEEnum().getName(); + _builder.append(_name_1); _builder.append("\"!"); errors.add(_builder.toString()); } @@ -98,10 +88,10 @@ public class MetamodelValidator { StringConcatenation _builder = new StringConcatenation(); _builder.append("Metamodel contains reference \""); String _name = reference.getName(); - _builder.append(_name, ""); + _builder.append(_name); _builder.append("\" but does not contains its source type \""); String _name_1 = src.getName(); - _builder.append(_name_1, ""); + _builder.append(_name_1); _builder.append("\"!"); errors.add(_builder.toString()); } @@ -112,10 +102,10 @@ public class MetamodelValidator { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("Metamodel contains reference \""); String _name_2 = reference.getName(); - _builder_1.append(_name_2, ""); + _builder_1.append(_name_2); _builder_1.append("\" but does not contains its target type \""); String _name_3 = trg.getName(); - _builder_1.append(_name_3, ""); + _builder_1.append(_name_3); _builder_1.append("\"!"); errors.add(_builder_1.toString()); } @@ -133,10 +123,10 @@ public class MetamodelValidator { StringConcatenation _builder = new StringConcatenation(); _builder.append("Metamodel contains attribute \""); String _name = attribute.getName(); - _builder.append(_name, ""); + _builder.append(_name); _builder.append("\" but does not contains its source type \""); String _name_1 = src.getName(); - _builder.append(_name_1, ""); + _builder.append(_name_1); _builder.append("\"!"); errors.add(_builder.toString()); } @@ -154,10 +144,10 @@ public class MetamodelValidator { StringConcatenation _builder = new StringConcatenation(); _builder.append("Metamodels contains attribute \""); String _name = attribute.getName(); - _builder.append(_name, ""); + _builder.append(_name); _builder.append("\" with unsupported type \""); String _name_1 = trg.getName(); - _builder.append(_name_1, ""); + _builder.append(_name_1); _builder.append("\"!"); errors.add(_builder.toString()); } diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java index 1365d64d..3ed13964 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java @@ -8,7 +8,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; @@ -17,7 +16,7 @@ import org.eclipse.emf.ecore.EEnumLiteral; import org.eclipse.emf.ecore.ENamedElement; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; -import org.eclipse.viatra.query.patternlanguage.patternLanguage.Pattern; +import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern; import org.eclipse.xtend2.lib.StringConcatenation; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Functions.Function1; @@ -38,8 +37,7 @@ public class QueryAndMetamodelValidator { List _attributes = metamodel.getAttributes(); Iterable _plus_2 = Iterables.concat(_plus_1, _attributes); List _references = metamodel.getReferences(); - Iterable _plus_3 = Iterables.concat(_plus_2, _references); - final Set elementsInMetamodel = IterableExtensions.toSet(_plus_3); + final Set elementsInMetamodel = IterableExtensions.toSet(Iterables.concat(_plus_2, _references)); final LinkedList errors = new LinkedList(); for (final Pattern pattern : patterns) { { @@ -51,9 +49,9 @@ public class QueryAndMetamodelValidator { StringConcatenation _builder = new StringConcatenation(); _builder.append("Pattern \""); String _name = pattern.getName(); - _builder.append(_name, ""); + _builder.append(_name); _builder.append("\" refers to an element \""); - _builder.append(element, ""); + _builder.append(element); _builder.append("\" that is not included to the selected metamodel!"); errors.add(_builder.toString()); } @@ -64,11 +62,9 @@ public class QueryAndMetamodelValidator { } public Iterable getReferredNamedElements(final Pattern pattern) { - TreeIterator _eAllContents = pattern.eAllContents(); - final List elements = IteratorExtensions.toList(_eAllContents); + final List elements = IteratorExtensions.toList(pattern.eAllContents()); final Function1> _function = (EObject element) -> { - EClass _eClass = element.eClass(); - final EList references = _eClass.getEAllReferences(); + final EList references = element.eClass().getEAllReferences(); final Function1> _function_1 = (EReference r) -> { boolean _isMany = r.isMany(); if (_isMany) { @@ -83,11 +79,8 @@ public class QueryAndMetamodelValidator { } } }; - List> _map = ListExtensions.>map(references, _function_1); - Iterable _flatten = Iterables.concat(_map); - return Iterables.filter(_flatten, ENamedElement.class); + return Iterables.filter(Iterables.concat(ListExtensions.>map(references, _function_1)), ENamedElement.class); }; - List> _map = ListExtensions.>map(elements, _function); - return Iterables.concat(_map); + return Iterables.concat(ListExtensions.>map(elements, _function)); } } -- cgit v1.2.3-54-g00ecf