[1618] Split View into dedicated subpackages

Bug: eclipse-sirius#1618 Signed-off-by: Guillaume Coutable <guillaume.coutable@obeo.fr>
mcharfadi · Jun 26, 2023 · 58f87ad · 58f87ad
1 parent 6724e2b
commit 58f87ad
Show file tree

Hide file tree

Showing 626 changed files with 40,112 additions and 33,783 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -62,6 +62,7 @@ The help text can include multiple lines (separated by `\n`), but no text format
 :image:doc/images/Widget_Help_Tooltip.png[Example of a help tooltip on a widget]
 - https://github.com/eclipse-sirius/sirius-components/issues/2048[#2048] [diagram] Add a basic support for the resize. It is possible to reduce the size of a node less than the space needed to display all children.
 - https://github.com/eclipse-sirius/sirius-components/issues/2064[#2064] [forms] Make the `IWidgetDescriptor` API more flexible.
+- https://github.com/eclipse-sirius/sirius-components/issues/1618[#1618] [view] Split the view metamodel into dedicated subpackages.
 
 == v2023.6.0
 

diff --git a/integration-tests/cypress/e2e/project/edit/color-palette.cy.js b/integration-tests/cypress/e2e/project/edit/color-palette.cy.js
@@ -37,7 +37,7 @@ describe('/projects/:projectId/edit - Color Palette', () => {
     cy.getByTestId('create-object').click();
     cy.getByTestId('FixedColor').should('exist').click();
     cy.getByTestId('Name').type('color_test{enter}');
-    cy.getByTestId('Value').type('#e5f5f8{enter}');
+    cy.get('[data-testid="Value"] > div > textarea').first().type('#e5f5f8{enter}');
     cy.getByTestId('color_test').should('exist');
   });
 
@@ -58,22 +58,21 @@ describe('/projects/:projectId/edit - Color Palette', () => {
   it('can select color from color palette in node style properties', () => {
     cy.getByTestId('ViewNewModel-toggle').click();
     cy.getByTestId('View-toggle').click();
-    cy.get('[title="view::DiagramDescription"]').dblclick();
+    cy.get('[title="diagram::DiagramDescription"]').dblclick();
     cy.getByTestId('Entity1 Node-toggle').click();
-    cy.get('[title="view::RectangularNodeStyleDescription"]').click();
+    cy.get('[title="diagram::RectangularNodeStyleDescription"]').click();
     cy.getByTestId('Label Color').click().get('[data-value="color_dark"]').should('exist').click();
     cy.getByTestId('Color').click().get('[data-value="color_dark"]').should('exist').click();
     cy.getByTestId('Border Color').click().get('[data-value="border_blue"]').should('exist').click();
   });
-  
+
   it('can select color from color palette in edge style properties', () => {
     cy.getByTestId('ViewNewModel-toggle').click();
     cy.getByTestId('View-toggle').click();
-    cy.get('[title="view::DiagramDescription"]').dblclick();
+    cy.get('[title="diagram::DiagramDescription"]').dblclick();
     cy.getByTestId('LinkedTo Edge-toggle').click();
-    cy.get('[title="view::EdgeStyle"]').click();
+    cy.get('[title="diagram::EdgeStyle"]').click();
     cy.getByTestId('Color').click();
     cy.contains('FixedColor color_blue').click();
   });
-
-});
+});
diff --git a/integration-tests/cypress/e2e/project/edit/studio.cy.js b/integration-tests/cypress/e2e/project/edit/studio.cy.js
@@ -41,7 +41,8 @@ describe('/projects/:projectId/edit - Studio', () => {
   it('Check the new object domain list', () => {
     cy.getByTestId('DomainNewModel-more').click();
     cy.getByTestId('new-object').click();
-    cy.getByTestId('domain').click().get('[data-value="http://www.eclipse.org/sirius-web/domain"]').should('exist');
+    cy.getByTestId('domain').click();
+    cy.get('[data-value="http://www.eclipse.org/sirius-web/domain"]').should('exist');
     cy.getByTestId('domain').get('[data-value="http://www.eclipse.org/sirius-web/view"]').should('exist');
     cy.getByTestId('domain').get('[data-value="http://www.obeo.fr/dsl/designer/sample/flow"]').should('exist');
   });

diff --git a/...sirius/components/collaborative/formdescriptioneditors/handlers/AddGroupEventHandler.java b/...sirius/components/collaborative/formdescriptioneditors/handlers/AddGroupEventHandler.java
@@ -28,8 +28,8 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.PageDescription;
-import org.eclipse.sirius.components.view.ViewFactory;
+import org.eclipse.sirius.components.view.form.FormFactory;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.springframework.stereotype.Service;
 
 import io.micrometer.core.instrument.Counter;
@@ -100,7 +100,7 @@ private boolean addGroup(IEditingContext editingContext, String pageId, int inde
     }
 
     private void createNewGroupInPageDescription(PageDescription pageDescription, int index) {
-        var groupDescription = ViewFactory.eINSTANCE.createGroupDescription();
+        var groupDescription = FormFactory.eINSTANCE.createGroupDescription();
         pageDescription.getGroups().add(index, groupDescription);
     }
 }
diff --git a/.../sirius/components/collaborative/formdescriptioneditors/handlers/AddPageEventHandler.java b/.../sirius/components/collaborative/formdescriptioneditors/handlers/AddPageEventHandler.java
@@ -28,8 +28,8 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.FormDescription;
-import org.eclipse.sirius.components.view.ViewFactory;
+import org.eclipse.sirius.components.view.form.FormDescription;
+import org.eclipse.sirius.components.view.form.FormFactory;
 import org.springframework.stereotype.Service;
 
 import io.micrometer.core.instrument.Counter;
@@ -100,8 +100,8 @@ private boolean addPage(IEditingContext editingContext, IFormDescriptionEditorCo
     }
 
     private void createNewPageWithDefaultEmptyGroupInFormDescription(FormDescription formDescription, int index) {
-        var pageDescription = ViewFactory.eINSTANCE.createPageDescription();
-        var groupDescription = ViewFactory.eINSTANCE.createGroupDescription();
+        var pageDescription = FormFactory.eINSTANCE.createPageDescription();
+        var groupDescription = FormFactory.eINSTANCE.createGroupDescription();
         pageDescription.getGroups().add(groupDescription);
         formDescription.getPages().add(index, pageDescription);
     }

diff --git a/...omponents/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandler.java b/...omponents/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandler.java
@@ -28,9 +28,9 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.GroupDescription;
-import org.eclipse.sirius.components.view.PageDescription;
-import org.eclipse.sirius.components.view.ViewFactory;
+import org.eclipse.sirius.components.view.form.FormFactory;
+import org.eclipse.sirius.components.view.form.GroupDescription;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.springframework.stereotype.Service;
 
 import io.micrometer.core.instrument.Counter;
@@ -98,9 +98,9 @@ private boolean addToolbarAction(IEditingContext editingContext, IFormDescriptio
         }
         if (optionalSelf.isPresent()) {
             Object container = optionalSelf.get();
-            var toolbarActionDescription = ViewFactory.eINSTANCE.createButtonDescription();
+            var toolbarActionDescription = FormFactory.eINSTANCE.createButtonDescription();
             toolbarActionDescription.setName("ToolbarAction");
-            var toolbarActionDescriptionStyle = ViewFactory.eINSTANCE.createButtonDescriptionStyle();
+            var toolbarActionDescriptionStyle = FormFactory.eINSTANCE.createButtonDescriptionStyle();
             toolbarActionDescription.setStyle(toolbarActionDescriptionStyle);
             if (container instanceof GroupDescription groupDescription) {
                 groupDescription.getToolbarActions().add(toolbarActionDescription);

diff --git a/...irius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandler.java b/...irius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandler.java
@@ -34,12 +34,12 @@
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
 import org.eclipse.sirius.components.formdescriptioneditors.IWidgetDescriptionProvider;
-import org.eclipse.sirius.components.view.FlexDirection;
-import org.eclipse.sirius.components.view.FlexboxContainerDescription;
-import org.eclipse.sirius.components.view.GroupDescription;
-import org.eclipse.sirius.components.view.ViewFactory;
-import org.eclipse.sirius.components.view.ViewPackage;
-import org.eclipse.sirius.components.view.WidgetDescription;
+import org.eclipse.sirius.components.view.form.FlexDirection;
+import org.eclipse.sirius.components.view.form.FlexboxContainerDescription;
+import org.eclipse.sirius.components.view.form.FormFactory;
+import org.eclipse.sirius.components.view.form.FormPackage;
+import org.eclipse.sirius.components.view.form.GroupDescription;
+import org.eclipse.sirius.components.view.form.WidgetDescription;
 import org.springframework.stereotype.Service;
 
 import io.micrometer.core.instrument.Counter;
@@ -138,15 +138,15 @@ private EClassifier getWidgetDescriptionType(String kind) {
                 return optionalType.get();
             }
         }
-        return ViewPackage.eINSTANCE.getEClassifier(kind + "Description");
+        return FormPackage.eINSTANCE.getEClassifier(kind + "Description");
     }
 
     private void createStyle(WidgetDescription widgetDescription) {
         EStructuralFeature styleFeature = widgetDescription.eClass().getEStructuralFeature("style");
         if (styleFeature instanceof EReference) {
             EClassifier eClassifier = styleFeature.getEType();
             if (eClassifier instanceof EClass) {
-                var widgetDescriptionStyle = ViewFactory.eINSTANCE.create((EClass) eClassifier);
+                var widgetDescriptionStyle = FormFactory.eINSTANCE.create((EClass) eClassifier);
                 if (eClassifier.isInstance(widgetDescriptionStyle)) {
                     widgetDescription.eSet(styleFeature, widgetDescriptionStyle);
                 }

diff --git a/...irius/components/collaborative/formdescriptioneditors/handlers/MoveGroupEventHandler.java b/...irius/components/collaborative/formdescriptioneditors/handlers/MoveGroupEventHandler.java
@@ -28,8 +28,8 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.GroupDescription;
-import org.eclipse.sirius.components.view.PageDescription;
+import org.eclipse.sirius.components.view.form.GroupDescription;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

diff --git a/...sirius/components/collaborative/formdescriptioneditors/handlers/MovePageEventHandler.java b/...sirius/components/collaborative/formdescriptioneditors/handlers/MovePageEventHandler.java
@@ -28,8 +28,8 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.FormDescription;
-import org.eclipse.sirius.components.view.PageDescription;
+import org.eclipse.sirius.components.view.form.FormDescription;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

diff --git a/...mponents/collaborative/formdescriptioneditors/handlers/MoveToolbarActionEventHandler.java b/...mponents/collaborative/formdescriptioneditors/handlers/MoveToolbarActionEventHandler.java
@@ -28,9 +28,9 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.ButtonDescription;
-import org.eclipse.sirius.components.view.GroupDescription;
-import org.eclipse.sirius.components.view.PageDescription;
+import org.eclipse.sirius.components.view.form.ButtonDescription;
+import org.eclipse.sirius.components.view.form.GroupDescription;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

diff --git a/...rius/components/collaborative/formdescriptioneditors/handlers/MoveWidgetEventHandler.java b/...rius/components/collaborative/formdescriptioneditors/handlers/MoveWidgetEventHandler.java
@@ -27,9 +27,9 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.FlexboxContainerDescription;
-import org.eclipse.sirius.components.view.GroupDescription;
-import org.eclipse.sirius.components.view.WidgetDescription;
+import org.eclipse.sirius.components.view.form.FlexboxContainerDescription;
+import org.eclipse.sirius.components.view.form.GroupDescription;
+import org.eclipse.sirius.components.view.form.WidgetDescription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

diff --git a/...s/components/collaborative/formdescriptioneditors/handlers/AddGroupEventHandlerTests.java b/...s/components/collaborative/formdescriptioneditors/handlers/AddGroupEventHandlerTests.java
@@ -28,9 +28,9 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.FormDescription;
-import org.eclipse.sirius.components.view.PageDescription;
-import org.eclipse.sirius.components.view.ViewFactory;
+import org.eclipse.sirius.components.view.form.FormDescription;
+import org.eclipse.sirius.components.view.form.FormFactory;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.junit.jupiter.api.Test;
 
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -46,8 +46,8 @@ public class AddGroupEventHandlerTests {
     @Test
     public void testAddGroupAction() {
 
-        FormDescription formDescription = ViewFactory.eINSTANCE.createFormDescription();
-        PageDescription pageDescription = ViewFactory.eINSTANCE.createPageDescription();
+        FormDescription formDescription = FormFactory.eINSTANCE.createFormDescription();
+        PageDescription pageDescription = FormFactory.eINSTANCE.createPageDescription();
         formDescription.getPages().add(pageDescription);
 
         var objectService = new IObjectService.NoOp() {

diff --git a/...us/components/collaborative/formdescriptioneditors/handlers/AddPageEventHandlerTests.java b/...us/components/collaborative/formdescriptioneditors/handlers/AddPageEventHandlerTests.java
@@ -28,9 +28,9 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.FormDescription;
-import org.eclipse.sirius.components.view.PageDescription;
-import org.eclipse.sirius.components.view.ViewFactory;
+import org.eclipse.sirius.components.view.form.FormDescription;
+import org.eclipse.sirius.components.view.form.FormFactory;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.junit.jupiter.api.Test;
 
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -46,8 +46,8 @@ public class AddPageEventHandlerTests {
     @Test
     public void testAddGroupAction() {
 
-        FormDescription formDescription = ViewFactory.eINSTANCE.createFormDescription();
-        PageDescription pageDescription = ViewFactory.eINSTANCE.createPageDescription();
+        FormDescription formDescription = FormFactory.eINSTANCE.createFormDescription();
+        PageDescription pageDescription = FormFactory.eINSTANCE.createPageDescription();
         formDescription.getPages().add(pageDescription);
 
         var objectService = new IObjectService.NoOp() {

diff --git a/...ents/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandlerTests.java b/...ents/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandlerTests.java
@@ -28,10 +28,10 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.FormDescription;
-import org.eclipse.sirius.components.view.GroupDescription;
-import org.eclipse.sirius.components.view.PageDescription;
-import org.eclipse.sirius.components.view.ViewFactory;
+import org.eclipse.sirius.components.view.form.FormDescription;
+import org.eclipse.sirius.components.view.form.FormFactory;
+import org.eclipse.sirius.components.view.form.GroupDescription;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.junit.jupiter.api.Test;
 
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -48,9 +48,9 @@ public class AddToolbarActionEventHandlerTests {
 
     @Test
     public void testAddToolbarActionToGroup() {
-        FormDescription formDescription = ViewFactory.eINSTANCE.createFormDescription();
-        PageDescription pageDescription = ViewFactory.eINSTANCE.createPageDescription();
-        GroupDescription groupDescription = ViewFactory.eINSTANCE.createGroupDescription();
+        FormDescription formDescription = FormFactory.eINSTANCE.createFormDescription();
+        PageDescription pageDescription = FormFactory.eINSTANCE.createPageDescription();
+        GroupDescription groupDescription = FormFactory.eINSTANCE.createGroupDescription();
         pageDescription.getGroups().add(groupDescription);
         formDescription.getPages().add(pageDescription);
         var objectService = new IObjectService.NoOp() {
@@ -81,8 +81,8 @@ public Optional<Object> getObject(IEditingContext editingContext, String objectI
 
     @Test
     public void testAddToolbarActionToPage() {
-        FormDescription formDescription = ViewFactory.eINSTANCE.createFormDescription();
-        PageDescription pageDescription = ViewFactory.eINSTANCE.createPageDescription();
+        FormDescription formDescription = FormFactory.eINSTANCE.createFormDescription();
+        PageDescription pageDescription = FormFactory.eINSTANCE.createPageDescription();
         formDescription.getPages().add(pageDescription);
         var objectService = new IObjectService.NoOp() {
             @Override

diff --git a/.../components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandlerTests.java b/.../components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandlerTests.java
@@ -29,7 +29,7 @@
 import org.eclipse.sirius.components.core.api.IObjectService;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
-import org.eclipse.sirius.components.view.ViewFactory;
+import org.eclipse.sirius.components.view.form.FormFactory;
 import org.junit.jupiter.api.Test;
 
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -48,7 +48,7 @@ public void testAddWidget() {
         var objectService = new IObjectService.NoOp() {
             @Override
             public Optional<Object> getObject(IEditingContext editingContext, String objectId) {
-                return Optional.of(ViewFactory.eINSTANCE.createFlexboxContainerDescription());
+                return Optional.of(FormFactory.eINSTANCE.createFlexboxContainerDescription());
             }
         };
         var handler = new AddWidgetEventHandler(objectService, new ICollaborativeFormDescriptionEditorMessageService.NoOp(), List.of(), new SimpleMeterRegistry());

diff --git a/...components/collaborative/formdescriptioneditors/handlers/DeletePageEventHandlerTests.java b/...components/collaborative/formdescriptioneditors/handlers/DeletePageEventHandlerTests.java
@@ -31,9 +31,9 @@
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.SuccessPayload;
 import org.eclipse.sirius.components.formdescriptioneditors.FormDescriptionEditor;
-import org.eclipse.sirius.components.view.FormDescription;
-import org.eclipse.sirius.components.view.PageDescription;
-import org.eclipse.sirius.components.view.ViewFactory;
+import org.eclipse.sirius.components.view.form.FormDescription;
+import org.eclipse.sirius.components.view.form.FormFactory;
+import org.eclipse.sirius.components.view.form.PageDescription;
 import org.junit.jupiter.api.Test;
 
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -51,8 +51,8 @@ public class DeletePageEventHandlerTests {
     @Test
     public void testDeletePage() {
 
-        FormDescription formDescription = ViewFactory.eINSTANCE.createFormDescription();
-        PageDescription pageDescription = ViewFactory.eINSTANCE.createPageDescription();
+        FormDescription formDescription = FormFactory.eINSTANCE.createFormDescription();
+        PageDescription pageDescription = FormFactory.eINSTANCE.createPageDescription();
         formDescription.getPages().add(pageDescription);
 
         FormDescriptionEditor formDescriptionEditor = new TestFormDescriptionEditorBuilder().getFormDescriptionEditor(UUID.randomUUID().toString());