From d92414c7fd091903337eb58d9373f788961dfcaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20B=C3=A9gaudeau?= Date: Tue, 5 Mar 2024 14:59:35 +0100 Subject: [PATCH] [3019] Remove the dependency between the View DSL support and the Sirius Desktop one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://github.com/eclipse-sirius/sirius-web/issues/3019 Signed-off-by: Stéphane Bégaudeau --- .../emf/SemanticCandidatesProvider.java | 3 +- .../diagrams/CanCreateDiagramPredicate.java | 4 +-- .../emf/diagrams/ToolImageProvider.java | 4 +-- .../CreateInstanceOperationHandler.java | 2 +- .../ModelOperationHandlerSwitch.java | 4 +-- .../CreateInstanceOperationHandlerTests.java | 2 +- .../AbstractNodeMappingConverter.java | 2 +- .../diagrams/EdgeMappingConverter.java | 2 +- .../forms/GroupDescriptionConverter.java | 4 +-- .../forms/IfDescriptionConverter.java | 4 +-- .../forms/PageDescriptionConverter.java | 4 +-- .../forms/WidgetDescriptionConverter.java | 6 ++-- .../components}/emf/DomainClassPredicate.java | 4 +-- .../components}/emf/EPackageService.java | 4 +-- .../services}/DomainClassPredicateTests.java | 6 ++-- .../sirius-components-interpreter/pom.xml | 5 +++ .../interpreter}/BooleanValueProvider.java | 6 ++-- .../interpreter}/StringValueProvider.java | 4 +-- ...renceWidgetDescriptionConverterSwitch.java | 2 +- .../ModelBrowsersDescriptionProvider.java | 3 +- .../SliderDescriptionConverterSwitch.java | 2 +- .../backend/sirius-web-services/pom.xml | 10 ++++++ .../sirius-components-task-starter/pom.xml | 21 ++++++++++++ .../sirius-components-view-emf/pom.xml | 34 ++++++++++++++++--- .../deck/ViewDeckDescriptionConverter.java | 2 +- .../diagram/DiagramDescriptionValidator.java | 4 +-- .../emf/diagram/FormDescriptionValidator.java | 4 +-- .../ViewDiagramDescriptionConverter.java | 2 +- .../emf/diagram/ViewToolImageProvider.java | 4 +-- .../form/ViewFormDescriptionConverter.java | 4 +-- .../ViewFormDescriptionConverterSwitch.java | 4 +-- .../task/ViewGanttDescriptionConverter.java | 2 +- 32 files changed, 112 insertions(+), 56 deletions(-) rename packages/{compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility => emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components}/emf/DomainClassPredicate.java (96%) rename packages/{compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility => emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components}/emf/EPackageService.java (93%) rename packages/{compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility => emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services}/DomainClassPredicateTests.java (91%) rename packages/{compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils => emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter}/BooleanValueProvider.java (87%) rename packages/{compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils => emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter}/StringValueProvider.java (89%) diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java index ab78085a23..3c250a6ce0 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2023 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -20,6 +20,7 @@ import java.util.function.Function; import org.eclipse.emf.ecore.EObject; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.eclipse.sirius.components.interpreter.AQLInterpreter; import org.eclipse.sirius.components.interpreter.Result; import org.eclipse.sirius.components.representations.VariableManager; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/CanCreateDiagramPredicate.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/CanCreateDiagramPredicate.java index 2ea391600a..75d3ebaad7 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/CanCreateDiagramPredicate.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/CanCreateDiagramPredicate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -17,7 +17,7 @@ import java.util.function.Predicate; import org.eclipse.emf.ecore.EClass; -import org.eclipse.sirius.components.compatibility.emf.DomainClassPredicate; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.eclipse.sirius.components.interpreter.AQLInterpreter; import org.eclipse.sirius.components.interpreter.Result; import org.eclipse.sirius.components.representations.IRepresentationDescription; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/ToolImageProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/ToolImageProvider.java index 50d4deea04..95ec3ec4c3 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/ToolImageProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/ToolImageProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2023 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.sirius.components.compatibility.emf.EPackageService; +import org.eclipse.sirius.components.emf.EPackageService; import org.eclipse.sirius.components.compatibility.services.diagrams.api.IToolImageProvider; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java index d9f19c7c5e..b43870bfc1 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java @@ -26,7 +26,7 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandler; -import org.eclipse.sirius.components.compatibility.emf.EPackageService; +import org.eclipse.sirius.components.emf.EPackageService; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.core.api.IRepresentationMetadataSearchService; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java index db92e1e108..20e9cd2b6e 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo and others. + * Copyright (c) 2019, 2024 Obeo and others. * 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 @@ -19,7 +19,7 @@ import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandler; -import org.eclipse.sirius.components.compatibility.emf.EPackageService; +import org.eclipse.sirius.components.emf.EPackageService; import org.eclipse.sirius.components.compatibility.emf.api.IExternalJavaActionProvider; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.core.api.IRepresentationMetadataSearchService; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java index 3a3ad1dc21..e77fcafc04 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.ENamedElement; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.eclipse.sirius.components.compatibility.emf.EPackageService; +import org.eclipse.sirius.components.emf.EPackageService; import org.eclipse.sirius.components.compatibility.emf.compatibility.services.EditingDomainFactory; import org.eclipse.sirius.components.compatibility.emf.modeloperations.ChildModelOperationHandler; import org.eclipse.sirius.components.compatibility.emf.modeloperations.CreateInstanceOperationHandler; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java index 60cdbe14bf..24ca78285d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java @@ -22,7 +22,7 @@ import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandlerSwitchProvider; import org.eclipse.sirius.components.compatibility.api.ISemanticCandidatesProviderFactory; -import org.eclipse.sirius.components.compatibility.utils.StringValueProvider; +import org.eclipse.sirius.components.interpreter.StringValueProvider; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.diagrams.ILayoutStrategy; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java index 8c9250c3d7..fc9ca707bf 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java @@ -22,7 +22,7 @@ import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandlerSwitchProvider; import org.eclipse.sirius.components.compatibility.api.ISemanticCandidatesProviderFactory; -import org.eclipse.sirius.components.compatibility.utils.StringValueProvider; +import org.eclipse.sirius.components.interpreter.StringValueProvider; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.diagrams.EdgeStyle; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java index 7f5f7b18b3..ea7da79b2b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -22,7 +22,7 @@ import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandlerSwitchProvider; -import org.eclipse.sirius.components.compatibility.utils.StringValueProvider; +import org.eclipse.sirius.components.interpreter.StringValueProvider; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.forms.description.AbstractControlDescription; import org.eclipse.sirius.components.forms.description.GroupDescription; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/IfDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/IfDescriptionConverter.java index 17fd395ee2..9056b9e27f 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/IfDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/IfDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2023 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -18,7 +18,7 @@ import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandlerSwitchProvider; -import org.eclipse.sirius.components.compatibility.utils.BooleanValueProvider; +import org.eclipse.sirius.components.interpreter.BooleanValueProvider; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.forms.description.AbstractWidgetDescription; import org.eclipse.sirius.components.forms.description.IfDescription; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java index 6cd722a727..c681e512c2 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -21,7 +21,7 @@ import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.ISemanticCandidatesProviderFactory; -import org.eclipse.sirius.components.compatibility.utils.StringValueProvider; +import org.eclipse.sirius.components.interpreter.StringValueProvider; import org.eclipse.sirius.components.forms.description.GroupDescription; import org.eclipse.sirius.components.forms.description.PageDescription; import org.eclipse.sirius.components.interpreter.AQLInterpreter; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java index 3bd5eb5342..b612c1a291 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2023 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -24,8 +24,8 @@ import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandler; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandlerSwitchProvider; -import org.eclipse.sirius.components.compatibility.utils.BooleanValueProvider; -import org.eclipse.sirius.components.compatibility.utils.StringValueProvider; +import org.eclipse.sirius.components.interpreter.BooleanValueProvider; +import org.eclipse.sirius.components.interpreter.StringValueProvider; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.forms.WidgetIdProvider; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/DomainClassPredicate.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/DomainClassPredicate.java similarity index 96% rename from packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/DomainClassPredicate.java rename to packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/DomainClassPredicate.java index 8f4c0fc63c..2888f1501b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/DomainClassPredicate.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/DomainClassPredicate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.compatibility.emf; +package org.eclipse.sirius.components.emf; import java.util.ArrayList; import java.util.Iterator; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/EPackageService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/EPackageService.java similarity index 93% rename from packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/EPackageService.java rename to packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/EPackageService.java index fa19d51879..2700617079 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/EPackageService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/EPackageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.compatibility.emf; +package org.eclipse.sirius.components.emf; import java.util.Optional; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/DomainClassPredicateTests.java b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/DomainClassPredicateTests.java similarity index 91% rename from packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/DomainClassPredicateTests.java rename to packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/DomainClassPredicateTests.java index d8e3541411..ecd6ecf3ae 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/DomainClassPredicateTests.java +++ b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/DomainClassPredicateTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -10,12 +10,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.compatibility.emf.compatibility; +package org.eclipse.sirius.components.emf.services; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.emf.ecore.EcorePackage; -import org.eclipse.sirius.components.compatibility.emf.DomainClassPredicate; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.junit.jupiter.api.Test; /** diff --git a/packages/emf/backend/sirius-components-interpreter/pom.xml b/packages/emf/backend/sirius-components-interpreter/pom.xml index 8744c5ec39..64fb1ebda2 100644 --- a/packages/emf/backend/sirius-components-interpreter/pom.xml +++ b/packages/emf/backend/sirius-components-interpreter/pom.xml @@ -59,6 +59,11 @@ spring-boot-starter-test test + + org.eclipse.sirius + sirius-components-representations + 2024.1.4 + org.eclipse.emf org.eclipse.emf.common diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/BooleanValueProvider.java b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/BooleanValueProvider.java similarity index 87% rename from packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/BooleanValueProvider.java rename to packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/BooleanValueProvider.java index 9aabfc65bc..a9fdf0fda2 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/BooleanValueProvider.java +++ b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/BooleanValueProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2024 Obeo. * 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 @@ -10,13 +10,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.compatibility.utils; +package org.eclipse.sirius.components.interpreter; import java.util.Objects; import java.util.function.Function; -import org.eclipse.sirius.components.interpreter.AQLInterpreter; -import org.eclipse.sirius.components.interpreter.Result; import org.eclipse.sirius.components.representations.VariableManager; /** diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/StringValueProvider.java b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/StringValueProvider.java similarity index 89% rename from packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/StringValueProvider.java rename to packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/StringValueProvider.java index 0cea427c59..65275d003a 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/StringValueProvider.java +++ b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/StringValueProvider.java @@ -10,13 +10,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.compatibility.utils; +package org.eclipse.sirius.components.interpreter; import java.util.Objects; import java.util.function.Function; -import org.eclipse.sirius.components.interpreter.AQLInterpreter; -import org.eclipse.sirius.components.interpreter.Result; import org.eclipse.sirius.components.representations.VariableManager; /** diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java index 0005902c1a..87e30f9a57 100644 --- a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java +++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java @@ -33,7 +33,7 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.sirius.components.collaborative.api.ChangeKind; import org.eclipse.sirius.components.forms.WidgetIdProvider; -import org.eclipse.sirius.components.compatibility.utils.StringValueProvider; +import org.eclipse.sirius.components.interpreter.StringValueProvider; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IFeedbackMessageService; import org.eclipse.sirius.components.core.api.IObjectService; diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowsersDescriptionProvider.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowsersDescriptionProvider.java index b1b54f1d5f..18ab5528e0 100644 --- a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowsersDescriptionProvider.java +++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowsersDescriptionProvider.java @@ -32,7 +32,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.domain.EditingDomain; -import org.eclipse.sirius.components.compatibility.services.ImageConstants; import org.eclipse.sirius.components.core.CoreImageConstants; import org.eclipse.sirius.components.core.URLParser; import org.eclipse.sirius.components.core.api.IEditingContext; @@ -290,7 +289,7 @@ private List getImageURL(VariableManager variableManager) { if (self instanceof EObject) { imageURL = this.objectService.getImagePath(self); } else if (self instanceof Resource) { - imageURL = List.of(ImageConstants.RESOURCE_SVG); + imageURL = List.of("/icons/svg/Resource.svg"); } return imageURL; } diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/slider/SliderDescriptionConverterSwitch.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/slider/SliderDescriptionConverterSwitch.java index 6e397dcc74..92cca5085f 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/slider/SliderDescriptionConverterSwitch.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/slider/SliderDescriptionConverterSwitch.java @@ -19,7 +19,7 @@ import java.util.function.Function; import org.eclipse.sirius.components.forms.WidgetIdProvider; -import org.eclipse.sirius.components.compatibility.utils.StringValueProvider; +import org.eclipse.sirius.components.interpreter.StringValueProvider; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IFeedbackMessageService; import org.eclipse.sirius.components.core.api.IObjectService; diff --git a/packages/sirius-web/backend/sirius-web-services/pom.xml b/packages/sirius-web/backend/sirius-web-services/pom.xml index 943107b4d5..7d6aaac750 100644 --- a/packages/sirius-web/backend/sirius-web-services/pom.xml +++ b/packages/sirius-web/backend/sirius-web-services/pom.xml @@ -64,6 +64,16 @@ sirius-components-collaborative-validation 2024.1.4 + + org.eclipse.sirius + sirius-components-compatibility + 2024.1.4 + + + org.eclipse.sirius + sirius-components-compatibility-emf + 2024.1.4 + org.eclipse.sirius sirius-components-emf diff --git a/packages/starters/backend/sirius-components-task-starter/pom.xml b/packages/starters/backend/sirius-components-task-starter/pom.xml index 89babf4377..362550c1a6 100644 --- a/packages/starters/backend/sirius-components-task-starter/pom.xml +++ b/packages/starters/backend/sirius-components-task-starter/pom.xml @@ -29,6 +29,7 @@ 17 + 7.2.0-SNAPSHOT @@ -39,6 +40,21 @@ + + + Eclipse Sirius + Sirius Repository - Snapshots + https://repo.eclipse.org/content/repositories/sirius-snapshots/ + + true + + + + Central + https://repo.maven.apache.org/maven2 + + + org.springframework.boot @@ -113,6 +129,11 @@ sirius-web-persistence 2024.1.4 + + org.eclipse.sirius + org.eclipse.sirius.ext.emf.edit + ${sirius.version} + diff --git a/packages/view/backend/sirius-components-view-emf/pom.xml b/packages/view/backend/sirius-components-view-emf/pom.xml index 5749d0ff5b..d137c415e5 100644 --- a/packages/view/backend/sirius-components-view-emf/pom.xml +++ b/packages/view/backend/sirius-components-view-emf/pom.xml @@ -29,6 +29,7 @@ 17 + 7.2.0-SNAPSHOT @@ -36,6 +37,14 @@ Central https://repo.maven.apache.org/maven2 + + Eclipse Sirius + Sirius Repository - Snapshots + https://repo.eclipse.org/content/repositories/sirius-snapshots/ + + true + + github-sirius-emfjson https://maven.pkg.github.com/eclipse-sirius/sirius-emf-json @@ -61,6 +70,26 @@ sirius-components-domain 2024.1.4 + + org.eclipse.sirius + sirius-components-collaborative-diagrams + 2024.1.4 + + + org.eclipse.sirius + sirius-components-collaborative-forms + 2024.1.4 + + + org.eclipse.sirius + sirius-components-collaborative-selection + 2024.1.4 + + + org.eclipse.sirius + org.eclipse.sirius.ecore.extender + ${sirius.version} + org.eclipse.sirius sirius-components-view-diagram @@ -80,11 +109,6 @@ org.eclipse.sirius sirius-components-view-deck 2024.1.4 - - - org.eclipse.sirius - sirius-components-compatibility-emf - 2024.1.4 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/deck/ViewDeckDescriptionConverter.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/deck/ViewDeckDescriptionConverter.java index 09dc871287..465c594eea 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/deck/ViewDeckDescriptionConverter.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/deck/ViewDeckDescriptionConverter.java @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; -import org.eclipse.sirius.components.compatibility.emf.DomainClassPredicate; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.deck.DeckElementStyle; diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramDescriptionValidator.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramDescriptionValidator.java index 96c11fcef9..f1b6a5da70 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramDescriptionValidator.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramDescriptionValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021, 2023 Obeo. + * Copyright (c) 2021, 2024 Obeo. * 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 @@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.EValidator; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.sirius.components.compatibility.emf.DomainClassPredicate; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.eclipse.sirius.components.domain.Domain; import org.eclipse.sirius.components.domain.DomainPackage; import org.eclipse.sirius.components.domain.Entity; diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/FormDescriptionValidator.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/FormDescriptionValidator.java index 7dd32813d1..6acc86c4d1 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/FormDescriptionValidator.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/FormDescriptionValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Obeo. + * Copyright (c) 2023, 2024 Obeo. * 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 @@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.EValidator; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.sirius.components.compatibility.emf.DomainClassPredicate; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.eclipse.sirius.components.domain.Domain; import org.eclipse.sirius.components.domain.DomainPackage; import org.eclipse.sirius.components.domain.Entity; diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewDiagramDescriptionConverter.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewDiagramDescriptionConverter.java index dd2f03c336..2af29e6300 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewDiagramDescriptionConverter.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewDiagramDescriptionConverter.java @@ -27,7 +27,7 @@ import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; import org.eclipse.sirius.components.collaborative.diagrams.dto.DeletionPolicy; import org.eclipse.sirius.components.collaborative.diagrams.handlers.DeleteFromDiagramEventHandler; -import org.eclipse.sirius.components.compatibility.emf.DomainClassPredicate; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.core.api.IFeedbackMessageService; diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewToolImageProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewToolImageProvider.java index 7f4297d17f..cf24c6b590 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewToolImageProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewToolImageProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022, 2023 Obeo. + * Copyright (c) 2022, 2024 Obeo. * 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 @@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.sirius.components.compatibility.emf.EPackageService; +import org.eclipse.sirius.components.emf.EPackageService; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.view.diagram.DiagramElementDescription; import org.eclipse.sirius.components.view.diagram.EdgeDescription; diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverter.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverter.java index deb67e0c54..8ea813e9ef 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverter.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022, 2023 Obeo. + * Copyright (c) 2022, 2024 Obeo. * 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 @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.ComposedSwitch; import org.eclipse.emf.ecore.util.Switch; -import org.eclipse.sirius.components.compatibility.emf.DomainClassPredicate; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IFeedbackMessageService; import org.eclipse.sirius.components.core.api.IObjectService; diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java index d12e3db42e..658fdee0b3 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java @@ -28,8 +28,8 @@ import org.eclipse.sirius.components.charts.piechart.components.PieChartStyle; import org.eclipse.sirius.components.collaborative.api.ChangeKind; import org.eclipse.sirius.components.forms.WidgetIdProvider; -import org.eclipse.sirius.components.compatibility.utils.BooleanValueProvider; -import org.eclipse.sirius.components.compatibility.utils.StringValueProvider; +import org.eclipse.sirius.components.interpreter.BooleanValueProvider; +import org.eclipse.sirius.components.interpreter.StringValueProvider; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.core.api.IFeedbackMessageService; diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/task/ViewGanttDescriptionConverter.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/task/ViewGanttDescriptionConverter.java index 1ddbe1c0ad..c8c77fa575 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/task/ViewGanttDescriptionConverter.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/task/ViewGanttDescriptionConverter.java @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; -import org.eclipse.sirius.components.compatibility.emf.DomainClassPredicate; +import org.eclipse.sirius.components.emf.DomainClassPredicate; import org.eclipse.sirius.components.core.api.IEditService; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.gantt.description.GanttDescription;