Skip to content

Commit 61aefc1

Browse files
ylussaudylussaud
committed
Moving from AQL 7.x to 8.x.
1 parent 7869400 commit 61aefc1

File tree

183 files changed

+445
-1239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+445
-1239
lines changed

‎.github/workflows/matrix_includes.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,5 @@
88
"java":"21",
99
"profile":"platform-sirius-7.4.11,tests",
1010
"tycho":"4.0.13"
11-
},
12-
{
13-
"java":"21",
14-
"profile":"platform-capella-7.0.1,tests",
15-
"tycho":"4.0.13"
1611
}
1712
]

‎plugins/org.obeonetwork.m2doc.cdo/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Bundle-Localization: plugin
99
Require-Bundle: org.obeonetwork.m2doc;bundle-version="[4.0.0,5.0.0)",
1010
org.obeonetwork.m2doc.ide;bundle-version="[4.0.0,5.0.0)",
1111
org.obeonetwork.m2doc.genconf;bundle-version="[4.0.0,5.0.0)",
12-
org.eclipse.acceleo.query;bundle-version="[6.0.1,8.0.0)",
12+
org.eclipse.acceleo.query;bundle-version="[8.0.3,9.0.0)",
1313
org.eclipse.emf.cdo,
1414
org.eclipse.net4j,
1515
org.eclipse.net4j.tcp,

‎plugins/org.obeonetwork.m2doc.cdo/src/org/obeonetwork/m2doc/cdo/services/configurator/CDOServicesConfigurator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2024 Obeo.
2+
* Copyright (c) 2017, 2025 Obeo.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -93,7 +93,7 @@ public Map<String, List<Diagnostic>> validate(IReadOnlyQueryEnvironment queryEnv
9393
}
9494

9595
@Override
96-
public Set<IService> getServices(IReadOnlyQueryEnvironment queryEnvironment, ResourceSet resourceSetForModels,
96+
public Set<IService<?>> getServices(IReadOnlyQueryEnvironment queryEnvironment, ResourceSet resourceSetForModels,
9797
Map<String, String> options) {
9898
return Collections.emptySet();
9999
}

‎plugins/org.obeonetwork.m2doc.genconf.edit/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.core.runtime,
1515
org.eclipse.emf.edit;visibility:=reexport,
1616
org.eclipse.emf.ecore;visibility:=reexport,
1717
org.eclipse.emf.ecore.edit;visibility:=reexport,
18-
org.eclipse.acceleo.query;bundle-version="[6.0.1,8.0.0)"
18+
org.eclipse.acceleo.query;bundle-version="[8.0.3,9.0.0)"
1919
Bundle-ActivationPolicy: lazy
2020
Automatic-Module-Name: org.obeonetwork.m2doc.genconf.edit

‎plugins/org.obeonetwork.m2doc.genconf.editor/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.core.runtime,
2424
org.eclipse.emf.edit.ui;visibility:=reexport,
2525
org.eclipse.ui.ide;visibility:=reexport,
2626
org.eclipse.emf.ecore.edit;visibility:=reexport,
27-
org.eclipse.acceleo.query;bundle-version="[6.0.1,8.0.0)",
27+
org.eclipse.acceleo.query;bundle-version="[8.0.3,9.0.0)",
2828
org.obeonetwork.m2doc;bundle-version="[4.0.0,5.0.0)",
2929
org.obeonetwork.m2doc.ide;bundle-version="[4.0.0,5.0.0)",
3030
org.eclipse.core.expressions,

‎plugins/org.obeonetwork.m2doc.genconf.editor/src/org/obeonetwork/m2doc/genconf/editor/view/M2DocInterpreterView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030

3131
import org.apache.poi.util.IOUtils;
3232
import org.apache.poi.xwpf.usermodel.XWPFDocument;
33+
import org.eclipse.acceleo.query.parser.AstResult;
3334
import org.eclipse.acceleo.query.parser.AstValidator;
3435
import org.eclipse.acceleo.query.runtime.EvaluationResult;
3536
import org.eclipse.acceleo.query.runtime.IQueryBuilderEngine;
36-
import org.eclipse.acceleo.query.runtime.IQueryBuilderEngine.AstResult;
3737
import org.eclipse.acceleo.query.runtime.IQueryEnvironment;
3838
import org.eclipse.acceleo.query.runtime.IQueryValidationEngine;
3939
import org.eclipse.acceleo.query.runtime.IReadOnlyQueryEnvironment;
@@ -666,7 +666,7 @@ public void setGenconfURI(URI genconfURI) {
666666
allVariables.put(SELECTION_VARIABLE, selectionValue);
667667
allVariables.putAll(parseVariableValues(queryEnvironment, evaluationEngine, allVariables, uriConverter,
668668
templateURI));
669-
queryBuilder = new QueryBuilderEngine(queryEnvironment);
669+
queryBuilder = new QueryBuilderEngine();
670670
}
671671

672672
final AQLConfiguration configuration = new AQLConfiguration(colorManager, labelProvider, queryEnvironment,

‎plugins/org.obeonetwork.m2doc.genconf/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Export-Package: org.obeonetwork.m2doc.genconf,
1212
org.obeonetwork.m2doc.genconf.util
1313
Require-Bundle: org.eclipse.core.runtime,
1414
org.eclipse.emf.ecore;visibility:=reexport,
15-
org.eclipse.acceleo.query;bundle-version="[6.0.1,8.0.0)",
15+
org.eclipse.acceleo.query;bundle-version="[8.0.3,9.0.0)",
1616
org.obeonetwork.m2doc;bundle-version="[4.0.0,5.0.0)",
1717
org.eclipse.emf.ecore.xmi,
1818
org.obeonetwork.m2doc.ide,

‎plugins/org.obeonetwork.m2doc.genconf/src/org/obeonetwork/m2doc/genconf/ForkedSequenceType.java‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎plugins/org.obeonetwork.m2doc.genconf/src/org/obeonetwork/m2doc/genconf/ForkedSetType.java‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎plugins/org.obeonetwork.m2doc.genconf/src/org/obeonetwork/m2doc/genconf/GenconfUtils.java‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2024 Obeo.
2+
* Copyright (c) 2017, 2025 Obeo.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -35,6 +35,8 @@
3535
import org.eclipse.acceleo.query.validation.type.ClassType;
3636
import org.eclipse.acceleo.query.validation.type.EClassifierType;
3737
import org.eclipse.acceleo.query.validation.type.IType;
38+
import org.eclipse.acceleo.query.validation.type.SequenceType;
39+
import org.eclipse.acceleo.query.validation.type.SetType;
3840
import org.eclipse.core.runtime.Status;
3941
import org.eclipse.emf.common.notify.Notifier;
4042
import org.eclipse.emf.common.util.Monitor;
@@ -66,7 +68,6 @@
6668
*
6769
* @author <a href="mailto:yvan.lussaud@obeo.fr">Yvan Lussaud</a>
6870
*/
69-
@SuppressWarnings("restriction")
7071
public final class GenconfUtils {
7172

7273
static {
@@ -402,20 +403,20 @@ private static Definition createDefinition(IReadOnlyQueryEnvironment queryEnviro
402403
Definition res = null;
403404

404405
final IType eObjectType = new ClassType(queryEnvironment, EObject.class);
405-
final IType eObjectSequenceType = new ForkedSequenceType(queryEnvironment, eObjectType);
406-
final IType eObjectOrderedSetType = new ForkedSetType(queryEnvironment, eObjectType);
406+
final IType eObjectSequenceType = new SequenceType(queryEnvironment, eObjectType);
407+
final IType eObjectOrderedSetType = new SetType(queryEnvironment, eObjectType);
407408
final IType stringType = new ClassType(queryEnvironment, String.class);
408-
final IType stringSequenceType = new ForkedSequenceType(queryEnvironment, stringType);
409-
final IType stringOrderedSetType = new ForkedSetType(queryEnvironment, stringType);
409+
final IType stringSequenceType = new SequenceType(queryEnvironment, stringType);
410+
final IType stringOrderedSetType = new SetType(queryEnvironment, stringType);
410411
final IType integerType = new ClassType(queryEnvironment, Integer.class);
411-
final IType integerSequenceType = new ForkedSequenceType(queryEnvironment, integerType);
412-
final IType integerOrderedSetType = new ForkedSetType(queryEnvironment, integerType);
412+
final IType integerSequenceType = new SequenceType(queryEnvironment, integerType);
413+
final IType integerOrderedSetType = new SetType(queryEnvironment, integerType);
413414
final IType realType = new ClassType(queryEnvironment, Double.class);
414-
final IType realSequenceType = new ForkedSequenceType(queryEnvironment, realType);
415-
final IType realOrderedSetType = new ForkedSetType(queryEnvironment, realType);
415+
final IType realSequenceType = new SequenceType(queryEnvironment, realType);
416+
final IType realOrderedSetType = new SetType(queryEnvironment, realType);
416417
final IType booleanType = new ClassType(queryEnvironment, Boolean.class);
417-
final IType booleanSequenceType = new ForkedSequenceType(queryEnvironment, booleanType);
418-
final IType booleanOrderedSetType = new ForkedSetType(queryEnvironment, booleanType);
418+
final IType booleanSequenceType = new SequenceType(queryEnvironment, booleanType);
419+
final IType booleanOrderedSetType = new SetType(queryEnvironment, booleanType);
419420
for (IType type : types) {
420421
if (eObjectType.isAssignableFrom(type)) {
421422
res = GenconfPackage.eINSTANCE.getGenconfFactory().createModelDefinition();
@@ -502,20 +503,20 @@ private static boolean isValidDefinitionForType(IReadOnlyQueryEnvironment queryE
502503
boolean res = false;
503504

504505
final IType eObjectType = new ClassType(queryEnvironment, EObject.class);
505-
final IType eObjectSequenceType = new ForkedSequenceType(queryEnvironment, eObjectType);
506-
final IType eObjectOrderedSetType = new ForkedSetType(queryEnvironment, eObjectType);
506+
final IType eObjectSequenceType = new SequenceType(queryEnvironment, eObjectType);
507+
final IType eObjectOrderedSetType = new SetType(queryEnvironment, eObjectType);
507508
final IType stringType = new ClassType(queryEnvironment, String.class);
508-
final IType stringSequenceType = new ForkedSequenceType(queryEnvironment, stringType);
509-
final IType stringOrderedSetType = new ForkedSetType(queryEnvironment, stringType);
509+
final IType stringSequenceType = new SequenceType(queryEnvironment, stringType);
510+
final IType stringOrderedSetType = new SetType(queryEnvironment, stringType);
510511
final IType integerType = new ClassType(queryEnvironment, Integer.class);
511-
final IType integerSequenceType = new ForkedSequenceType(queryEnvironment, integerType);
512-
final IType integerOrderedSetType = new ForkedSetType(queryEnvironment, integerType);
512+
final IType integerSequenceType = new SequenceType(queryEnvironment, integerType);
513+
final IType integerOrderedSetType = new SetType(queryEnvironment, integerType);
513514
final IType realType = new ClassType(queryEnvironment, Double.class);
514-
final IType realSequenceType = new ForkedSequenceType(queryEnvironment, realType);
515-
final IType realOrderedSetType = new ForkedSetType(queryEnvironment, realType);
515+
final IType realSequenceType = new SequenceType(queryEnvironment, realType);
516+
final IType realOrderedSetType = new SetType(queryEnvironment, realType);
516517
final IType booleanType = new ClassType(queryEnvironment, Boolean.class);
517-
final IType booleanSequenceType = new ForkedSequenceType(queryEnvironment, booleanType);
518-
final IType booleanOrderedSetType = new ForkedSetType(queryEnvironment, booleanType);
518+
final IType booleanSequenceType = new SequenceType(queryEnvironment, booleanType);
519+
final IType booleanOrderedSetType = new SetType(queryEnvironment, booleanType);
519520
for (IType type : types) {
520521
if (eObjectType.isAssignableFrom(type) && definition instanceof ModelDefinition) {
521522
res = true;

0 commit comments

Comments
 (0)