[3019] Remove the dependency between the View DSL support and the Sir…

…ius Desktop one Bug: #3019 Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
eclipse-sirius · Mar 7, 2024 · d92414c · d92414c
1 parent 15e4fb1
commit d92414c
Show file tree

Hide file tree

Showing 32 changed files with 112 additions and 56 deletions.
diff --git a/...main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java b/...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/...a/org/eclipse/sirius/components/compatibility/emf/diagrams/CanCreateDiagramPredicate.java b/...a/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/...main/java/org/eclipse/sirius/components/compatibility/emf/diagrams/ToolImageProvider.java b/...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/...e/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java b/...e/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/...ipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java b/...ipse/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/...nents/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java b/...nents/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/...va/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java b/...va/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/.../main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java b/.../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/...ain/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java b/...ain/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/...c/main/java/org/eclipse/sirius/components/compatibility/forms/IfDescriptionConverter.java b/...c/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/...main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java b/...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/...in/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java b/...in/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/...mpatibility/emf/DomainClassPredicate.java → .../components/emf/DomainClassPredicate.java b/...mpatibility/emf/DomainClassPredicate.java → .../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/...ts/compatibility/emf/EPackageService.java → ...irius/components/emf/EPackageService.java b/...ts/compatibility/emf/EPackageService.java → ...irius/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/...patibility/DomainClassPredicateTests.java → ...f/services/DomainClassPredicateTests.java b/...patibility/DomainClassPredicateTests.java → ...f/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
@@ -59,6 +59,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sirius</groupId>
+			<artifactId>sirius-components-representations</artifactId>
+			<version>2024.1.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>org.eclipse.emf.common</artifactId>

diff --git a/...atibility/utils/BooleanValueProvider.java → ...nts/interpreter/BooleanValueProvider.java b/...atibility/utils/BooleanValueProvider.java → ...nts/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/...patibility/utils/StringValueProvider.java → ...ents/interpreter/StringValueProvider.java b/...patibility/utils/StringValueProvider.java → ...ents/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/.../components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java b/.../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/...s/components/collaborative/widget/reference/browser/ModelBrowsersDescriptionProvider.java b/...s/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<String> 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/.../src/main/java/org/eclipse/sirius/web/sample/slider/SliderDescriptionConverterSwitch.java b/.../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
@@ -64,6 +64,16 @@
 			<artifactId>sirius-components-collaborative-validation</artifactId>
 			<version>2024.1.4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sirius</groupId>
+			<artifactId>sirius-components-compatibility</artifactId>
+			<version>2024.1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sirius</groupId>
+			<artifactId>sirius-components-compatibility-emf</artifactId>
+			<version>2024.1.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-components-emf</artifactId>

diff --git a/packages/starters/backend/sirius-components-task-starter/pom.xml b/packages/starters/backend/sirius-components-task-starter/pom.xml
@@ -29,6 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
+		<sirius.version>7.2.0-SNAPSHOT</sirius.version>
 	</properties>
 
 	<distributionManagement>
@@ -39,6 +40,21 @@
 		</repository>
 	</distributionManagement>
 
+	<repositories>
+		<repository>
+			<id>Eclipse Sirius</id>
+			<name>Sirius Repository - Snapshots</name>
+			<url>https://repo.eclipse.org/content/repositories/sirius-snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>Central</id>
+			<url>https://repo.maven.apache.org/maven2</url>
+		</repository>
+	</repositories>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -113,6 +129,11 @@
 			<artifactId>sirius-web-persistence</artifactId>
 			<version>2024.1.4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sirius</groupId>
+			<artifactId>org.eclipse.sirius.ext.emf.edit</artifactId>
+			<version>${sirius.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>