[3859] Group view builders in dedicated packages

Bug: #3859 Signed-off-by: Florian ROUËNÉ <florian.rouene@obeosoft.com>
eclipse-sirius · Aug 14, 2024 · 39a8f97 · 39a8f97
1 parent 8aa985d
commit 39a8f97
Show file tree

Hide file tree

Showing 223 changed files with 721 additions and 908 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -136,6 +136,7 @@ More existing APIs will be migrated to this new common pattern.
  - https://github.com/eclipse-sirius/sirius-web/issues/3634[#3634] [sirius-web] Remove `GraphQLNodeStyleFragment` from `NodeTypeRegistry`, you can specify additional fields to be retreived by the subscription using the `DocumentTransform` GraphQL API and the `apolloClientOptionsConfigurersExtensionPoint` extension point
  - https://github.com/eclipse-sirius/sirius-web/issues/3641[#3641] [core] `IRepresentationMetadataProvider` now defined a single method `Optional<RepresentationMetadata> getMetadata(String representationId)` instead of separate `canHandle` and `handle` methods.
  - https://github.com/eclipse-sirius/sirius-web/issues/3684[#3684] [form, tree] Remove the existing mechanisms used to contribute instances of `FormConverter` and `TreeConverter`
+ - https://github.com/eclipse-sirius/sirius-web/issues/3859[#3859] [view] View builders has been grouped in dedicated packages
 
 === Dependency update
 
@@ -248,7 +249,7 @@ We cannot rely on the error message recaived from the backend since Cross Origin
 - https://github.com/eclipse-sirius/sirius-web/issues/3669[#3669] [diagram] Add migration participant to hide label borders by default
 - https://github.com/eclipse-sirius/sirius-web/issues/3684[#3684] [form, tree] Replace form & tree converters configurations with dedicated extension points
 - https://github.com/eclipse-sirius/sirius-web/issues/3701[#3701] [domain] Add edge and node tools to domain diagram including creation tools as well as delete and direct edit tools.
-
+- https://github.com/eclipse-sirius/sirius-web/issues/3859[#3859] [view] Allow name duplication in ecore by grouping builders in dedicated packages
 
 == v2024.5.0
 

diff --git a/...ius/web/application/studio/services/representations/DomainDiagramDescriptionProvider.java b/...ius/web/application/studio/services/representations/DomainDiagramDescriptionProvider.java
@@ -25,8 +25,8 @@
 import org.eclipse.sirius.components.view.ColorPalette;
 import org.eclipse.sirius.components.view.View;
 import org.eclipse.sirius.components.view.builder.DefaultViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.DefaultColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.diagram.ArrangeLayoutDirection;

diff --git a/...sirius/web/application/studio/services/representations/EntityNodeDescriptionProvider.java b/...sirius/web/application/studio/services/representations/EntityNodeDescriptionProvider.java
@@ -15,13 +15,13 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DeleteToolBuilder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.EdgeToolBuilder;
-import org.eclipse.sirius.components.view.builder.generated.LabelEditToolBuilder;
-import org.eclipse.sirius.components.view.builder.generated.NodeToolBuilder;
-import org.eclipse.sirius.components.view.builder.generated.NodeToolSectionBuilder;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DeleteToolBuilder;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.EdgeToolBuilder;
+import org.eclipse.sirius.components.view.builder.generated.diagram.LabelEditToolBuilder;
+import org.eclipse.sirius.components.view.builder.generated.diagram.NodeToolBuilder;
+import org.eclipse.sirius.components.view.builder.generated.diagram.NodeToolSectionBuilder;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.INodeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.DeleteTool;

diff --git a/...s/web/application/studio/services/representations/InheritanceEdgeDescriptionProvider.java b/...s/web/application/studio/services/representations/InheritanceEdgeDescriptionProvider.java
@@ -15,10 +15,10 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DeleteToolBuilder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.LabelEditToolBuilder;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DeleteToolBuilder;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.LabelEditToolBuilder;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.ArrowStyle;

diff --git a/...rius/web/application/studio/services/representations/RelationEdgeDescriptionProvider.java b/...rius/web/application/studio/services/representations/RelationEdgeDescriptionProvider.java
@@ -15,10 +15,10 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DeleteToolBuilder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.LabelEditToolBuilder;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DeleteToolBuilder;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.LabelEditToolBuilder;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.ArrowStyle;

diff --git a/...lipse/sirius/web/papaya/representations/classdiagram/ClassDiagramDescriptionProvider.java b/...lipse/sirius/web/papaya/representations/classdiagram/ClassDiagramDescriptionProvider.java
@@ -17,7 +17,7 @@
 import org.eclipse.sirius.components.view.RepresentationDescription;
 import org.eclipse.sirius.components.view.builder.DefaultViewDiagramElementFinder;
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IDiagramElementDescriptionProvider;
 import org.eclipse.sirius.components.view.builder.providers.IRepresentationDescriptionProvider;

diff --git a/...ya/representations/classdiagram/edgedescriptions/ClassExtendsEdgeDescriptionProvider.java b/...ya/representations/classdiagram/edgedescriptions/ClassExtendsEdgeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.ArrowStyle;

diff --git a/...representations/classdiagram/edgedescriptions/ClassImplementsEdgeDescriptionProvider.java b/...representations/classdiagram/edgedescriptions/ClassImplementsEdgeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.ArrowStyle;

diff --git a/...epresentations/classdiagram/edgedescriptions/InterfaceExtendsEdgeDescriptionProvider.java b/...epresentations/classdiagram/edgedescriptions/InterfaceExtendsEdgeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.ArrowStyle;

diff --git a/...epresentations/classdiagram/edgedescriptions/RecordImplementsEdgeDescriptionProvider.java b/...epresentations/classdiagram/edgedescriptions/RecordImplementsEdgeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.ArrowStyle;

diff --git a/...representations/classdiagram/edgedescriptions/TypeContainmentEdgeDescriptionProvider.java b/...representations/classdiagram/edgedescriptions/TypeContainmentEdgeDescriptionProvider.java
@@ -16,7 +16,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.ArrowStyle;

diff --git a/...eb/papaya/representations/classdiagram/nodedescriptions/ClassNodeDescriptionProvider.java b/...eb/papaya/representations/classdiagram/nodedescriptions/ClassNodeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.INodeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.DiagramDescription;

diff --git a/...web/papaya/representations/classdiagram/nodedescriptions/EnumNodeDescriptionProvider.java b/...web/papaya/representations/classdiagram/nodedescriptions/EnumNodeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.INodeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.DiagramDescription;

diff --git a/...apaya/representations/classdiagram/nodedescriptions/InterfaceNodeDescriptionProvider.java b/...apaya/representations/classdiagram/nodedescriptions/InterfaceNodeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.INodeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.DiagramDescription;

diff --git a/...b/papaya/representations/classdiagram/nodedescriptions/RecordNodeDescriptionProvider.java b/...b/papaya/representations/classdiagram/nodedescriptions/RecordNodeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.INodeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.DiagramDescription;

diff --git a/...se/sirius/web/papaya/representations/classdiagram/tools/ClassDiagramDropToolProvider.java b/...se/sirius/web/papaya/representations/classdiagram/tools/ClassDiagramDropToolProvider.java
@@ -13,8 +13,8 @@
 package org.eclipse.sirius.web.papaya.representations.classdiagram.tools;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.diagram.DropTool;
 import org.eclipse.sirius.components.view.diagram.NodeContainmentKind;
 import org.eclipse.sirius.web.papaya.representations.classdiagram.nodedescriptions.ClassNodeDescriptionProvider;

diff --git a/...papaya/representations/classdiagram/tools/ImportAllInterfaceSubtypesNodeToolProvider.java b/...papaya/representations/classdiagram/tools/ImportAllInterfaceSubtypesNodeToolProvider.java
@@ -13,8 +13,8 @@
 package org.eclipse.sirius.web.papaya.representations.classdiagram.tools;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.INodeToolProvider;
 import org.eclipse.sirius.components.view.diagram.NodeContainmentKind;
 import org.eclipse.sirius.components.view.diagram.NodeTool;

diff --git a/...ya/representations/classdiagram/tools/ImportInterfaceImplementationsNodeToolProvider.java b/...ya/representations/classdiagram/tools/ImportInterfaceImplementationsNodeToolProvider.java
@@ -13,8 +13,8 @@
 package org.eclipse.sirius.web.papaya.representations.classdiagram.tools;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.INodeToolProvider;
 import org.eclipse.sirius.components.view.diagram.NodeContainmentKind;
 import org.eclipse.sirius.components.view.diagram.NodeTool;

diff --git a/...rius/web/papaya/representations/componentdiagram/ComponentDiagramDescriptionProvider.java b/...rius/web/papaya/representations/componentdiagram/ComponentDiagramDescriptionProvider.java
@@ -17,7 +17,7 @@
 import org.eclipse.sirius.components.view.RepresentationDescription;
 import org.eclipse.sirius.components.view.builder.DefaultViewDiagramElementFinder;
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IDiagramElementDescriptionProvider;
 import org.eclipse.sirius.components.view.builder.providers.IRepresentationDescriptionProvider;
@@ -27,8 +27,8 @@
 import org.eclipse.sirius.components.view.diagram.NodeTool;
 import org.eclipse.sirius.web.papaya.representations.componentdiagram.edgedescriptions.ComponentDependencyEdgeDescriptionProvider;
 import org.eclipse.sirius.web.papaya.representations.componentdiagram.nodedescriptions.ComponentNodeDescriptionProvider;
-import org.eclipse.sirius.web.papaya.representations.componentdiagram.tools.CreateComponentNodeToolProvider;
 import org.eclipse.sirius.web.papaya.representations.componentdiagram.tools.ComponentDiagramDropToolProvider;
+import org.eclipse.sirius.web.papaya.representations.componentdiagram.tools.CreateComponentNodeToolProvider;
 
 /**
  * Used to provide the view model used to create component diagrams.

diff --git a/...tations/componentdiagram/edgedescriptions/ComponentDependencyEdgeDescriptionProvider.java b/...tations/componentdiagram/edgedescriptions/ComponentDependencyEdgeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.ArrowStyle;

diff --git a/...a/representations/componentdiagram/nodedescriptions/ComponentNodeDescriptionProvider.java b/...a/representations/componentdiagram/nodedescriptions/ComponentNodeDescriptionProvider.java
@@ -15,7 +15,7 @@
 import java.util.Objects;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
 import org.eclipse.sirius.components.view.builder.providers.IColorProvider;
 import org.eclipse.sirius.components.view.builder.providers.INodeDescriptionProvider;
 import org.eclipse.sirius.components.view.diagram.DiagramDescription;

diff --git a/...s/web/papaya/representations/componentdiagram/tools/ComponentDiagramDropToolProvider.java b/...s/web/papaya/representations/componentdiagram/tools/ComponentDiagramDropToolProvider.java
@@ -13,8 +13,8 @@
 package org.eclipse.sirius.web.papaya.representations.componentdiagram.tools;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.diagram.DropTool;
 import org.eclipse.sirius.components.view.diagram.NodeContainmentKind;
 import org.eclipse.sirius.web.papaya.representations.componentdiagram.nodedescriptions.ComponentNodeDescriptionProvider;

diff --git a/...us/web/papaya/representations/componentdiagram/tools/CreateComponentNodeToolProvider.java b/...us/web/papaya/representations/componentdiagram/tools/CreateComponentNodeToolProvider.java
@@ -13,8 +13,8 @@
 package org.eclipse.sirius.web.papaya.representations.componentdiagram.tools;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.INodeToolProvider;
 import org.eclipse.sirius.components.view.diagram.NodeContainmentKind;
 import org.eclipse.sirius.components.view.diagram.NodeTool;
@@ -26,6 +26,7 @@
  * @author sbegaudeau
  */
 public class CreateComponentNodeToolProvider implements INodeToolProvider {
+
     @Override
     public NodeTool create(IViewDiagramElementFinder cache) {
         var componentNodeDescription = cache.getNodeDescription(ComponentNodeDescriptionProvider.NAME).orElse(null);

diff --git a/.../papaya/representations/componentdiagram/tools/ImportAllDependenciesNodeToolProvider.java b/.../papaya/representations/componentdiagram/tools/ImportAllDependenciesNodeToolProvider.java
@@ -13,8 +13,8 @@
 package org.eclipse.sirius.web.papaya.representations.componentdiagram.tools;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.INodeToolProvider;
 import org.eclipse.sirius.components.view.diagram.NodeContainmentKind;
 import org.eclipse.sirius.components.view.diagram.NodeTool;
@@ -26,6 +26,7 @@
  * @author sbegaudeau
  */
 public class ImportAllDependenciesNodeToolProvider implements INodeToolProvider {
+
     @Override
     public NodeTool create(IViewDiagramElementFinder cache) {
         var componentNodeDescription = cache.getNodeDescription(ComponentNodeDescriptionProvider.NAME).orElse(null);

diff --git a/...web/papaya/representations/componentdiagram/tools/ImportDependenciesNodeToolProvider.java b/...web/papaya/representations/componentdiagram/tools/ImportDependenciesNodeToolProvider.java
@@ -13,8 +13,8 @@
 package org.eclipse.sirius.web.papaya.representations.componentdiagram.tools;
 
 import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder;
-import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 import org.eclipse.sirius.components.view.builder.providers.INodeToolProvider;
 import org.eclipse.sirius.components.view.diagram.NodeContainmentKind;
 import org.eclipse.sirius.components.view.diagram.NodeTool;
@@ -26,6 +26,7 @@
  * @author sbegaudeau
  */
 public class ImportDependenciesNodeToolProvider implements INodeToolProvider {
+
     @Override
     public NodeTool create(IViewDiagramElementFinder cache) {
         var componentNodeDescription = cache.getNodeDescription(ComponentNodeDescriptionProvider.NAME).orElse(null);

diff --git a/...paya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaColorPaletteProvider.java b/...paya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaColorPaletteProvider.java
@@ -13,7 +13,7 @@
 package org.eclipse.sirius.web.papaya.services;
 
 import org.eclipse.sirius.components.view.ColorPalette;
-import org.eclipse.sirius.components.view.builder.generated.ViewBuilders;
+import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders;
 
 /**
  * Used to provide the color palette.