Fixed typo in AQL 'direclty'.

eclipse-acceleo · Jan 5, 2024 · eb3af0e · eb3af0e
1 parent 0b0c314
commit eb3af0e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/...rg.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EPackageProvider.java b/...rg.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EPackageProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2024 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -768,10 +768,10 @@ public Set<EClass> getContainedEClasses(EClass eCls) {
 	 */
 	@Override
 	public Set<EClass> getAllContainedEClasses(EClass eCls) {
-		final Set<EClass> direcltyContainedEClasses = getContainedEClasses(eCls);
-		final Set<EClass> result = new LinkedHashSet<EClass>(direcltyContainedEClasses);
+		final Set<EClass> directlyContainedEClasses = getContainedEClasses(eCls);
+		final Set<EClass> result = new LinkedHashSet<EClass>(directlyContainedEClasses);
 
-		Set<EClass> added = new LinkedHashSet<EClass>(direcltyContainedEClasses);
+		Set<EClass> added = new LinkedHashSet<EClass>(directlyContainedEClasses);
 		while (!added.isEmpty()) {
 			final Set<EClass> toDig = new LinkedHashSet<EClass>();
 			for (EClass a : added) {

diff --git a/...org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/EAllContentsService.java b/...org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/EAllContentsService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2024 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -144,7 +144,7 @@ private Set<IType> getTypeForSpecificType(ValidationServices services,
 			}
 			if (result.isEmpty()) {
 				result.add(new SequenceType(queryEnvironment, services.nothing(
-						"%s can't contain %s direclty or indirectly", argTypes.get(0), argTypes.get(1))));
+						"%s can't contain %s directly or indirectly", argTypes.get(0), argTypes.get(1))));
 			}
 		}
 

diff --git a/...ins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/EObjectServices.java b/...ins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/EObjectServices.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2024 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -616,7 +616,7 @@ private Set<IType> getTypeForSpecificType(ValidationServices services,
 				}
 				if (result.isEmpty()) {
 					result.add(new SequenceType(queryEnvironment, services.nothing(
-							"%s can't contain %s direclty", argTypes.get(0), argTypes.get(1))));
+							"%s can't contain %s directly", argTypes.get(0), argTypes.get(1))));
 				}
 			}
 

diff --git a/query/tests/org.eclipse.acceleo.query.tests/resources/anydsl/anyDSLModel.qmodel b/query/tests/org.eclipse.acceleo.query.tests/resources/anydsl/anyDSLModel.qmodel
@@ -257,7 +257,7 @@
     <expectations xsi:type="qmodel:QueryValidationResultExpectation">
       <expectedResult interpreter="manual">
         <possibleTypes>java.lang.Boolean</possibleTypes>
-        <validationMessages severity="INFO" message="Empty collection: Nothing will be left after calling eAllContents:&#xA;EClassifier=Company can't contain EClassifierLiteral=Food direclty or indirectly" startPosition="31" endPosition="58"/>
+        <validationMessages severity="INFO" message="Empty collection: Nothing will be left after calling eAllContents:&#xA;EClassifier=Company can't contain EClassifierLiteral=Food directly or indirectly" startPosition="31" endPosition="58"/>
         <validationMessages message="Always false:&#xA;Nothing inferred when i (EClassifier=Producer) is kind of EClassifierLiteral=Food&#xA;Nothing inferred when i (EClassifier=EAnnotation) is kind of EClassifierLiteral=Food" startPosition="131" endPosition="158"/>
       </expectedResult>
     </expectations>

diff --git a/...ery.tests/src/org/eclipse/acceleo/query/services/tests/EObjectServicesValidationTest.java b/...ery.tests/src/org/eclipse/acceleo/query/services/tests/EObjectServicesValidationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2024 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -243,9 +243,9 @@ public void testEAllContentsFilteredNoContainingEClass() {
 			final IType[] parameterTypes = new IType[] {eClassifierType(eCls1), eClassifierLiteralType(
 					eCls2) };
 			final IType[] expectedReturnTypes = new IType[] {sequenceType(nothingType(
-					"EClassifier=eCls1 can't contain EClassifierLiteral=eCls2 direclty or indirectly")) };
+					"EClassifier=eCls1 can't contain EClassifierLiteral=eCls2 directly or indirectly")) };
 			final IType[] expectedAllReturnTypes = new IType[] {sequenceType(nothingType(
-					"Nothing will be left after calling eAllContents:\nEClassifier=eCls1 can't contain EClassifierLiteral=eCls2 direclty or indirectly")) };
+					"Nothing will be left after calling eAllContents:\nEClassifier=eCls1 can't contain EClassifierLiteral=eCls2 directly or indirectly")) };
 
 			assertValidation(expectedReturnTypes, expectedAllReturnTypes, "eAllContents", parameterTypes);
 		} finally {
@@ -480,9 +480,9 @@ public void testEAllContentsFilteredNoType() {
 			final IType[] parameterTypes = new IType[] {eClassifierType(eCls1), eClassifierLiteralType(
 					eCls2) };
 			final IType[] expectedReturnTypes = new IType[] {sequenceType(nothingType(
-					"EClassifier=eCls1 can't contain EClassifierLiteral=eCls2 direclty or indirectly")) };
+					"EClassifier=eCls1 can't contain EClassifierLiteral=eCls2 directly or indirectly")) };
 			final IType[] expectedAllReturnTypes = new IType[] {sequenceType(nothingType(
-					"Nothing will be left after calling eAllContents:\nEClassifier=eCls1 can't contain EClassifierLiteral=eCls2 direclty or indirectly")) };
+					"Nothing will be left after calling eAllContents:\nEClassifier=eCls1 can't contain EClassifierLiteral=eCls2 directly or indirectly")) };
 
 			assertValidation(expectedReturnTypes, expectedAllReturnTypes, "eAllContents", parameterTypes);
 		} finally {
@@ -1188,9 +1188,9 @@ public void testEContentsFilteredNoContainingEClass() {
 			final IType[] parameterTypes = new IType[] {eClassifierType(eCls1), eClassifierLiteralType(
 					eCls2) };
 			final IType[] expectedReturnTypes = new IType[] {sequenceType(nothingType(
-					"EClassifier=eCls1 can't contain EClassifierLiteral=eCls2 direclty")) };
+					"EClassifier=eCls1 can't contain EClassifierLiteral=eCls2 directly")) };
 			final IType[] expectedAllReturnTypes = new IType[] {sequenceType(nothingType(
-					"Nothing will be left after calling eContents:\nEClassifier=eCls1 can't contain EClassifierLiteral=eCls2 direclty")) };
+					"Nothing will be left after calling eContents:\nEClassifier=eCls1 can't contain EClassifierLiteral=eCls2 directly")) };
 
 			assertValidation(expectedReturnTypes, expectedAllReturnTypes, "eContents", parameterTypes);
 		} finally {
@@ -1495,9 +1495,9 @@ public void testEContentsFilteredNoType() {
 			final IType[] parameterTypes = new IType[] {eClassifierType(eCls1), eClassifierLiteralType(
 					eCls2) };
 			final IType[] expectedReturnTypes = new IType[] {sequenceType(nothingType(
-					"EClassifier=eCls1 can't contain EClassifierLiteral=eCls2 direclty")) };
+					"EClassifier=eCls1 can't contain EClassifierLiteral=eCls2 directly")) };
 			final IType[] expectedAllReturnTypes = new IType[] {sequenceType(nothingType(
-					"Nothing will be left after calling eContents:\nEClassifier=eCls1 can't contain EClassifierLiteral=eCls2 direclty")) };
+					"Nothing will be left after calling eContents:\nEClassifier=eCls1 can't contain EClassifierLiteral=eCls2 directly")) };
 
 			assertValidation(expectedReturnTypes, expectedAllReturnTypes, "eContents", parameterTypes);
 		} finally {