diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 770e180ff6..a021698061 100644 --- 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 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/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/DomainDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/DomainDiagramDescriptionProvider.java index abdc8fc962..e90b2c528d 100644 --- a/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/DomainDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/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/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/EntityNodeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/EntityNodeDescriptionProvider.java index 29720fa84b..cdfa22a7b1 100644 --- a/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/EntityNodeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/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/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/InheritanceEdgeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/InheritanceEdgeDescriptionProvider.java index 603130f5db..a4e1f3b7ac 100644 --- a/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/InheritanceEdgeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/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/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/RelationEdgeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/RelationEdgeDescriptionProvider.java index 4fd7d06e44..3df649f60b 100644 --- a/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/web/application/studio/services/representations/RelationEdgeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-application/src/main/java/org/eclipse/sirius/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/ClassDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/ClassDiagramDescriptionProvider.java index 081317f780..aa3ba1343f 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/ClassDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/ClassExtendsEdgeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/ClassExtendsEdgeDescriptionProvider.java index 1d92933ba7..86e16ab98f 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/ClassExtendsEdgeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/ClassImplementsEdgeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/ClassImplementsEdgeDescriptionProvider.java index 8cf657f385..4802023cda 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/ClassImplementsEdgeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/InterfaceExtendsEdgeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/InterfaceExtendsEdgeDescriptionProvider.java index 44726c6bff..bea995e2f0 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/InterfaceExtendsEdgeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/RecordImplementsEdgeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/RecordImplementsEdgeDescriptionProvider.java index 484ffd125e..7d9194a07e 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/RecordImplementsEdgeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/TypeContainmentEdgeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/TypeContainmentEdgeDescriptionProvider.java index 1e3200dbd1..a3b02e8da3 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/edgedescriptions/TypeContainmentEdgeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/ClassNodeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/ClassNodeDescriptionProvider.java index 8f96c92eec..f47d3750e2 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/ClassNodeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/EnumNodeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/EnumNodeDescriptionProvider.java index 59c1f6b5cf..0a1cbd8af1 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/EnumNodeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/InterfaceNodeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/InterfaceNodeDescriptionProvider.java index 5ee630f14b..197e318bd4 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/InterfaceNodeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/RecordNodeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/RecordNodeDescriptionProvider.java index 47ca2b2f00..41fbd955b0 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/nodedescriptions/RecordNodeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ClassDiagramDropToolProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ClassDiagramDropToolProvider.java index a8ab9d84f7..c7e26ae81e 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ClassDiagramDropToolProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ImportAllInterfaceSubtypesNodeToolProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ImportAllInterfaceSubtypesNodeToolProvider.java index 83c5ea00a7..4a3c46ae16 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ImportAllInterfaceSubtypesNodeToolProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ImportInterfaceImplementationsNodeToolProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ImportInterfaceImplementationsNodeToolProvider.java index 742165525d..eca5b86b6e 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/classdiagram/tools/ImportInterfaceImplementationsNodeToolProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/ComponentDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/ComponentDiagramDescriptionProvider.java index bba8e70206..01388048b5 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/ComponentDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/edgedescriptions/ComponentDependencyEdgeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/edgedescriptions/ComponentDependencyEdgeDescriptionProvider.java index accf2899ba..d9a2286ccb 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/edgedescriptions/ComponentDependencyEdgeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/nodedescriptions/ComponentNodeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/nodedescriptions/ComponentNodeDescriptionProvider.java index 43d511cc7a..e57674109f 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/nodedescriptions/ComponentNodeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ComponentDiagramDropToolProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ComponentDiagramDropToolProvider.java index 4861d2380a..8a9a94de33 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ComponentDiagramDropToolProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/CreateComponentNodeToolProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/CreateComponentNodeToolProvider.java index 822353c890..618ff93b35 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/CreateComponentNodeToolProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ImportAllDependenciesNodeToolProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ImportAllDependenciesNodeToolProvider.java index 293e8038ef..631d1c604d 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ImportAllDependenciesNodeToolProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ImportDependenciesNodeToolProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ImportDependenciesNodeToolProvider.java index 5d3e0b7099..ddffd85a5c 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/componentdiagram/tools/ImportDependenciesNodeToolProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/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/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaColorPaletteProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaColorPaletteProvider.java index ad6ae6f648..751ed52aeb 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaColorPaletteProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/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. diff --git a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaViewProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaViewProvider.java index 0c3377d687..4dab3ed2a8 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaViewProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaViewProvider.java @@ -19,7 +19,7 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +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.emfjson.resource.JsonResource; diff --git a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/ComponentPageDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/ComponentPageDescriptionProvider.java index 58f7f297b7..3364f3438d 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/ComponentPageDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/ComponentPageDescriptionProvider.java @@ -16,9 +16,9 @@ import java.util.Objects; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.ReferenceBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +import org.eclipse.sirius.components.view.builder.generated.reference.ReferenceBuilders; +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.form.ButtonDescription; import org.eclipse.sirius.components.view.form.GroupDescription; diff --git a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/NamedElementWidgetsProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/NamedElementWidgetsProvider.java index 1191106564..658f7ab624 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/NamedElementWidgetsProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/NamedElementWidgetsProvider.java @@ -16,8 +16,8 @@ import java.util.List; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +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.form.RichTextDescription; import org.eclipse.sirius.components.view.form.TextAreaDescription; diff --git a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/PackagePageDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/PackagePageDescriptionProvider.java index bfa5fe9327..31e5bd1b60 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/PackagePageDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/PackagePageDescriptionProvider.java @@ -16,9 +16,9 @@ import java.util.Objects; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.ReferenceBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +import org.eclipse.sirius.components.view.builder.generated.reference.ReferenceBuilders; +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.form.ButtonDescription; import org.eclipse.sirius.components.view.form.GroupDescription; diff --git a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/PapayaDetailsViewPageDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/PapayaDetailsViewPageDescriptionProvider.java index 78e604634b..75572fe253 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/PapayaDetailsViewPageDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/PapayaDetailsViewPageDescriptionProvider.java @@ -18,8 +18,8 @@ import org.eclipse.sirius.components.collaborative.forms.services.api.IPropertiesDescriptionRegistry; import org.eclipse.sirius.components.collaborative.forms.services.api.IPropertiesDescriptionRegistryConfigurer; import org.eclipse.sirius.components.view.ColorPalette; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +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.web.papaya.views.details.api.IFormDescriptionConverter; diff --git a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/ProjectPageDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/ProjectPageDescriptionProvider.java index 63eddc99b3..d5e8188e8c 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/ProjectPageDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/ProjectPageDescriptionProvider.java @@ -16,8 +16,8 @@ import java.util.Objects; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +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.form.ButtonDescription; import org.eclipse.sirius.components.view.form.GroupDescription; diff --git a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/QualifiedNameWidgetProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/QualifiedNameWidgetProvider.java index 49ccf392ff..f633700367 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/QualifiedNameWidgetProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/views/details/QualifiedNameWidgetProvider.java @@ -14,7 +14,7 @@ import static org.eclipse.sirius.web.papaya.views.details.PapayaDetailsViewPageDescriptionProvider.QUALIFIED_NAME_COLOR; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; import org.eclipse.sirius.components.view.form.LabelDescription; import org.springframework.stereotype.Service; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/deck/PapayaDeckDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/deck/PapayaDeckDescriptionProvider.java index 5a6ba9534a..88ca0496ac 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/deck/PapayaDeckDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/deck/PapayaDeckDescriptionProvider.java @@ -22,9 +22,9 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.DeckBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.deck.DeckBuilders; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders; import org.eclipse.sirius.components.view.deck.CreateCardTool; import org.eclipse.sirius.components.view.deck.DeckDescription; import org.eclipse.sirius.components.view.emf.deck.IDeckIdProvider; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/CustomNodesDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/CustomNodesDiagramDescriptionProvider.java index 817619063a..2ee7000d23 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/CustomNodesDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/CustomNodesDiagramDescriptionProvider.java @@ -22,10 +22,10 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.DiagramDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.EllipseNodeStyleDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.customnodes.EllipseNodeStyleDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.LineStyle; import org.eclipse.sirius.components.view.emf.diagram.IDiagramIdProvider; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/DropNodeDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/DropNodeDiagramDescriptionProvider.java index ca00becd1a..91177ee292 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/DropNodeDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/DropNodeDiagramDescriptionProvider.java @@ -22,9 +22,9 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; -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.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders; import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.DiagramFactory; import org.eclipse.sirius.components.view.diagram.DropNodeTool; @@ -115,7 +115,7 @@ private DiagramDescription createDiagramDescription() { .build(); var nodePalette = new DiagramBuilders().newNodePalette() - .dropNodeTool(dropNodeTool) + .dropNodeTool(this.dropNodeTool) .build(); var nodeDescription = new DiagramBuilders().newNodeDescription() diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/EdgeDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/EdgeDiagramDescriptionProvider.java index d9f523700c..c5db5801a6 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/EdgeDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/EdgeDiagramDescriptionProvider.java @@ -22,9 +22,9 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.DiagramBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; -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.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders; import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.DiagramFactory; import org.eclipse.sirius.components.view.diagram.EdgeReconnectionTool; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/EditableLabelDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/EditableLabelDiagramDescriptionProvider.java index 2d720ba38d..8af76eb48f 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/EditableLabelDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/EditableLabelDiagramDescriptionProvider.java @@ -22,14 +22,14 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.DiagramDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.InsideLabelDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.LabelEditToolBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodePaletteBuilder; -import org.eclipse.sirius.components.view.builder.generated.RectangularNodeStyleDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.InsideLabelDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.LabelEditToolBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodePaletteBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.RectangularNodeStyleDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.DiagramFactory; import org.eclipse.sirius.components.view.diagram.InsideLabelPosition; @@ -105,14 +105,13 @@ private DiagramDescription createDiagramDescription() { .initialDirectEditLabelExpression("aql:self.name") .body( new SetValueBuilder() - .featureName("name") - .valueExpression("aql:newLabel)") - .build() + .featureName("name") + .valueExpression("aql:newLabel)") + .build() ) .build(); - var nodePalette = new NodePaletteBuilder() .labelEditTool(this.labelEditTool) .build(); diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/ExpandCollapseDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/ExpandCollapseDiagramDescriptionProvider.java index d4da5a289c..f1e262cb4a 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/ExpandCollapseDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/ExpandCollapseDiagramDescriptionProvider.java @@ -22,14 +22,14 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.DiagramDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.InsideLabelDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodePaletteBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeToolBuilder; -import org.eclipse.sirius.components.view.builder.generated.RectangularNodeStyleDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.InsideLabelDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodePaletteBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeToolBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.RectangularNodeStyleDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.DiagramFactory; import org.eclipse.sirius.components.view.diagram.InsideLabelPosition; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/ModelOperationDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/ModelOperationDiagramDescriptionProvider.java index 587b704c79..b867992b6e 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/ModelOperationDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/ModelOperationDiagramDescriptionProvider.java @@ -22,17 +22,17 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.CreateInstanceBuilder; -import org.eclipse.sirius.components.view.builder.generated.DiagramDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.DiagramPaletteBuilder; -import org.eclipse.sirius.components.view.builder.generated.InsideLabelDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeToolBuilder; -import org.eclipse.sirius.components.view.builder.generated.RectangularNodeStyleDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SelectionDialogDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramPaletteBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.InsideLabelDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeToolBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.RectangularNodeStyleDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.SelectionDialogDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.CreateInstanceBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders; import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.DiagramFactory; import org.eclipse.sirius.components.view.diagram.InsideLabelPosition; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/UnsynchronizedDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/UnsynchronizedDiagramDescriptionProvider.java index 7d4c6a3513..30ee514876 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/UnsynchronizedDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/UnsynchronizedDiagramDescriptionProvider.java @@ -22,18 +22,18 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.CreateInstanceBuilder; -import org.eclipse.sirius.components.view.builder.generated.CreateViewBuilder; -import org.eclipse.sirius.components.view.builder.generated.DiagramDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.DiagramPaletteBuilder; -import org.eclipse.sirius.components.view.builder.generated.DropToolBuilder; -import org.eclipse.sirius.components.view.builder.generated.InsideLabelDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeToolBuilder; -import org.eclipse.sirius.components.view.builder.generated.RectangularNodeStyleDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.CreateViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramPaletteBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.DropToolBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.InsideLabelDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeToolBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.RectangularNodeStyleDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.CreateInstanceBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.DiagramFactory; import org.eclipse.sirius.components.view.diagram.DropTool; @@ -177,7 +177,7 @@ private DiagramDescription createDiagramDescription() { var diagramPalette = new DiagramPaletteBuilder() .nodeTools(this.createNodeTool) - .dropTool(dropOnDiagramTool) + .dropTool(this.dropOnDiagramTool) .build(); this.diagramDescription = new DiagramDescriptionBuilder() diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/VisibilityDiagramDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/VisibilityDiagramDescriptionProvider.java index f1d8089982..b18fa16bf4 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/VisibilityDiagramDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/diagrams/VisibilityDiagramDescriptionProvider.java @@ -22,14 +22,14 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.DiagramDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.InsideLabelDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodePaletteBuilder; -import org.eclipse.sirius.components.view.builder.generated.NodeToolBuilder; -import org.eclipse.sirius.components.view.builder.generated.RectangularNodeStyleDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.DiagramDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.InsideLabelDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodePaletteBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.NodeToolBuilder; +import org.eclipse.sirius.components.view.builder.generated.diagram.RectangularNodeStyleDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.diagram.DiagramDescription; import org.eclipse.sirius.components.view.diagram.DiagramFactory; import org.eclipse.sirius.components.view.diagram.InsideLabelPosition; @@ -132,8 +132,8 @@ private DiagramDescription createDiagramDescription() { .name("Hide") .body( new ChangeContextBuilder() - .expression("aql:diagramServices.hide(Sequence{ selectedNode })") - .build() + .expression("aql:diagramServices.hide(Sequence{ selectedNode })") + .build() ) .build(); @@ -141,8 +141,8 @@ private DiagramDescription createDiagramDescription() { .name("Reveal") .body( new ChangeContextBuilder() - .expression("aql:diagramServices.reveal(Sequence{ selectedNode })") - .build() + .expression("aql:diagramServices.reveal(Sequence{ selectedNode })") + .build() ) .build(); @@ -150,8 +150,8 @@ private DiagramDescription createDiagramDescription() { .name("Fade") .body( new ChangeContextBuilder() - .expression("aql:diagramServices.fade(Sequence{ selectedNode })") - .build() + .expression("aql:diagramServices.fade(Sequence{ selectedNode })") + .build() ) .build(); @@ -159,8 +159,8 @@ private DiagramDescription createDiagramDescription() { .name("Unfade") .body( new ChangeContextBuilder() - .expression("aql:diagramServices.unfade(Sequence{ selectedNode })") - .build() + .expression("aql:diagramServices.unfade(Sequence{ selectedNode })") + .build() ) .build(); @@ -168,13 +168,12 @@ private DiagramDescription createDiagramDescription() { .name("Reset Visibility") .body( new ChangeContextBuilder() - .expression("aql:diagramServices.resetViewModifiers(Sequence{ selectedNode })") - .build() + .expression("aql:diagramServices.resetViewModifiers(Sequence{ selectedNode })") + .build() ) .build(); - var nodePalette = new NodePaletteBuilder() .nodeTools(this.hideNodeTool, this.revealNodeTool, this.fadeNodeTool, this.unfadeNodeTool, this.resetNodeTool) .build(); diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormVariableViewPreEditingContextProcessor.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormVariableViewPreEditingContextProcessor.java index 1e6e3d15b6..2578636823 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormVariableViewPreEditingContextProcessor.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormVariableViewPreEditingContextProcessor.java @@ -22,13 +22,13 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.FormVariableBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ListDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.TreeDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormVariableBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.ListDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.TreeDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.components.view.form.GroupDescription; @@ -45,7 +45,7 @@ * @author mcharfadi */ @Service -public class FormVariableViewPreEditingContextProcessor implements IEditingContextProcessor { +public class FormVariableViewPreEditingContextProcessor implements IEditingContextProcessor { private final IFormIdProvider formIdProvider; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithCheckboxDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithCheckboxDescriptionProvider.java index 074e1a6ca4..dd6e822198 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithCheckboxDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithCheckboxDescriptionProvider.java @@ -22,13 +22,13 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; @@ -46,6 +46,7 @@ @Conditional(OnStudioTests.class) @SuppressWarnings("checkstyle:MultipleStringLiterals") public class FormWithCheckboxDescriptionProvider implements IEditingContextProcessor { + private final IFormIdProvider formIdProvider; private final View view; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithDateTimeDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithDateTimeDescriptionProvider.java index 1f6a4e01d4..b7893897cd 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithDateTimeDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithDateTimeDescriptionProvider.java @@ -22,13 +22,13 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.DateTimeDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.DateTimeDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithLinkDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithLinkDescriptionProvider.java index 52f44f7538..6a41ac64a6 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithLinkDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithLinkDescriptionProvider.java @@ -22,11 +22,11 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; @@ -44,6 +44,7 @@ @Conditional(OnStudioTests.class) @SuppressWarnings("checkstyle:MultipleStringLiterals") public class FormWithLinkDescriptionProvider implements IEditingContextProcessor { + private final IFormIdProvider formIdProvider; private final View view; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithListDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithListDescriptionProvider.java index 5091b64cc8..873fb9947a 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithListDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithListDescriptionProvider.java @@ -22,13 +22,13 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithRadioDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithRadioDescriptionProvider.java index 866a5d29da..65e93e3f12 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithRadioDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithRadioDescriptionProvider.java @@ -22,13 +22,13 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.FormBuilders; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormBuilders; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithReferenceWidgetDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithReferenceWidgetDescriptionProvider.java index 1ed3bed27b..7293fd884d 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithReferenceWidgetDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithReferenceWidgetDescriptionProvider.java @@ -22,12 +22,12 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ReferenceWidgetDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ReferenceWidgetDescriptionStyleBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.reference.ReferenceWidgetDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.reference.ReferenceWidgetDescriptionStyleBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithRichTextDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithRichTextDescriptionProvider.java index e4f021360d..5dc5502135 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithRichTextDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithRichTextDescriptionProvider.java @@ -22,13 +22,13 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.RichTextDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.RichTextDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; @@ -46,6 +46,7 @@ @Conditional(OnStudioTests.class) @SuppressWarnings("checkstyle:MultipleStringLiterals") public class FormWithRichTextDescriptionProvider implements IEditingContextProcessor { + private final IFormIdProvider formIdProvider; private final View view; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithSliderDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithSliderDescriptionProvider.java index 0356251eb0..06d4fe199b 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithSliderDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithSliderDescriptionProvider.java @@ -22,13 +22,13 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.SliderDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.SliderDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTextfieldDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTextfieldDescriptionProvider.java index 45b0c28ccc..cc33b9e04b 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTextfieldDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTextfieldDescriptionProvider.java @@ -22,15 +22,15 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.ConditionalTextfieldDescriptionStyleBuilder; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.GroupDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.TextfieldDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.TextfieldDescriptionStyleBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.ConditionalTextfieldDescriptionStyleBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.GroupDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.TextfieldDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.TextfieldDescriptionStyleBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTitleExpressionDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTitleExpressionDescriptionProvider.java index d24c0595f0..6a6a3981a0 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTitleExpressionDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTitleExpressionDescriptionProvider.java @@ -22,9 +22,9 @@ import org.eclipse.sirius.components.emf.services.IDAdapter; import org.eclipse.sirius.components.emf.services.JSONResourceFactory; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.FormDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.PageDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.FormDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.form.PageDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.emf.form.IFormIdProvider; import org.eclipse.sirius.components.view.form.FormDescription; import org.eclipse.sirius.emfjson.resource.JsonResource; @@ -42,6 +42,7 @@ @Conditional(OnStudioTests.class) @SuppressWarnings("checkstyle:MultipleStringLiterals") public class FormWithTitleExpressionDescriptionProvider implements IEditingContextProcessor { + private final IFormIdProvider formIdProvider; private final View view; diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/gantt/PapayaGanttDescriptionProvider.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/gantt/PapayaGanttDescriptionProvider.java index ffb749f125..d41c6d019b 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/gantt/PapayaGanttDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/gantt/PapayaGanttDescriptionProvider.java @@ -24,15 +24,15 @@ import org.eclipse.sirius.components.view.ChangeContext; import org.eclipse.sirius.components.view.SetValue; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.CreateInstanceBuilder; -import org.eclipse.sirius.components.view.builder.generated.DeleteElementBuilder; -import org.eclipse.sirius.components.view.builder.generated.GanttBuilders; -import org.eclipse.sirius.components.view.builder.generated.GanttDescriptionBuilder; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.UnsetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.gantt.GanttBuilders; +import org.eclipse.sirius.components.view.builder.generated.gantt.GanttDescriptionBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.CreateInstanceBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.DeleteElementBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.UnsetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders; import org.eclipse.sirius.components.view.emf.gantt.IGanttIdProvider; import org.eclipse.sirius.components.view.gantt.CreateTaskDependencyTool; import org.eclipse.sirius.components.view.gantt.CreateTaskTool; diff --git a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/services/FlowEditingContextInitializer.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/services/FlowEditingContextInitializer.java index bed7e69403..d9e1d2f329 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/services/FlowEditingContextInitializer.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/services/FlowEditingContextInitializer.java @@ -31,7 +31,7 @@ import org.eclipse.sirius.components.view.FixedColor; import org.eclipse.sirius.components.view.View; import org.eclipse.sirius.components.view.ViewFactory; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilder; import org.eclipse.sirius.components.view.builder.providers.IColorProvider; import org.eclipse.sirius.emfjson.resource.JsonResource; import org.eclipse.sirius.web.application.UUIDParser; diff --git a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyUnsynchronizedViewDiagramDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyUnsynchronizedViewDiagramDescriptionProvider.java index bff99a9e99..6de449dd7f 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyUnsynchronizedViewDiagramDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyUnsynchronizedViewDiagramDescriptionProvider.java @@ -22,8 +22,8 @@ import org.eclipse.sirius.components.flow.starter.view.descriptions.SystemDescriptionProvider; import org.eclipse.sirius.components.view.RepresentationDescription; 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.IColorProvider; import org.eclipse.sirius.components.view.builder.providers.IDiagramElementDescriptionProvider; import org.eclipse.sirius.components.view.builder.providers.IRepresentationDescriptionProvider; diff --git a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyViewDiagramDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyViewDiagramDescriptionProvider.java index 8883235f13..7e6a64c28a 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyViewDiagramDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyViewDiagramDescriptionProvider.java @@ -22,8 +22,8 @@ import org.eclipse.sirius.components.flow.starter.view.descriptions.SystemDescriptionProvider; import org.eclipse.sirius.components.view.RepresentationDescription; 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.IColorProvider; import org.eclipse.sirius.components.view.builder.providers.IDiagramElementDescriptionProvider; import org.eclipse.sirius.components.view.builder.providers.IRepresentationDescriptionProvider; diff --git a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyWithAutoLayoutViewDiagramDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyWithAutoLayoutViewDiagramDescriptionProvider.java index 1185f0f49e..381587c2be 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyWithAutoLayoutViewDiagramDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowTopographyWithAutoLayoutViewDiagramDescriptionProvider.java @@ -22,8 +22,8 @@ import org.eclipse.sirius.components.flow.starter.view.descriptions.SystemDescriptionProvider; import org.eclipse.sirius.components.view.RepresentationDescription; 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.IColorProvider; import org.eclipse.sirius.components.view.builder.providers.IDiagramElementDescriptionProvider; import org.eclipse.sirius.components.view.builder.providers.IRepresentationDescriptionProvider; diff --git a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowViewBuilder.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowViewBuilder.java index 94c4b717d7..19b66a9e09 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowViewBuilder.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/FlowViewBuilder.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.sirius.components.flow.starter.view; -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.IColorProvider; import org.eclipse.sirius.components.view.diagram.DeleteTool; import org.eclipse.sirius.components.view.diagram.EdgeTool; diff --git a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/DataSourceDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/DataSourceDescriptionProvider.java index 20b1f15eef..f823394d12 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/DataSourceDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/DataSourceDescriptionProvider.java @@ -21,7 +21,7 @@ import org.eclipse.sirius.components.flow.starter.view.FlowViewBuilder; 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/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/DataSourceToProcessorEdgeDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/DataSourceToProcessorEdgeDescriptionProvider.java index 44272300e1..a200a50653 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/DataSourceToProcessorEdgeDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/DataSourceToProcessorEdgeDescriptionProvider.java @@ -16,8 +16,8 @@ import org.eclipse.sirius.components.flow.starter.view.FlowViewBuilder; 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.IColorProvider; import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider; import org.eclipse.sirius.components.view.diagram.ArrowStyle; diff --git a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/FanDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/FanDescriptionProvider.java index 302fc408c2..10e2533385 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/FanDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/FanDescriptionProvider.java @@ -18,7 +18,7 @@ import org.eclipse.sirius.components.flow.starter.view.FlowViewBuilder; 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/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/PowerInputDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/PowerInputDescriptionProvider.java index 113fb4c802..5b8e9418ae 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/PowerInputDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/PowerInputDescriptionProvider.java @@ -18,7 +18,7 @@ import org.eclipse.sirius.components.flow.starter.view.FlowViewBuilder; 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/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/PowerOutputDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/PowerOutputDescriptionProvider.java index 6302192d05..bec60da1a7 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/PowerOutputDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/PowerOutputDescriptionProvider.java @@ -18,7 +18,7 @@ import org.eclipse.sirius.components.flow.starter.view.FlowViewBuilder; 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/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/ProcessorDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/ProcessorDescriptionProvider.java index a1fb3cdcf5..74d67bd71a 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/ProcessorDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/ProcessorDescriptionProvider.java @@ -32,7 +32,7 @@ import org.eclipse.sirius.components.flow.starter.view.FlowViewBuilder; 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/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/ProcessorToProcessorEdgeDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/ProcessorToProcessorEdgeDescriptionProvider.java index 2bd69a91ac..c1a94d1f7c 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/ProcessorToProcessorEdgeDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/ProcessorToProcessorEdgeDescriptionProvider.java @@ -16,8 +16,8 @@ import org.eclipse.sirius.components.flow.starter.view.FlowViewBuilder; 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.IColorProvider; import org.eclipse.sirius.components.view.builder.providers.IEdgeDescriptionProvider; import org.eclipse.sirius.components.view.diagram.ArrowStyle; diff --git a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/SystemDescriptionProvider.java b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/SystemDescriptionProvider.java index 48f43fccb8..29807c21b9 100644 --- a/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/SystemDescriptionProvider.java +++ b/packages/starters/backend/sirius-components-flow-starter/src/main/java/org/eclipse/sirius/components/flow/starter/view/descriptions/SystemDescriptionProvider.java @@ -16,8 +16,8 @@ import org.eclipse.sirius.components.flow.starter.view.FlowViewBuilder; 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.IColorProvider; import org.eclipse.sirius.components.view.builder.providers.INodeDescriptionProvider; import org.eclipse.sirius.components.view.diagram.DiagramDescription; diff --git a/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/view/ViewDeckDescriptionBuilder.java b/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/view/ViewDeckDescriptionBuilder.java index 80e738bb90..1a4ef1f6bd 100644 --- a/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/view/ViewDeckDescriptionBuilder.java +++ b/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/view/ViewDeckDescriptionBuilder.java @@ -22,8 +22,8 @@ import org.eclipse.sirius.components.view.SetValue; import org.eclipse.sirius.components.view.UnsetValue; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.DeckBuilders; -import org.eclipse.sirius.components.view.builder.generated.ViewBuilders; +import org.eclipse.sirius.components.view.builder.generated.deck.DeckBuilders; +import org.eclipse.sirius.components.view.builder.generated.view.ViewBuilders; import org.eclipse.sirius.components.view.deck.CardDescription; import org.eclipse.sirius.components.view.deck.CardDropTool; import org.eclipse.sirius.components.view.deck.ConditionalDeckElementDescriptionStyle; @@ -112,40 +112,40 @@ private CardDescription createCardDescription(View view, String tagPrefix) { DeleteCardTool deleteCardTool = this.createDeleteCardTool(); ConditionalDeckElementDescriptionStyle conditionStyleForTaskWithSubTasks = this.deckBuilders.newConditionalDeckElementDescriptionStyle() - .condition(String.format("aql:self.subTasks->select(task | task.tags->exists(tag | tag.prefix == '%s'))->size()>0", tagPrefix)) - .backgroundColor(view.getColorPalettes().get(0).getColors().get(0)) - .build(); + .condition(String.format("aql:self.subTasks->select(task | task.tags->exists(tag | tag.prefix == '%s'))->size()>0", tagPrefix)) + .backgroundColor(view.getColorPalettes().get(0).getColors().get(0)) + .build(); ConditionalDeckElementDescriptionStyle conditionStyleForTaskWithParentWithoutSameTag = this.deckBuilders.newConditionalDeckElementDescriptionStyle() - .condition(String.format("aql:if self.eContainer().oclIsKindOf(task::AbstractTask) then not self.eContainer().tags->exists(tag | tag.prefix == '%s') else false endif", tagPrefix)) - .backgroundColor(view.getColorPalettes().get(0).getColors().get(1)) - .build(); + .condition(String.format("aql:if self.eContainer().oclIsKindOf(task::AbstractTask) then not self.eContainer().tags->exists(tag | tag.prefix == '%s') else false endif", tagPrefix)) + .backgroundColor(view.getColorPalettes().get(0).getColors().get(1)) + .build(); return this.deckBuilders.newCardDescription() - .name("Card Description") - .semanticCandidatesExpression("aql:self.getTasksWithTag()") - .titleExpression(AQL_SELF_NAME) - .labelExpression("aql:self.computeTaskDurationDays()") - .descriptionExpression(AQL_SELF_DESCRIPTION) - .editTool(editCardTool) - .deleteTool(deleteCardTool) - .conditionalStyles(conditionStyleForTaskWithSubTasks, conditionStyleForTaskWithParentWithoutSameTag) - .build(); + .name("Card Description") + .semanticCandidatesExpression("aql:self.getTasksWithTag()") + .titleExpression(AQL_SELF_NAME) + .labelExpression("aql:self.computeTaskDurationDays()") + .descriptionExpression(AQL_SELF_DESCRIPTION) + .editTool(editCardTool) + .deleteTool(deleteCardTool) + .conditionalStyles(conditionStyleForTaskWithSubTasks, conditionStyleForTaskWithParentWithoutSameTag) + .build(); } private ColorPalette createColorPalette() { return this.viewBuilders.newColorPalette() - .colors(this.createFixedColor("Deck_LightYellow", "#f7efb1"), - this.createFixedColor("Deck_LightRed", "#f7b1bc")) - .build(); + .colors(this.createFixedColor("Deck_LightYellow", "#f7efb1"), + this.createFixedColor("Deck_LightRed", "#f7b1bc")) + .build(); } private FixedColor createFixedColor(String name, String value) { return this.viewBuilders - .newFixedColor() - .name(value) - .value(value) - .build(); + .newFixedColor() + .name(value) + .value(value) + .build(); } private LaneDescription createLaneDescription(String prefix) { @@ -169,7 +169,7 @@ private LaneDescription createObjectiveLaneDescription() { EditCardTool editCardTool = this.createEditCardTool(); DeleteCardTool deleteCardTool = this.createDeleteCardTool(); - CardDescription cardDescription = this.deckBuilders.newCardDescription() + CardDescription cardDescription = this.deckBuilders.newCardDescription() .name("Key Result Cards") .semanticCandidatesExpression("aql:self.ownedKeyResults") .titleExpression(AQL_SELF_NAME) diff --git a/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/view/ViewGanttDescriptionBuilder.java b/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/view/ViewGanttDescriptionBuilder.java index 0752b1c265..79524336ab 100644 --- a/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/view/ViewGanttDescriptionBuilder.java +++ b/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/view/ViewGanttDescriptionBuilder.java @@ -13,11 +13,11 @@ package org.eclipse.sirius.components.task.starter.services.view; import org.eclipse.sirius.components.view.View; -import org.eclipse.sirius.components.view.builder.generated.ChangeContextBuilder; -import org.eclipse.sirius.components.view.builder.generated.DeleteElementBuilder; -import org.eclipse.sirius.components.view.builder.generated.GanttBuilders; -import org.eclipse.sirius.components.view.builder.generated.SetValueBuilder; -import org.eclipse.sirius.components.view.builder.generated.UnsetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.gantt.GanttBuilders; +import org.eclipse.sirius.components.view.builder.generated.view.ChangeContextBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.DeleteElementBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.SetValueBuilder; +import org.eclipse.sirius.components.view.builder.generated.view.UnsetValueBuilder; import org.eclipse.sirius.components.view.gantt.CreateTaskDependencyTool; import org.eclipse.sirius.components.view.gantt.CreateTaskTool; import org.eclipse.sirius.components.view.gantt.DeleteTaskDependencyTool; @@ -42,7 +42,7 @@ public ViewGanttDescriptionBuilder() { } public void addRepresentationDescription(View view) { - GanttDescription ganttDescription = this.createGanttDescription(); + GanttDescription ganttDescription = this.createGanttDescription(); view.getDescriptions().add(ganttDescription); @@ -113,12 +113,12 @@ private CreateTaskDependencyTool createTaskDependencyTool() { return new GanttBuilders().newCreateTaskDependencyTool() .name("Create Task Dependency") .body(new ChangeContextBuilder() - .expression("aql:targetObject") - .children(new SetValueBuilder() - .featureName("dependencies") - .valueExpression("aql:sourceObject") + .expression("aql:targetObject") + .children(new SetValueBuilder() + .featureName("dependencies") + .valueExpression("aql:sourceObject") + .build()) .build()) - .build()) .build(); } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CustomnodesBuilders.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/customnodes/CustomnodesBuilders.java similarity index 92% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CustomnodesBuilders.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/customnodes/CustomnodesBuilders.java index 193d62ff6e..c6a5bc0ea9 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CustomnodesBuilders.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/customnodes/CustomnodesBuilders.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.customnodes; /** * Use to instantiate a new builder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EllipseNodeStyleDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/customnodes/EllipseNodeStyleDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EllipseNodeStyleDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/customnodes/EllipseNodeStyleDescriptionBuilder.java index befb172c0b..ca24a4cdb7 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EllipseNodeStyleDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/customnodes/EllipseNodeStyleDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.customnodes; /** * Builder for EllipseNodeStyleDescriptionBuilder. @@ -42,15 +42,6 @@ public org.eclipse.sirius.components.view.diagram.customnodes.EllipseNodeStyleDe return this.getEllipseNodeStyleDescription(); } - /** - * Setter for Background. - * - * @generated - */ - public EllipseNodeStyleDescriptionBuilder background(org.eclipse.sirius.components.view.UserColor value) { - this.getEllipseNodeStyleDescription().setBackground(value); - return this; - } /** * Setter for BorderColor. * @@ -87,6 +78,15 @@ public EllipseNodeStyleDescriptionBuilder borderLineStyle(org.eclipse.sirius.com this.getEllipseNodeStyleDescription().setBorderLineStyle(value); return this; } + /** + * Setter for Background. + * + * @generated + */ + public EllipseNodeStyleDescriptionBuilder background(org.eclipse.sirius.components.view.UserColor value) { + this.getEllipseNodeStyleDescription().setBackground(value); + return this; + } } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CardDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CardDescriptionBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CardDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CardDescriptionBuilder.java index b31ff514a6..4fef4c0e12 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CardDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CardDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for CardDescriptionBuilder. @@ -42,26 +42,6 @@ public org.eclipse.sirius.components.view.deck.CardDescription build() { return this.getCardDescription(); } - /** - * Setter for Name. - * - * @generated - */ - public CardDescriptionBuilder name(java.lang.String value) { - this.getCardDescription().setName(value); - return this; - } - - /** - * Setter for DomainType. - * - * @generated - */ - public CardDescriptionBuilder domainType(java.lang.String value) { - this.getCardDescription().setDomainType(value); - return this; - } - /** * Setter for SemanticCandidatesExpression. * @@ -98,7 +78,6 @@ public CardDescriptionBuilder style(org.eclipse.sirius.components.view.deck.Deck this.getCardDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -111,6 +90,24 @@ public CardDescriptionBuilder conditionalStyles(org.eclipse.sirius.components.vi return this; } + /** + * Setter for Name. + * + * @generated + */ + public CardDescriptionBuilder name(java.lang.String value) { + this.getCardDescription().setName(value); + return this; + } + /** + * Setter for DomainType. + * + * @generated + */ + public CardDescriptionBuilder domainType(java.lang.String value) { + this.getCardDescription().setDomainType(value); + return this; + } /** * Setter for DescriptionExpression. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CardDropToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CardDropToolBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CardDropToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CardDropToolBuilder.java index f768ddbb6d..7e437d8ba6 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CardDropToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CardDropToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for CardDropToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDeckDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/ConditionalDeckDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDeckDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/ConditionalDeckDescriptionStyleBuilder.java index 4c00097014..73444cc54d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDeckDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/ConditionalDeckDescriptionStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for ConditionalDeckDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDeckElementDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/ConditionalDeckElementDescriptionStyleBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDeckElementDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/ConditionalDeckElementDescriptionStyleBuilder.java index 91a71f816b..98ef90c1c7 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDeckElementDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/ConditionalDeckElementDescriptionStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for ConditionalDeckElementDescriptionStyleBuilder. @@ -105,7 +105,6 @@ public ConditionalDeckElementDescriptionStyleBuilder backgroundColor(org.eclipse this.getConditionalDeckElementDescriptionStyle().setBackgroundColor(value); return this; } - /** * Setter for Color. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateCardToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CreateCardToolBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateCardToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CreateCardToolBuilder.java index 183fc0bfe9..4aba3021e0 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateCardToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/CreateCardToolBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for CreateCardToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckBuilders.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckBuilders.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckBuilders.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckBuilders.java index 3d8e47f3c6..e3f8df3352 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckBuilders.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckBuilders.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Use to instantiate a new builder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckDescriptionBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckDescriptionBuilder.java index 1bcdd8c9a7..3942e3b06c 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for DeckDescriptionBuilder. @@ -99,7 +99,6 @@ public DeckDescriptionBuilder laneDropTool(org.eclipse.sirius.components.view.de this.getDeckDescription().setLaneDropTool(value); return this; } - /** * Setter for Style. * @@ -109,7 +108,6 @@ public DeckDescriptionBuilder style(org.eclipse.sirius.components.view.deck.Deck this.getDeckDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -122,5 +120,6 @@ public DeckDescriptionBuilder conditionalStyles(org.eclipse.sirius.components.vi return this; } + } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckDescriptionStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckDescriptionStyleBuilder.java index c2db559f5c..164293ef54 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckDescriptionStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for DeckDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckElementDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckElementDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckElementDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckElementDescriptionBuilder.java index 12a46ad8d2..4c2e92e8a3 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckElementDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckElementDescriptionBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for org.eclipse.sirius.components.view.deck.DeckElementDescription. @@ -53,7 +53,6 @@ public DeckElementDescriptionBuilder labelExpression(java.lang.String value) { this.getDeckElementDescription().setLabelExpression(value); return this; } - /** * Setter for Style. * @@ -63,7 +62,6 @@ public DeckElementDescriptionBuilder style(org.eclipse.sirius.components.view.de this.getDeckElementDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -76,5 +74,6 @@ public DeckElementDescriptionBuilder conditionalStyles(org.eclipse.sirius.compon return this; } + } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckElementDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckElementDescriptionStyleBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckElementDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckElementDescriptionStyleBuilder.java index 5b18075759..8d50bf74d6 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckElementDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckElementDescriptionStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for DeckElementDescriptionStyleBuilder. @@ -96,7 +96,6 @@ public DeckElementDescriptionStyleBuilder backgroundColor(org.eclipse.sirius.com this.getDeckElementDescriptionStyle().setBackgroundColor(value); return this; } - /** * Setter for Color. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckToolBuilder.java similarity index 93% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckToolBuilder.java index 6d8ccd784d..8dd95c9d7d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeckToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeckToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for org.eclipse.sirius.components.view.deck.DeckTool. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteCardToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeleteCardToolBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteCardToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeleteCardToolBuilder.java index 36e3cec269..6319a55734 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteCardToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/DeleteCardToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for DeleteCardToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditCardToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/EditCardToolBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditCardToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/EditCardToolBuilder.java index 014acff0cf..88cf82d4de 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditCardToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/EditCardToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for EditCardToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditLaneToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/EditLaneToolBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditLaneToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/EditLaneToolBuilder.java index 936709e088..22e8c54f9a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditLaneToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/EditLaneToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for EditLaneToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LaneDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/LaneDescriptionBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LaneDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/LaneDescriptionBuilder.java index 8947ae39f9..60f848926e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LaneDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/LaneDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for LaneDescriptionBuilder. @@ -42,26 +42,6 @@ public org.eclipse.sirius.components.view.deck.LaneDescription build() { return this.getLaneDescription(); } - /** - * Setter for Name. - * - * @generated - */ - public LaneDescriptionBuilder name(java.lang.String value) { - this.getLaneDescription().setName(value); - return this; - } - - /** - * Setter for DomainType. - * - * @generated - */ - public LaneDescriptionBuilder domainType(java.lang.String value) { - this.getLaneDescription().setDomainType(value); - return this; - } - /** * Setter for SemanticCandidatesExpression. * @@ -98,7 +78,6 @@ public LaneDescriptionBuilder style(org.eclipse.sirius.components.view.deck.Deck this.getLaneDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -111,6 +90,24 @@ public LaneDescriptionBuilder conditionalStyles(org.eclipse.sirius.components.vi return this; } + /** + * Setter for Name. + * + * @generated + */ + public LaneDescriptionBuilder name(java.lang.String value) { + this.getLaneDescription().setName(value); + return this; + } + /** + * Setter for DomainType. + * + * @generated + */ + public LaneDescriptionBuilder domainType(java.lang.String value) { + this.getLaneDescription().setDomainType(value); + return this; + } /** * Setter for OwnedCardDescriptions. * @@ -132,7 +129,6 @@ public LaneDescriptionBuilder editTool(org.eclipse.sirius.components.view.deck.E this.getLaneDescription().setEditTool(value); return this; } - /** * Setter for CreateTool. * @@ -142,7 +138,6 @@ public LaneDescriptionBuilder createTool(org.eclipse.sirius.components.view.deck this.getLaneDescription().setCreateTool(value); return this; } - /** * Setter for CardDropTool. * @@ -152,7 +147,6 @@ public LaneDescriptionBuilder cardDropTool(org.eclipse.sirius.components.view.de this.getLaneDescription().setCardDropTool(value); return this; } - /** * Setter for IsCollapsibleExpression. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LaneDropToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/LaneDropToolBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LaneDropToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/LaneDropToolBuilder.java index 4a49ad6c54..2e9285b07f 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LaneDropToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/deck/LaneDropToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.deck; /** * Builder for LaneDropToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BorderStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/BorderStyleBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BorderStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/BorderStyleBuilder.java index d0721fc1ab..b5c89a8923 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BorderStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/BorderStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.BorderStyle. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalEdgeStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalEdgeStyleBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalEdgeStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalEdgeStyleBuilder.java index acbd20a1d0..79903f3071 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalEdgeStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalEdgeStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for ConditionalEdgeStyleBuilder. @@ -114,7 +114,6 @@ public ConditionalEdgeStyleBuilder borderColor(org.eclipse.sirius.components.vie this.getConditionalEdgeStyle().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -124,7 +123,6 @@ public ConditionalEdgeStyleBuilder borderRadius(java.lang.Integer value) { this.getConditionalEdgeStyle().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -134,7 +132,6 @@ public ConditionalEdgeStyleBuilder borderSize(java.lang.Integer value) { this.getConditionalEdgeStyle().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * @@ -144,7 +141,6 @@ public ConditionalEdgeStyleBuilder borderLineStyle(org.eclipse.sirius.components this.getConditionalEdgeStyle().setBorderLineStyle(value); return this; } - /** * Setter for LineStyle. * @@ -190,7 +186,6 @@ public ConditionalEdgeStyleBuilder showIcon(java.lang.Boolean value) { this.getConditionalEdgeStyle().setShowIcon(value); return this; } - /** * Setter for LabelIcon. * @@ -200,7 +195,6 @@ public ConditionalEdgeStyleBuilder labelIcon(java.lang.String value) { this.getConditionalEdgeStyle().setLabelIcon(value); return this; } - /** * Setter for Background. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalInsideLabelStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalInsideLabelStyleBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalInsideLabelStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalInsideLabelStyleBuilder.java index e523ede238..2b81eaa46d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalInsideLabelStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalInsideLabelStyleBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for ConditionalInsideLabelStyleBuilder. @@ -22,14 +22,12 @@ public class ConditionalInsideLabelStyleBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.ConditionalInsideLabelStyle. - * * @generated */ private org.eclipse.sirius.components.view.diagram.ConditionalInsideLabelStyle conditionalInsideLabelStyle = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createConditionalInsideLabelStyle(); /** * Return instance org.eclipse.sirius.components.view.diagram.ConditionalInsideLabelStyle. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.ConditionalInsideLabelStyle getConditionalInsideLabelStyle() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.ConditionalInsideLabelStyle /** * Return instance org.eclipse.sirius.components.view.diagram.ConditionalInsideLabelStyle. - * * @generated */ public org.eclipse.sirius.components.view.diagram.ConditionalInsideLabelStyle build() { @@ -54,7 +51,6 @@ public ConditionalInsideLabelStyleBuilder condition(java.lang.String value) { this.getConditionalInsideLabelStyle().setCondition(value); return this; } - /** * Setter for Style. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalNodeStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalNodeStyleBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalNodeStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalNodeStyleBuilder.java index 1266d3b772..ec281a97f1 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalNodeStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalNodeStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for ConditionalNodeStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalOutsideLabelStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalOutsideLabelStyleBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalOutsideLabelStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalOutsideLabelStyleBuilder.java index 29de83381f..a4f51bb7f0 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalOutsideLabelStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ConditionalOutsideLabelStyleBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for ConditionalOutsideLabelStyleBuilder. @@ -22,14 +22,12 @@ public class ConditionalOutsideLabelStyleBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.ConditionalOutsideLabelStyle. - * * @generated */ private org.eclipse.sirius.components.view.diagram.ConditionalOutsideLabelStyle conditionalOutsideLabelStyle = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createConditionalOutsideLabelStyle(); /** * Return instance org.eclipse.sirius.components.view.diagram.ConditionalOutsideLabelStyle. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.ConditionalOutsideLabelStyle getConditionalOutsideLabelStyle() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.ConditionalOutsideLabelStyl /** * Return instance org.eclipse.sirius.components.view.diagram.ConditionalOutsideLabelStyle. - * * @generated */ public org.eclipse.sirius.components.view.diagram.ConditionalOutsideLabelStyle build() { @@ -54,7 +51,6 @@ public ConditionalOutsideLabelStyleBuilder condition(java.lang.String value) { this.getConditionalOutsideLabelStyle().setCondition(value); return this; } - /** * Setter for Style. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateViewBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/CreateViewBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateViewBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/CreateViewBuilder.java index b48ec47177..5c1cc1b113 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateViewBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/CreateViewBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for CreateViewBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DeleteToolBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DeleteToolBuilder.java index 0e4419e558..d424db11bc 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DeleteToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for DeleteToolBuilder. @@ -60,7 +60,6 @@ public DeleteToolBuilder preconditionExpression(java.lang.String value) { this.getDeleteTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteViewBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DeleteViewBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteViewBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DeleteViewBuilder.java index 4d4d20c29c..dba69c91b9 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteViewBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DeleteViewBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for DeleteViewBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramBuilders.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramBuilders.java similarity index 99% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramBuilders.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramBuilders.java index 0e23e02833..541ff05c3a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramBuilders.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramBuilders.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Use to instantiate a new builder. @@ -19,7 +19,6 @@ * @generated */ public class DiagramBuilders { - /** * Instantiate a DiagramDescriptionBuilder . * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramDescriptionBuilder.java index d9b2d3c144..b19c02ca49 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for DiagramDescriptionBuilder. @@ -22,14 +22,12 @@ public class DiagramDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.DiagramDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.DiagramDescription diagramDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createDiagramDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.DiagramDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.DiagramDescription getDiagramDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.DiagramDescription getDiagr /** * Return instance org.eclipse.sirius.components.view.diagram.DiagramDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.DiagramDescription build() { @@ -54,7 +51,6 @@ public DiagramDescriptionBuilder name(java.lang.String value) { this.getDiagramDescription().setName(value); return this; } - /** * Setter for DomainType. * @@ -64,7 +60,6 @@ public DiagramDescriptionBuilder domainType(java.lang.String value) { this.getDiagramDescription().setDomainType(value); return this; } - /** * Setter for PreconditionExpression. * @@ -74,7 +69,6 @@ public DiagramDescriptionBuilder preconditionExpression(java.lang.String value) this.getDiagramDescription().setPreconditionExpression(value); return this; } - /** * Setter for TitleExpression. * @@ -84,7 +78,6 @@ public DiagramDescriptionBuilder titleExpression(java.lang.String value) { this.getDiagramDescription().setTitleExpression(value); return this; } - /** * Setter for AutoLayout. * @@ -94,7 +87,6 @@ public DiagramDescriptionBuilder autoLayout(java.lang.Boolean value) { this.getDiagramDescription().setAutoLayout(value); return this; } - /** * Setter for Palette. * @@ -104,7 +96,6 @@ public DiagramDescriptionBuilder palette(org.eclipse.sirius.components.view.diag this.getDiagramDescription().setPalette(value); return this; } - /** * Setter for NodeDescriptions. * @@ -139,6 +130,5 @@ public DiagramDescriptionBuilder arrangeLayoutDirection(org.eclipse.sirius.compo return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramElementDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramElementDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramElementDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramElementDescriptionBuilder.java index d2d070052b..4c5a8eacf8 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramElementDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramElementDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.DiagramElementDescription. @@ -22,7 +22,6 @@ public abstract class DiagramElementDescriptionBuilder { /** * Builder for org.eclipse.sirius.components.view.diagram.DiagramElementDescription. - * * @generated */ protected abstract org.eclipse.sirius.components.view.diagram.DiagramElementDescription getDiagramElementDescription(); @@ -36,7 +35,6 @@ public DiagramElementDescriptionBuilder name(java.lang.String value) { this.getDiagramElementDescription().setName(value); return this; } - /** * Setter for DomainType. * @@ -46,7 +44,6 @@ public DiagramElementDescriptionBuilder domainType(java.lang.String value) { this.getDiagramElementDescription().setDomainType(value); return this; } - /** * Setter for SemanticCandidatesExpression. * @@ -56,7 +53,6 @@ public DiagramElementDescriptionBuilder semanticCandidatesExpression(java.lang.S this.getDiagramElementDescription().setSemanticCandidatesExpression(value); return this; } - /** * Setter for PreconditionExpression. * @@ -66,7 +62,6 @@ public DiagramElementDescriptionBuilder preconditionExpression(java.lang.String this.getDiagramElementDescription().setPreconditionExpression(value); return this; } - /** * Setter for SynchronizationPolicy. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramPaletteBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramPaletteBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramPaletteBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramPaletteBuilder.java index e2fc5608e5..4dc749dd46 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramPaletteBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramPaletteBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for DiagramPaletteBuilder. @@ -60,7 +60,6 @@ public DiagramPaletteBuilder dropNodeTool(org.eclipse.sirius.components.view.dia this.getDiagramPalette().setDropNodeTool(value); return this; } - /** * Setter for NodeTools. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramToolSectionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramToolSectionBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramToolSectionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramToolSectionBuilder.java index e9760bd5bf..b883d8de1a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramToolSectionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DiagramToolSectionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for DiagramToolSectionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DialogDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DialogDescriptionBuilder.java similarity index 93% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DialogDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DialogDescriptionBuilder.java index e42ef60833..4147cfcec4 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DialogDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DialogDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.DialogDescription. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropNodeToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DropNodeToolBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropNodeToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DropNodeToolBuilder.java index 48804b5fe9..43714cd4d0 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropNodeToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DropNodeToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for DropNodeToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DropToolBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DropToolBuilder.java index f692e0e3e2..7179bf9c3d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/DropToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for DropToolBuilder. @@ -60,7 +60,6 @@ public DropToolBuilder preconditionExpression(java.lang.String value) { this.getDropTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeDescriptionBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeDescriptionBuilder.java index 5a4417dcdc..7ef92e48be 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for EdgeDescriptionBuilder. @@ -22,14 +22,12 @@ public class EdgeDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.EdgeDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.EdgeDescription edgeDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createEdgeDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.EdgeDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.EdgeDescription getEdgeDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.EdgeDescription getEdgeDesc /** * Return instance org.eclipse.sirius.components.view.diagram.EdgeDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.EdgeDescription build() { @@ -54,7 +51,6 @@ public EdgeDescriptionBuilder name(java.lang.String value) { this.getEdgeDescription().setName(value); return this; } - /** * Setter for DomainType. * @@ -64,7 +60,6 @@ public EdgeDescriptionBuilder domainType(java.lang.String value) { this.getEdgeDescription().setDomainType(value); return this; } - /** * Setter for SemanticCandidatesExpression. * @@ -74,7 +69,6 @@ public EdgeDescriptionBuilder semanticCandidatesExpression(java.lang.String valu this.getEdgeDescription().setSemanticCandidatesExpression(value); return this; } - /** * Setter for PreconditionExpression. * @@ -84,7 +78,6 @@ public EdgeDescriptionBuilder preconditionExpression(java.lang.String value) { this.getEdgeDescription().setPreconditionExpression(value); return this; } - /** * Setter for SynchronizationPolicy. * @@ -94,7 +87,6 @@ public EdgeDescriptionBuilder synchronizationPolicy(org.eclipse.sirius.component this.getEdgeDescription().setSynchronizationPolicy(value); return this; } - /** * Setter for BeginLabelExpression. * @@ -104,7 +96,6 @@ public EdgeDescriptionBuilder beginLabelExpression(java.lang.String value) { this.getEdgeDescription().setBeginLabelExpression(value); return this; } - /** * Setter for CenterLabelExpression. * @@ -114,7 +105,6 @@ public EdgeDescriptionBuilder centerLabelExpression(java.lang.String value) { this.getEdgeDescription().setCenterLabelExpression(value); return this; } - /** * Setter for EndLabelExpression. * @@ -124,7 +114,6 @@ public EdgeDescriptionBuilder endLabelExpression(java.lang.String value) { this.getEdgeDescription().setEndLabelExpression(value); return this; } - /** * Setter for IsDomainBasedEdge. * @@ -134,7 +123,6 @@ public EdgeDescriptionBuilder isDomainBasedEdge(java.lang.Boolean value) { this.getEdgeDescription().setIsDomainBasedEdge(value); return this; } - /** * Setter for Palette. * @@ -144,7 +132,6 @@ public EdgeDescriptionBuilder palette(org.eclipse.sirius.components.view.diagram this.getEdgeDescription().setPalette(value); return this; } - /** * Setter for SourceNodeDescriptions. * @@ -178,7 +165,6 @@ public EdgeDescriptionBuilder sourceNodesExpression(java.lang.String value) { this.getEdgeDescription().setSourceNodesExpression(value); return this; } - /** * Setter for TargetNodesExpression. * @@ -188,7 +174,6 @@ public EdgeDescriptionBuilder targetNodesExpression(java.lang.String value) { this.getEdgeDescription().setTargetNodesExpression(value); return this; } - /** * Setter for Style. * @@ -198,7 +183,6 @@ public EdgeDescriptionBuilder style(org.eclipse.sirius.components.view.diagram.E this.getEdgeDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgePaletteBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgePaletteBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgePaletteBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgePaletteBuilder.java index 242bc68155..ea3a77a681 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgePaletteBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgePaletteBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for EdgePaletteBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeReconnectionToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeReconnectionToolBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeReconnectionToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeReconnectionToolBuilder.java index ff21c55526..148e276ed3 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeReconnectionToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeReconnectionToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.EdgeReconnectionTool. @@ -44,7 +44,6 @@ public EdgeReconnectionToolBuilder preconditionExpression(java.lang.String value this.getEdgeReconnectionTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeStyleBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeStyleBuilder.java index 8f8280e3ca..195326fbc8 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for EdgeStyleBuilder. @@ -105,7 +105,6 @@ public EdgeStyleBuilder borderColor(org.eclipse.sirius.components.view.UserColor this.getEdgeStyle().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -115,7 +114,6 @@ public EdgeStyleBuilder borderRadius(java.lang.Integer value) { this.getEdgeStyle().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -125,7 +123,6 @@ public EdgeStyleBuilder borderSize(java.lang.Integer value) { this.getEdgeStyle().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * @@ -135,7 +132,6 @@ public EdgeStyleBuilder borderLineStyle(org.eclipse.sirius.components.view.diagr this.getEdgeStyle().setBorderLineStyle(value); return this; } - /** * Setter for LineStyle. * @@ -181,7 +177,6 @@ public EdgeStyleBuilder showIcon(java.lang.Boolean value) { this.getEdgeStyle().setShowIcon(value); return this; } - /** * Setter for LabelIcon. * @@ -191,7 +186,6 @@ public EdgeStyleBuilder labelIcon(java.lang.String value) { this.getEdgeStyle().setLabelIcon(value); return this; } - /** * Setter for Background. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeToolBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeToolBuilder.java index 9cb35a5f45..896af5c42e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for EdgeToolBuilder. @@ -60,7 +60,6 @@ public EdgeToolBuilder preconditionExpression(java.lang.String value) { this.getEdgeTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * @@ -95,6 +94,5 @@ public EdgeToolBuilder iconURLsExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeToolSectionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeToolSectionBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeToolSectionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeToolSectionBuilder.java index 8173c420f9..1e32f01091 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EdgeToolSectionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/EdgeToolSectionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for EdgeToolSectionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FreeFormLayoutStrategyDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/FreeFormLayoutStrategyDescriptionBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FreeFormLayoutStrategyDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/FreeFormLayoutStrategyDescriptionBuilder.java index 3dca4a210b..89eb84a850 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FreeFormLayoutStrategyDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/FreeFormLayoutStrategyDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for FreeFormLayoutStrategyDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/IconLabelNodeStyleDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/IconLabelNodeStyleDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/IconLabelNodeStyleDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/IconLabelNodeStyleDescriptionBuilder.java index ce57936993..405e96ae5f 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/IconLabelNodeStyleDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/IconLabelNodeStyleDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for IconLabelNodeStyleDescriptionBuilder. @@ -22,14 +22,12 @@ public class IconLabelNodeStyleDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescription iconLabelNodeStyleDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createIconLabelNodeStyleDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescription getIconLabelNodeStyleDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescripti /** * Return instance org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescription build() { @@ -54,7 +51,6 @@ public IconLabelNodeStyleDescriptionBuilder borderColor(org.eclipse.sirius.compo this.getIconLabelNodeStyleDescription().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -64,7 +60,6 @@ public IconLabelNodeStyleDescriptionBuilder borderRadius(java.lang.Integer value this.getIconLabelNodeStyleDescription().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -74,7 +69,6 @@ public IconLabelNodeStyleDescriptionBuilder borderSize(java.lang.Integer value) this.getIconLabelNodeStyleDescription().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * @@ -84,7 +78,6 @@ public IconLabelNodeStyleDescriptionBuilder borderLineStyle(org.eclipse.sirius.c this.getIconLabelNodeStyleDescription().setBorderLineStyle(value); return this; } - /** * Setter for Background. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ImageNodeStyleDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ImageNodeStyleDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ImageNodeStyleDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ImageNodeStyleDescriptionBuilder.java index e7147a29b3..56537aff3e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ImageNodeStyleDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ImageNodeStyleDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for ImageNodeStyleDescriptionBuilder. @@ -22,14 +22,12 @@ public class ImageNodeStyleDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription imageNodeStyleDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createImageNodeStyleDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription getImageNodeStyleDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription g /** * Return instance org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription build() { @@ -54,7 +51,6 @@ public ImageNodeStyleDescriptionBuilder borderColor(org.eclipse.sirius.component this.getImageNodeStyleDescription().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -64,7 +60,6 @@ public ImageNodeStyleDescriptionBuilder borderRadius(java.lang.Integer value) { this.getImageNodeStyleDescription().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -74,7 +69,6 @@ public ImageNodeStyleDescriptionBuilder borderSize(java.lang.Integer value) { this.getImageNodeStyleDescription().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * @@ -84,7 +78,6 @@ public ImageNodeStyleDescriptionBuilder borderLineStyle(org.eclipse.sirius.compo this.getImageNodeStyleDescription().setBorderLineStyle(value); return this; } - /** * Setter for Shape. * @@ -94,7 +87,6 @@ public ImageNodeStyleDescriptionBuilder shape(java.lang.String value) { this.getImageNodeStyleDescription().setShape(value); return this; } - /** * Setter for PositionDependentRotation. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/InsideLabelDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/InsideLabelDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/InsideLabelDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/InsideLabelDescriptionBuilder.java index 7e0276bb82..528400d2e8 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/InsideLabelDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/InsideLabelDescriptionBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for InsideLabelDescriptionBuilder. @@ -22,14 +22,12 @@ public class InsideLabelDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.InsideLabelDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.InsideLabelDescription insideLabelDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createInsideLabelDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.InsideLabelDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.InsideLabelDescription getInsideLabelDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.InsideLabelDescription getI /** * Return instance org.eclipse.sirius.components.view.diagram.InsideLabelDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.InsideLabelDescription build() { @@ -54,7 +51,6 @@ public InsideLabelDescriptionBuilder labelExpression(java.lang.String value) { this.getInsideLabelDescription().setLabelExpression(value); return this; } - /** * Setter for OverflowStrategy. * @@ -64,7 +60,6 @@ public InsideLabelDescriptionBuilder overflowStrategy(org.eclipse.sirius.compone this.getInsideLabelDescription().setOverflowStrategy(value); return this; } - /** * Setter for TextAlign. * @@ -74,7 +69,6 @@ public InsideLabelDescriptionBuilder textAlign(org.eclipse.sirius.components.vie this.getInsideLabelDescription().setTextAlign(value); return this; } - /** * Setter for Position. * @@ -84,7 +78,6 @@ public InsideLabelDescriptionBuilder position(org.eclipse.sirius.components.view this.getInsideLabelDescription().setPosition(value); return this; } - /** * Setter for Style. * @@ -94,7 +87,6 @@ public InsideLabelDescriptionBuilder style(org.eclipse.sirius.components.view.di this.getInsideLabelDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/InsideLabelStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/InsideLabelStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/InsideLabelStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/InsideLabelStyleBuilder.java index 80887efbbd..88eea115c0 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/InsideLabelStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/InsideLabelStyleBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for InsideLabelStyleBuilder. @@ -22,14 +22,12 @@ public class InsideLabelStyleBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.InsideLabelStyle. - * * @generated */ private org.eclipse.sirius.components.view.diagram.InsideLabelStyle insideLabelStyle = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createInsideLabelStyle(); /** * Return instance org.eclipse.sirius.components.view.diagram.InsideLabelStyle. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.InsideLabelStyle getInsideLabelStyle() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.InsideLabelStyle getInsideL /** * Return instance org.eclipse.sirius.components.view.diagram.InsideLabelStyle. - * * @generated */ public org.eclipse.sirius.components.view.diagram.InsideLabelStyle build() { @@ -54,7 +51,6 @@ public InsideLabelStyleBuilder fontSize(java.lang.Integer value) { this.getInsideLabelStyle().setFontSize(value); return this; } - /** * Setter for Italic. * @@ -64,7 +60,6 @@ public InsideLabelStyleBuilder italic(java.lang.Boolean value) { this.getInsideLabelStyle().setItalic(value); return this; } - /** * Setter for Bold. * @@ -74,7 +69,6 @@ public InsideLabelStyleBuilder bold(java.lang.Boolean value) { this.getInsideLabelStyle().setBold(value); return this; } - /** * Setter for Underline. * @@ -84,7 +78,6 @@ public InsideLabelStyleBuilder underline(java.lang.Boolean value) { this.getInsideLabelStyle().setUnderline(value); return this; } - /** * Setter for StrikeThrough. * @@ -94,7 +87,6 @@ public InsideLabelStyleBuilder strikeThrough(java.lang.Boolean value) { this.getInsideLabelStyle().setStrikeThrough(value); return this; } - /** * Setter for BorderColor. * @@ -104,7 +96,6 @@ public InsideLabelStyleBuilder borderColor(org.eclipse.sirius.components.view.Us this.getInsideLabelStyle().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -114,7 +105,6 @@ public InsideLabelStyleBuilder borderRadius(java.lang.Integer value) { this.getInsideLabelStyle().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -124,7 +114,6 @@ public InsideLabelStyleBuilder borderSize(java.lang.Integer value) { this.getInsideLabelStyle().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * @@ -134,7 +123,6 @@ public InsideLabelStyleBuilder borderLineStyle(org.eclipse.sirius.components.vie this.getInsideLabelStyle().setBorderLineStyle(value); return this; } - /** * Setter for LabelColor. * @@ -144,7 +132,6 @@ public InsideLabelStyleBuilder labelColor(org.eclipse.sirius.components.view.Use this.getInsideLabelStyle().setLabelColor(value); return this; } - /** * Setter for Background. * @@ -154,7 +141,6 @@ public InsideLabelStyleBuilder background(org.eclipse.sirius.components.view.Use this.getInsideLabelStyle().setBackground(value); return this; } - /** * Setter for ShowIconExpression. * @@ -164,7 +150,6 @@ public InsideLabelStyleBuilder showIconExpression(java.lang.String value) { this.getInsideLabelStyle().setShowIconExpression(value); return this; } - /** * Setter for LabelIcon. * @@ -174,7 +159,6 @@ public InsideLabelStyleBuilder labelIcon(java.lang.String value) { this.getInsideLabelStyle().setLabelIcon(value); return this; } - /** * Setter for MaxWidthExpression. * @@ -194,7 +178,6 @@ public InsideLabelStyleBuilder withHeader(java.lang.Boolean value) { this.getInsideLabelStyle().setWithHeader(value); return this; } - /** * Setter for DisplayHeaderSeparator. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LabelDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LabelDescriptionBuilder.java new file mode 100644 index 0000000000..61b72d8e6d --- /dev/null +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LabelDescriptionBuilder.java @@ -0,0 +1,58 @@ +/******************************************************************************* + * 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 + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.components.view.builder.generated.diagram; + +/** + * Builder for org.eclipse.sirius.components.view.diagram.LabelDescription. + * + * @author BuilderGenerator + * @generated + */ +public abstract class LabelDescriptionBuilder { + + /** + * Builder for org.eclipse.sirius.components.view.diagram.LabelDescription. + * @generated + */ + protected abstract org.eclipse.sirius.components.view.diagram.LabelDescription getLabelDescription(); + + /** + * Setter for LabelExpression. + * + * @generated + */ + public LabelDescriptionBuilder labelExpression(java.lang.String value) { + this.getLabelDescription().setLabelExpression(value); + return this; + } + /** + * Setter for OverflowStrategy. + * + * @generated + */ + public LabelDescriptionBuilder overflowStrategy(org.eclipse.sirius.components.view.diagram.LabelOverflowStrategy value) { + this.getLabelDescription().setOverflowStrategy(value); + return this; + } + /** + * Setter for TextAlign. + * + * @generated + */ + public LabelDescriptionBuilder textAlign(org.eclipse.sirius.components.view.diagram.LabelTextAlign value) { + this.getLabelDescription().setTextAlign(value); + return this; + } + +} + diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelEditToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LabelEditToolBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelEditToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LabelEditToolBuilder.java index 56ae9d6a0a..ae351cfe22 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelEditToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LabelEditToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for LabelEditToolBuilder. @@ -60,7 +60,6 @@ public LabelEditToolBuilder preconditionExpression(java.lang.String value) { this.getLabelEditTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LayoutStrategyDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LayoutStrategyDescriptionBuilder.java similarity index 90% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LayoutStrategyDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LayoutStrategyDescriptionBuilder.java index 35d99ee2f9..932e908d45 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LayoutStrategyDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/LayoutStrategyDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.LayoutStrategyDescription. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListLayoutStrategyDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ListLayoutStrategyDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListLayoutStrategyDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ListLayoutStrategyDescriptionBuilder.java index adcf87c8ea..4a335dc7bf 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListLayoutStrategyDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ListLayoutStrategyDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for ListLayoutStrategyDescriptionBuilder. @@ -22,14 +22,12 @@ public class ListLayoutStrategyDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription listLayoutStrategyDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createListLayoutStrategyDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription getListLayoutStrategyDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescripti /** * Return instance org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription build() { @@ -54,7 +51,6 @@ public ListLayoutStrategyDescriptionBuilder areChildNodesDraggableExpression(jav this.getListLayoutStrategyDescription().setAreChildNodesDraggableExpression(value); return this; } - /** * Setter for TopGapExpression. * @@ -64,7 +60,6 @@ public ListLayoutStrategyDescriptionBuilder topGapExpression(java.lang.String va this.getListLayoutStrategyDescription().setTopGapExpression(value); return this; } - /** * Setter for BottomGapExpression. * @@ -74,7 +69,6 @@ public ListLayoutStrategyDescriptionBuilder bottomGapExpression(java.lang.String this.getListLayoutStrategyDescription().setBottomGapExpression(value); return this; } - /** * Setter for GrowableNodes. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeDescriptionBuilder.java index 059e715bbd..60a9cc1e36 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for NodeDescriptionBuilder. @@ -22,14 +22,12 @@ public class NodeDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.NodeDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.NodeDescription nodeDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createNodeDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.NodeDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.NodeDescription getNodeDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.NodeDescription getNodeDesc /** * Return instance org.eclipse.sirius.components.view.diagram.NodeDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.NodeDescription build() { @@ -54,7 +51,6 @@ public NodeDescriptionBuilder name(java.lang.String value) { this.getNodeDescription().setName(value); return this; } - /** * Setter for DomainType. * @@ -64,7 +60,6 @@ public NodeDescriptionBuilder domainType(java.lang.String value) { this.getNodeDescription().setDomainType(value); return this; } - /** * Setter for SemanticCandidatesExpression. * @@ -74,7 +69,6 @@ public NodeDescriptionBuilder semanticCandidatesExpression(java.lang.String valu this.getNodeDescription().setSemanticCandidatesExpression(value); return this; } - /** * Setter for PreconditionExpression. * @@ -84,7 +78,6 @@ public NodeDescriptionBuilder preconditionExpression(java.lang.String value) { this.getNodeDescription().setPreconditionExpression(value); return this; } - /** * Setter for SynchronizationPolicy. * @@ -94,8 +87,6 @@ public NodeDescriptionBuilder synchronizationPolicy(org.eclipse.sirius.component this.getNodeDescription().setSynchronizationPolicy(value); return this; } - - /** * Setter for Collapsible. * @@ -105,7 +96,6 @@ public NodeDescriptionBuilder collapsible(java.lang.Boolean value) { this.getNodeDescription().setCollapsible(value); return this; } - /** * Setter for Palette. * @@ -115,7 +105,6 @@ public NodeDescriptionBuilder palette(org.eclipse.sirius.components.view.diagram this.getNodeDescription().setPalette(value); return this; } - /** * Setter for ChildrenLayoutStrategy. * @@ -125,7 +114,6 @@ public NodeDescriptionBuilder childrenLayoutStrategy(org.eclipse.sirius.componen this.getNodeDescription().setChildrenLayoutStrategy(value); return this; } - /** * Setter for Style. * @@ -135,7 +123,6 @@ public NodeDescriptionBuilder style(org.eclipse.sirius.components.view.diagram.N this.getNodeDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -196,7 +183,6 @@ public NodeDescriptionBuilder reusedBorderNodeDescriptions(org.eclipse.sirius.co return this; } - /** * Setter for UserResizable. * @@ -206,7 +192,6 @@ public NodeDescriptionBuilder userResizable(org.eclipse.sirius.components.view.d this.getNodeDescription().setUserResizable(value); return this; } - /** * Setter for DefaultWidthExpression. * @@ -216,7 +201,6 @@ public NodeDescriptionBuilder defaultWidthExpression(java.lang.String value) { this.getNodeDescription().setDefaultWidthExpression(value); return this; } - /** * Setter for DefaultHeightExpression. * @@ -226,13 +210,6 @@ public NodeDescriptionBuilder defaultHeightExpression(java.lang.String value) { this.getNodeDescription().setDefaultHeightExpression(value); return this; } - - /** - * Setter for MinWidthExpression. - * - * @generated - */ - /** * Setter for KeepAspectRatio. * @@ -242,7 +219,6 @@ public NodeDescriptionBuilder keepAspectRatio(java.lang.Boolean value) { this.getNodeDescription().setKeepAspectRatio(value); return this; } - /** * Setter for IsCollapsedByDefaultExpression. * @@ -252,7 +228,6 @@ public NodeDescriptionBuilder isCollapsedByDefaultExpression(java.lang.String va this.getNodeDescription().setIsCollapsedByDefaultExpression(value); return this; } - /** * Setter for InsideLabel. * @@ -262,7 +237,6 @@ public NodeDescriptionBuilder insideLabel(org.eclipse.sirius.components.view.dia this.getNodeDescription().setInsideLabel(value); return this; } - /** * Setter for OutsideLabels. * @@ -284,7 +258,6 @@ public NodeDescriptionBuilder isHiddenByDefaultExpression(java.lang.String value this.getNodeDescription().setIsHiddenByDefaultExpression(value); return this; } - /** * Setter for IsFadedByDefaultExpression. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeLabelStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeLabelStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeLabelStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeLabelStyleBuilder.java index c9a8dcaf7c..a546a3064c 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeLabelStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeLabelStyleBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.NodeLabelStyle. @@ -22,7 +22,6 @@ public abstract class NodeLabelStyleBuilder { /** * Builder for org.eclipse.sirius.components.view.diagram.NodeLabelStyle. - * * @generated */ protected abstract org.eclipse.sirius.components.view.diagram.NodeLabelStyle getNodeLabelStyle(); @@ -36,7 +35,6 @@ public NodeLabelStyleBuilder fontSize(java.lang.Integer value) { this.getNodeLabelStyle().setFontSize(value); return this; } - /** * Setter for Italic. * @@ -46,7 +44,6 @@ public NodeLabelStyleBuilder italic(java.lang.Boolean value) { this.getNodeLabelStyle().setItalic(value); return this; } - /** * Setter for Bold. * @@ -56,7 +53,6 @@ public NodeLabelStyleBuilder bold(java.lang.Boolean value) { this.getNodeLabelStyle().setBold(value); return this; } - /** * Setter for Underline. * @@ -66,7 +62,6 @@ public NodeLabelStyleBuilder underline(java.lang.Boolean value) { this.getNodeLabelStyle().setUnderline(value); return this; } - /** * Setter for StrikeThrough. * @@ -76,7 +71,6 @@ public NodeLabelStyleBuilder strikeThrough(java.lang.Boolean value) { this.getNodeLabelStyle().setStrikeThrough(value); return this; } - /** * Setter for BorderColor. * @@ -86,7 +80,6 @@ public NodeLabelStyleBuilder borderColor(org.eclipse.sirius.components.view.User this.getNodeLabelStyle().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -96,7 +89,6 @@ public NodeLabelStyleBuilder borderRadius(java.lang.Integer value) { this.getNodeLabelStyle().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -106,7 +98,6 @@ public NodeLabelStyleBuilder borderSize(java.lang.Integer value) { this.getNodeLabelStyle().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * @@ -116,7 +107,6 @@ public NodeLabelStyleBuilder borderLineStyle(org.eclipse.sirius.components.view. this.getNodeLabelStyle().setBorderLineStyle(value); return this; } - /** * Setter for LabelColor. * @@ -126,7 +116,6 @@ public NodeLabelStyleBuilder labelColor(org.eclipse.sirius.components.view.UserC this.getNodeLabelStyle().setLabelColor(value); return this; } - /** * Setter for Background. * @@ -136,7 +125,6 @@ public NodeLabelStyleBuilder background(org.eclipse.sirius.components.view.UserC this.getNodeLabelStyle().setBackground(value); return this; } - /** * Setter for ShowIconExpression. * @@ -146,7 +134,6 @@ public NodeLabelStyleBuilder showIconExpression(java.lang.String value) { this.getNodeLabelStyle().setShowIconExpression(value); return this; } - /** * Setter for LabelIcon. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodePaletteBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodePaletteBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodePaletteBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodePaletteBuilder.java index 7c630cb888..02b15b05cc 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodePaletteBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodePaletteBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for NodePaletteBuilder. @@ -69,7 +69,6 @@ public NodePaletteBuilder dropNodeTool(org.eclipse.sirius.components.view.diagra this.getNodePalette().setDropNodeTool(value); return this; } - /** * Setter for NodeTools. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeStyleDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeStyleDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeStyleDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeStyleDescriptionBuilder.java index e9ff786eab..c41946177e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeStyleDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeStyleDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.NodeStyleDescription. @@ -22,7 +22,6 @@ public abstract class NodeStyleDescriptionBuilder { /** * Builder for org.eclipse.sirius.components.view.diagram.NodeStyleDescription. - * * @generated */ protected abstract org.eclipse.sirius.components.view.diagram.NodeStyleDescription getNodeStyleDescription(); @@ -36,7 +35,6 @@ public NodeStyleDescriptionBuilder borderColor(org.eclipse.sirius.components.vie this.getNodeStyleDescription().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -46,7 +44,6 @@ public NodeStyleDescriptionBuilder borderRadius(java.lang.Integer value) { this.getNodeStyleDescription().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -56,7 +53,6 @@ public NodeStyleDescriptionBuilder borderSize(java.lang.Integer value) { this.getNodeStyleDescription().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeToolBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeToolBuilder.java index 466a7e1309..618d43d150 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeToolBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for NodeToolBuilder. @@ -60,7 +60,6 @@ public NodeToolBuilder preconditionExpression(java.lang.String value) { this.getNodeTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * @@ -82,7 +81,6 @@ public NodeToolBuilder dialogDescription(org.eclipse.sirius.components.view.diag this.getNodeTool().setDialogDescription(value); return this; } - /** * Setter for IconURLsExpression. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolSectionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeToolSectionBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolSectionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeToolSectionBuilder.java index 1df0e5d2a2..c8bc038638 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolSectionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/NodeToolSectionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for NodeToolSectionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OutsideLabelDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/OutsideLabelDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OutsideLabelDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/OutsideLabelDescriptionBuilder.java index 4b734e7320..8342d66c8e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OutsideLabelDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/OutsideLabelDescriptionBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for OutsideLabelDescriptionBuilder. @@ -22,14 +22,12 @@ public class OutsideLabelDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.OutsideLabelDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.OutsideLabelDescription outsideLabelDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createOutsideLabelDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.OutsideLabelDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.OutsideLabelDescription getOutsideLabelDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.OutsideLabelDescription get /** * Return instance org.eclipse.sirius.components.view.diagram.OutsideLabelDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.OutsideLabelDescription build() { @@ -54,7 +51,6 @@ public OutsideLabelDescriptionBuilder labelExpression(java.lang.String value) { this.getOutsideLabelDescription().setLabelExpression(value); return this; } - /** * Setter for OverflowStrategy. * @@ -64,7 +60,6 @@ public OutsideLabelDescriptionBuilder overflowStrategy(org.eclipse.sirius.compon this.getOutsideLabelDescription().setOverflowStrategy(value); return this; } - /** * Setter for TextAlign. * @@ -74,7 +69,6 @@ public OutsideLabelDescriptionBuilder textAlign(org.eclipse.sirius.components.vi this.getOutsideLabelDescription().setTextAlign(value); return this; } - /** * Setter for Position. * @@ -84,7 +78,6 @@ public OutsideLabelDescriptionBuilder position(org.eclipse.sirius.components.vie this.getOutsideLabelDescription().setPosition(value); return this; } - /** * Setter for Style. * @@ -94,7 +87,6 @@ public OutsideLabelDescriptionBuilder style(org.eclipse.sirius.components.view.d this.getOutsideLabelDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OutsideLabelStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/OutsideLabelStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OutsideLabelStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/OutsideLabelStyleBuilder.java index 4244eaefe4..000bf8f220 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OutsideLabelStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/OutsideLabelStyleBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for OutsideLabelStyleBuilder. @@ -22,14 +22,12 @@ public class OutsideLabelStyleBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.OutsideLabelStyle. - * * @generated */ private org.eclipse.sirius.components.view.diagram.OutsideLabelStyle outsideLabelStyle = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createOutsideLabelStyle(); /** * Return instance org.eclipse.sirius.components.view.diagram.OutsideLabelStyle. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.OutsideLabelStyle getOutsideLabelStyle() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.OutsideLabelStyle getOutsid /** * Return instance org.eclipse.sirius.components.view.diagram.OutsideLabelStyle. - * * @generated */ public org.eclipse.sirius.components.view.diagram.OutsideLabelStyle build() { @@ -54,7 +51,6 @@ public OutsideLabelStyleBuilder fontSize(java.lang.Integer value) { this.getOutsideLabelStyle().setFontSize(value); return this; } - /** * Setter for Italic. * @@ -64,7 +60,6 @@ public OutsideLabelStyleBuilder italic(java.lang.Boolean value) { this.getOutsideLabelStyle().setItalic(value); return this; } - /** * Setter for Bold. * @@ -74,7 +69,6 @@ public OutsideLabelStyleBuilder bold(java.lang.Boolean value) { this.getOutsideLabelStyle().setBold(value); return this; } - /** * Setter for Underline. * @@ -84,7 +78,6 @@ public OutsideLabelStyleBuilder underline(java.lang.Boolean value) { this.getOutsideLabelStyle().setUnderline(value); return this; } - /** * Setter for StrikeThrough. * @@ -94,7 +87,6 @@ public OutsideLabelStyleBuilder strikeThrough(java.lang.Boolean value) { this.getOutsideLabelStyle().setStrikeThrough(value); return this; } - /** * Setter for BorderColor. * @@ -104,7 +96,6 @@ public OutsideLabelStyleBuilder borderColor(org.eclipse.sirius.components.view.U this.getOutsideLabelStyle().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -114,7 +105,6 @@ public OutsideLabelStyleBuilder borderRadius(java.lang.Integer value) { this.getOutsideLabelStyle().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -124,7 +114,6 @@ public OutsideLabelStyleBuilder borderSize(java.lang.Integer value) { this.getOutsideLabelStyle().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * @@ -134,7 +123,6 @@ public OutsideLabelStyleBuilder borderLineStyle(org.eclipse.sirius.components.vi this.getOutsideLabelStyle().setBorderLineStyle(value); return this; } - /** * Setter for LabelColor. * @@ -144,7 +132,6 @@ public OutsideLabelStyleBuilder labelColor(org.eclipse.sirius.components.view.Us this.getOutsideLabelStyle().setLabelColor(value); return this; } - /** * Setter for Background. * @@ -154,7 +141,6 @@ public OutsideLabelStyleBuilder background(org.eclipse.sirius.components.view.Us this.getOutsideLabelStyle().setBackground(value); return this; } - /** * Setter for ShowIconExpression. * @@ -164,7 +150,6 @@ public OutsideLabelStyleBuilder showIconExpression(java.lang.String value) { this.getOutsideLabelStyle().setShowIconExpression(value); return this; } - /** * Setter for LabelIcon. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RectangularNodeStyleDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/RectangularNodeStyleDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RectangularNodeStyleDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/RectangularNodeStyleDescriptionBuilder.java index 532a368e39..2e27debfe2 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RectangularNodeStyleDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/RectangularNodeStyleDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for RectangularNodeStyleDescriptionBuilder. @@ -22,14 +22,12 @@ public class RectangularNodeStyleDescriptionBuilder { /** * Create instance org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription. - * * @generated */ private org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription rectangularNodeStyleDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createRectangularNodeStyleDescription(); /** * Return instance org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription. - * * @generated */ protected org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription getRectangularNodeStyleDescription() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescrip /** * Return instance org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription. - * * @generated */ public org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription build() { @@ -54,7 +51,6 @@ public RectangularNodeStyleDescriptionBuilder borderColor(org.eclipse.sirius.com this.getRectangularNodeStyleDescription().setBorderColor(value); return this; } - /** * Setter for BorderRadius. * @@ -64,7 +60,6 @@ public RectangularNodeStyleDescriptionBuilder borderRadius(java.lang.Integer val this.getRectangularNodeStyleDescription().setBorderRadius(value); return this; } - /** * Setter for BorderSize. * @@ -74,7 +69,6 @@ public RectangularNodeStyleDescriptionBuilder borderSize(java.lang.Integer value this.getRectangularNodeStyleDescription().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * @@ -84,7 +78,6 @@ public RectangularNodeStyleDescriptionBuilder borderLineStyle(org.eclipse.sirius this.getRectangularNodeStyleDescription().setBorderLineStyle(value); return this; } - /** * Setter for Background. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDialogDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/SelectionDialogDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDialogDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/SelectionDialogDescriptionBuilder.java index 35de1b11d0..0ebef2bcd2 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDialogDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/SelectionDialogDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for SelectionDialogDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SourceEdgeEndReconnectionToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/SourceEdgeEndReconnectionToolBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SourceEdgeEndReconnectionToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/SourceEdgeEndReconnectionToolBuilder.java index 389e27c603..bfd461c92b 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SourceEdgeEndReconnectionToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/SourceEdgeEndReconnectionToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for SourceEdgeEndReconnectionToolBuilder. @@ -60,7 +60,6 @@ public SourceEdgeEndReconnectionToolBuilder preconditionExpression(java.lang.Str this.getSourceEdgeEndReconnectionTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/StyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/StyleBuilder.java similarity index 91% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/StyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/StyleBuilder.java index 397a1f55d8..4c93f29949 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/StyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/StyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.Style. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TargetEdgeEndReconnectionToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/TargetEdgeEndReconnectionToolBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TargetEdgeEndReconnectionToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/TargetEdgeEndReconnectionToolBuilder.java index 8fbbfc3f9e..e7007c90aa 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TargetEdgeEndReconnectionToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/TargetEdgeEndReconnectionToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for TargetEdgeEndReconnectionToolBuilder. @@ -60,7 +60,6 @@ public TargetEdgeEndReconnectionToolBuilder preconditionExpression(java.lang.Str this.getTargetEdgeEndReconnectionTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ToolBuilder.java similarity index 93% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ToolBuilder.java index d4e7b3d64c..0d135daeef 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ToolBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.Tool. @@ -44,7 +44,6 @@ public ToolBuilder preconditionExpression(java.lang.String value) { this.getTool().setPreconditionExpression(value); return this; } - /** * Setter for Body. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ToolSectionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ToolSectionBuilder.java similarity index 91% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ToolSectionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ToolSectionBuilder.java index 4c728bfaea..f41eee524a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ToolSectionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/diagram/ToolSectionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.diagram; /** * Builder for org.eclipse.sirius.components.view.diagram.ToolSection. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BarChartDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/BarChartDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BarChartDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/BarChartDescriptionBuilder.java index 595584b682..950c143943 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BarChartDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/BarChartDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for BarChartDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BarChartDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/BarChartDescriptionStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BarChartDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/BarChartDescriptionStyleBuilder.java index 3b330c1b9c..ce58a7f68e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/BarChartDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/BarChartDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for BarChartDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ButtonDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ButtonDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ButtonDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ButtonDescriptionBuilder.java index 4d1bd26856..f4d0807602 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ButtonDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ButtonDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ButtonDescriptionBuilder. @@ -108,7 +108,6 @@ public ButtonDescriptionBuilder style(org.eclipse.sirius.components.view.form.Bu this.getButtonDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -131,6 +130,5 @@ public ButtonDescriptionBuilder isEnabledExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ButtonDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ButtonDescriptionStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ButtonDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ButtonDescriptionStyleBuilder.java index dcbce78fcc..a3a7deb221 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ButtonDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ButtonDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ButtonDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CheckboxDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/CheckboxDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CheckboxDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/CheckboxDescriptionBuilder.java index d418722a6f..d3f64a5e3d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CheckboxDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/CheckboxDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for CheckboxDescriptionBuilder. @@ -99,7 +99,6 @@ public CheckboxDescriptionBuilder style(org.eclipse.sirius.components.view.form. this.getCheckboxDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -122,6 +121,5 @@ public CheckboxDescriptionBuilder isEnabledExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CheckboxDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/CheckboxDescriptionStyleBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CheckboxDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/CheckboxDescriptionStyleBuilder.java index 07790a5149..a748ef366f 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CheckboxDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/CheckboxDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for CheckboxDescriptionStyleBuilder. @@ -51,7 +51,6 @@ public CheckboxDescriptionStyleBuilder color(org.eclipse.sirius.components.view. this.getCheckboxDescriptionStyle().setColor(value); return this; } - /** * Setter for LabelPlacement. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalBarChartDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalBarChartDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalBarChartDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalBarChartDescriptionStyleBuilder.java index b6b2e7ecfe..843ccf55ad 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalBarChartDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalBarChartDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalBarChartDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalButtonDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalButtonDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalButtonDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalButtonDescriptionStyleBuilder.java index 157d5a8c8a..ce7ae13663 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalButtonDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalButtonDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalButtonDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalCheckboxDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalCheckboxDescriptionStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalCheckboxDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalCheckboxDescriptionStyleBuilder.java index ef0a271e5b..1f6f2ad43d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalCheckboxDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalCheckboxDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalCheckboxDescriptionStyleBuilder. @@ -60,7 +60,6 @@ public ConditionalCheckboxDescriptionStyleBuilder color(org.eclipse.sirius.compo this.getConditionalCheckboxDescriptionStyle().setColor(value); return this; } - /** * Setter for LabelPlacement. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalContainerBorderStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalContainerBorderStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalContainerBorderStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalContainerBorderStyleBuilder.java index f70bacdaa4..6758e8ebdc 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalContainerBorderStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalContainerBorderStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalContainerBorderStyleBuilder. @@ -22,14 +22,12 @@ public class ConditionalContainerBorderStyleBuilder { /** * Create instance org.eclipse.sirius.components.view.form.ConditionalContainerBorderStyle. - * * @generated */ private org.eclipse.sirius.components.view.form.ConditionalContainerBorderStyle conditionalContainerBorderStyle = org.eclipse.sirius.components.view.form.FormFactory.eINSTANCE.createConditionalContainerBorderStyle(); /** * Return instance org.eclipse.sirius.components.view.form.ConditionalContainerBorderStyle. - * * @generated */ protected org.eclipse.sirius.components.view.form.ConditionalContainerBorderStyle getConditionalContainerBorderStyle() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.form.ConditionalContainerBorderStyl /** * Return instance org.eclipse.sirius.components.view.form.ConditionalContainerBorderStyle. - * * @generated */ public org.eclipse.sirius.components.view.form.ConditionalContainerBorderStyle build() { @@ -81,7 +78,6 @@ public ConditionalContainerBorderStyleBuilder borderSize(java.lang.Integer value this.getConditionalContainerBorderStyle().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDateTimeDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalDateTimeDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDateTimeDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalDateTimeDescriptionStyleBuilder.java index 4b355dac79..4983436c6c 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalDateTimeDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalDateTimeDescriptionStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalDateTimeDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalLabelDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalLabelDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalLabelDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalLabelDescriptionStyleBuilder.java index 423f2f8bbd..8551375bc1 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalLabelDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalLabelDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalLabelDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalLinkDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalLinkDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalLinkDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalLinkDescriptionStyleBuilder.java index 6ee5f65d5e..0e48b79ce1 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalLinkDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalLinkDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalLinkDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalListDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalListDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalListDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalListDescriptionStyleBuilder.java index bf896dfed6..8c94031701 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalListDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalListDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalListDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalMultiSelectDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalMultiSelectDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalMultiSelectDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalMultiSelectDescriptionStyleBuilder.java index 78eabc8c97..ce89de736f 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalMultiSelectDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalMultiSelectDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalMultiSelectDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalPieChartDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalPieChartDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalPieChartDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalPieChartDescriptionStyleBuilder.java index 46d0168fca..dba1990c8d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalPieChartDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalPieChartDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalPieChartDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalRadioDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalRadioDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalRadioDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalRadioDescriptionStyleBuilder.java index d7badfd6b4..e0a1ece526 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalRadioDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalRadioDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalRadioDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalSelectDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalSelectDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalSelectDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalSelectDescriptionStyleBuilder.java index c6b227f48e..6d49a6ea0a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalSelectDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalSelectDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalSelectDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalTextareaDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalTextareaDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalTextareaDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalTextareaDescriptionStyleBuilder.java index 00e62ffb44..2671b7564f 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalTextareaDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalTextareaDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalTextareaDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalTextfieldDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalTextfieldDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalTextfieldDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalTextfieldDescriptionStyleBuilder.java index b846697354..ea0dcb8e93 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalTextfieldDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ConditionalTextfieldDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ConditionalTextfieldDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ContainerBorderStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ContainerBorderStyleBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ContainerBorderStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ContainerBorderStyleBuilder.java index c8f9c251ec..ce166eb70d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ContainerBorderStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ContainerBorderStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ContainerBorderStyleBuilder. @@ -22,14 +22,12 @@ public class ContainerBorderStyleBuilder { /** * Create instance org.eclipse.sirius.components.view.form.ContainerBorderStyle. - * * @generated */ private org.eclipse.sirius.components.view.form.ContainerBorderStyle containerBorderStyle = org.eclipse.sirius.components.view.form.FormFactory.eINSTANCE.createContainerBorderStyle(); /** * Return instance org.eclipse.sirius.components.view.form.ContainerBorderStyle. - * * @generated */ protected org.eclipse.sirius.components.view.form.ContainerBorderStyle getContainerBorderStyle() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.form.ContainerBorderStyle getContai /** * Return instance org.eclipse.sirius.components.view.form.ContainerBorderStyle. - * * @generated */ public org.eclipse.sirius.components.view.form.ContainerBorderStyle build() { @@ -72,7 +69,6 @@ public ContainerBorderStyleBuilder borderSize(java.lang.Integer value) { this.getContainerBorderStyle().setBorderSize(value); return this; } - /** * Setter for BorderLineStyle. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DateTimeDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/DateTimeDescriptionBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DateTimeDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/DateTimeDescriptionBuilder.java index 8b03a127cb..1363dcf4c1 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DateTimeDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/DateTimeDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for DateTimeDescriptionBuilder. @@ -108,7 +108,6 @@ public DateTimeDescriptionBuilder style(org.eclipse.sirius.components.view.form. this.getDateTimeDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DateTimeDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/DateTimeDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DateTimeDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/DateTimeDescriptionStyleBuilder.java index 6fb72b4628..87ba22d8f7 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DateTimeDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/DateTimeDescriptionStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for DateTimeDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FlexboxContainerDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FlexboxContainerDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FlexboxContainerDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FlexboxContainerDescriptionBuilder.java index ffbf2aad84..23a4aa74c2 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FlexboxContainerDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FlexboxContainerDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for FlexboxContainerDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormBuilders.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormBuilders.java similarity index 99% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormBuilders.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormBuilders.java index 2409b41e4a..a5bb2d4c33 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormBuilders.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormBuilders.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Use to instantiate a new builder. @@ -89,6 +89,16 @@ public CheckboxDescriptionBuilder newCheckboxDescription() { return new CheckboxDescriptionBuilder(); } + /** + * Instantiate a DateTimeDescriptionBuilder . + * + * @author BuilderGenerator + * @generated + */ + public DateTimeDescriptionBuilder newDateTimeDescription() { + return new DateTimeDescriptionBuilder(); + } + /** * Instantiate a FlexboxContainerDescriptionBuilder . * @@ -149,36 +159,6 @@ public MultiSelectDescriptionBuilder newMultiSelectDescription() { return new MultiSelectDescriptionBuilder(); } - /** - * Instantiate a TreeDescriptionBuilder . - * - * @author BuilderGenerator - * @generated - */ - public TreeDescriptionBuilder newTreeDescription() { - return new TreeDescriptionBuilder(); - } - - /** - * Instantiate a DateTimeDescriptionBuilder . - * - * @author BuilderGenerator - * @generated - */ - public DateTimeDescriptionBuilder newDateTimeDescription() { - return new DateTimeDescriptionBuilder(); - } - - /** - * Instantiate a SliderDescriptionBuilder . - * - * @author BuilderGenerator - * @generated - */ - public SliderDescriptionBuilder newSliderDescription() { - return new SliderDescriptionBuilder(); - } - /** * Instantiate a PieChartDescriptionBuilder . * @@ -249,6 +229,26 @@ public TextfieldDescriptionBuilder newTextfieldDescription() { return new TextfieldDescriptionBuilder(); } + /** + * Instantiate a TreeDescriptionBuilder . + * + * @author BuilderGenerator + * @generated + */ + public TreeDescriptionBuilder newTreeDescription() { + return new TreeDescriptionBuilder(); + } + + /** + * Instantiate a SliderDescriptionBuilder . + * + * @author BuilderGenerator + * @generated + */ + public SliderDescriptionBuilder newSliderDescription() { + return new SliderDescriptionBuilder(); + } + /** * Instantiate a BarChartDescriptionStyleBuilder . * @@ -309,6 +309,26 @@ public ConditionalCheckboxDescriptionStyleBuilder newConditionalCheckboxDescript return new ConditionalCheckboxDescriptionStyleBuilder(); } + /** + * Instantiate a DateTimeDescriptionStyleBuilder . + * + * @author BuilderGenerator + * @generated + */ + public DateTimeDescriptionStyleBuilder newDateTimeDescriptionStyle() { + return new DateTimeDescriptionStyleBuilder(); + } + + /** + * Instantiate a ConditionalDateTimeDescriptionStyleBuilder . + * + * @author BuilderGenerator + * @generated + */ + public ConditionalDateTimeDescriptionStyleBuilder newConditionalDateTimeDescriptionStyle() { + return new ConditionalDateTimeDescriptionStyleBuilder(); + } + /** * Instantiate a LabelDescriptionStyleBuilder . * @@ -489,26 +509,6 @@ public ConditionalTextfieldDescriptionStyleBuilder newConditionalTextfieldDescri return new ConditionalTextfieldDescriptionStyleBuilder(); } - /** - * Instantiate a DateTimeDescriptionStyleBuilder . - * - * @author BuilderGenerator - * @generated - */ - public DateTimeDescriptionStyleBuilder newDateTimeDescriptionStyle() { - return new DateTimeDescriptionStyleBuilder(); - } - - /** - * Instantiate a ConditionalDateTimeDescriptionStyleBuilder . - * - * @author BuilderGenerator - * @generated - */ - public ConditionalDateTimeDescriptionStyleBuilder newConditionalDateTimeDescriptionStyle() { - return new ConditionalDateTimeDescriptionStyleBuilder(); - } - /** * Instantiate a ContainerBorderStyleBuilder . * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormDescriptionBuilder.java index f33ed6da47..ce43e55c31 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for FormDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementDescriptionBuilder.java similarity index 91% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementDescriptionBuilder.java index 14b86e8a0c..0695b24e6b 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for org.eclipse.sirius.components.view.form.FormElementDescription. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementForBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementForBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementForBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementForBuilder.java index 972c227a9d..700a8979db 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementForBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementForBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for FormElementForBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementIfBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementIfBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementIfBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementIfBuilder.java index 8556f7a6f0..85bb7a55a9 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormElementIfBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormElementIfBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for FormElementIfBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormVariableBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormVariableBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormVariableBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormVariableBuilder.java index ca22b8f0f7..5f63c23ff4 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FormVariableBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/FormVariableBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for FormVariableBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GroupDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/GroupDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GroupDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/GroupDescriptionBuilder.java index 0931676ee5..37059340f6 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GroupDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/GroupDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for GroupDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ImageDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ImageDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ImageDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ImageDescriptionBuilder.java index bc0de79cac..94e81c96ab 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ImageDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ImageDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ImageDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LabelDescriptionBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LabelDescriptionBuilder.java index 2503acc032..03b723c321 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LabelDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for LabelDescriptionBuilder. @@ -27,8 +27,7 @@ public class LabelDescriptionBuilder { private org.eclipse.sirius.components.view.form.LabelDescription labelDescription = org.eclipse.sirius.components.view.form.FormFactory.eINSTANCE.createLabelDescription(); /** - * Return instance org.eclipse.sirius.components.view.diagram.LabelDescription. - * + * Return instance org.eclipse.sirius.components.view.form.LabelDescription. * @generated */ protected org.eclipse.sirius.components.view.form.LabelDescription getLabelDescription() { @@ -52,7 +51,6 @@ public LabelDescriptionBuilder name(java.lang.String value) { this.getLabelDescription().setName(value); return this; } - /** * Setter for LabelExpression. * @@ -62,7 +60,6 @@ public LabelDescriptionBuilder labelExpression(java.lang.String value) { this.getLabelDescription().setLabelExpression(value); return this; } - /** * Setter for HelpExpression. * @@ -72,7 +69,6 @@ public LabelDescriptionBuilder helpExpression(java.lang.String value) { this.getLabelDescription().setHelpExpression(value); return this; } - /** * Setter for ValueExpression. * @@ -82,7 +78,6 @@ public LabelDescriptionBuilder valueExpression(java.lang.String value) { this.getLabelDescription().setValueExpression(value); return this; } - /** * Setter for Style. * @@ -92,7 +87,6 @@ public LabelDescriptionBuilder style(org.eclipse.sirius.components.view.form.Lab this.getLabelDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -105,5 +99,6 @@ public LabelDescriptionBuilder conditionalStyles(org.eclipse.sirius.components.v return this; } + } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LabelDescriptionStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LabelDescriptionStyleBuilder.java index 692abf00ac..b983153286 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LabelDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for LabelDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LinkDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LinkDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LinkDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LinkDescriptionBuilder.java index b7ae6b6308..bb5598cb0f 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LinkDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LinkDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for LinkDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LinkDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LinkDescriptionStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LinkDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LinkDescriptionStyleBuilder.java index 85cec317e9..64f87973af 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LinkDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/LinkDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for LinkDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ListDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ListDescriptionBuilder.java index f6b86cdea5..09f644eea0 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ListDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ListDescriptionBuilder. @@ -117,7 +117,6 @@ public ListDescriptionBuilder style(org.eclipse.sirius.components.view.form.List this.getListDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -140,6 +139,5 @@ public ListDescriptionBuilder isEnabledExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ListDescriptionStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ListDescriptionStyleBuilder.java index 08ad43ccd5..3449b356ca 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ListDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/ListDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for ListDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/MultiSelectDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/MultiSelectDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/MultiSelectDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/MultiSelectDescriptionBuilder.java index dcd1373a36..6a752952b7 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/MultiSelectDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/MultiSelectDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for MultiSelectDescriptionBuilder. @@ -117,7 +117,6 @@ public MultiSelectDescriptionBuilder style(org.eclipse.sirius.components.view.fo this.getMultiSelectDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -140,6 +139,5 @@ public MultiSelectDescriptionBuilder isEnabledExpression(java.lang.String value) return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/MultiSelectDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/MultiSelectDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/MultiSelectDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/MultiSelectDescriptionStyleBuilder.java index 9d2c557ad6..d3661d8a55 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/MultiSelectDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/MultiSelectDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for MultiSelectDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PageDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PageDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PageDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PageDescriptionBuilder.java index 1ed52a653b..26536de38a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PageDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PageDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for PageDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PieChartDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PieChartDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PieChartDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PieChartDescriptionBuilder.java index b68d6c5a26..ffff06da8c 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PieChartDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PieChartDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for PieChartDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PieChartDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PieChartDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PieChartDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PieChartDescriptionStyleBuilder.java index 9e2cc5dd96..1c5dacebb1 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/PieChartDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/PieChartDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for PieChartDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RadioDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RadioDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RadioDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RadioDescriptionBuilder.java index 5ffa3ce662..2777f12c6e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RadioDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RadioDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for RadioDescriptionBuilder. @@ -117,7 +117,6 @@ public RadioDescriptionBuilder style(org.eclipse.sirius.components.view.form.Rad this.getRadioDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -140,6 +139,5 @@ public RadioDescriptionBuilder isEnabledExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RadioDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RadioDescriptionStyleBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RadioDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RadioDescriptionStyleBuilder.java index 459be0f231..df9d7812c5 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RadioDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RadioDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for RadioDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RichTextDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RichTextDescriptionBuilder.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RichTextDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RichTextDescriptionBuilder.java index 0d1361106e..2cc25279e7 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RichTextDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/RichTextDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for RichTextDescriptionBuilder. @@ -78,7 +78,6 @@ public RichTextDescriptionBuilder valueExpression(java.lang.String value) { this.getRichTextDescription().setValueExpression(value); return this; } - /** * Setter for Body. * @@ -101,6 +100,5 @@ public RichTextDescriptionBuilder isEnabledExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SelectDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SelectDescriptionBuilder.java index c466f10e63..d32f63d667 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SelectDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for SelectDescriptionBuilder. @@ -117,7 +117,6 @@ public SelectDescriptionBuilder style(org.eclipse.sirius.components.view.form.Se this.getSelectDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -140,6 +139,5 @@ public SelectDescriptionBuilder isEnabledExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SelectDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SelectDescriptionStyleBuilder.java index 2ee3451e89..02960a1213 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SelectDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for SelectDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SliderDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SliderDescriptionBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SliderDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SliderDescriptionBuilder.java index cb5efc43ab..53ce586d1f 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SliderDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SliderDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for SliderDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SplitButtonDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SplitButtonDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SplitButtonDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SplitButtonDescriptionBuilder.java index e9b97b82dc..25ebf3bcd7 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SplitButtonDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/SplitButtonDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for SplitButtonDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextAreaDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextAreaDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextAreaDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextAreaDescriptionBuilder.java index 962f353f89..4c4e8cb2b8 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextAreaDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextAreaDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for TextAreaDescriptionBuilder. @@ -99,7 +99,6 @@ public TextAreaDescriptionBuilder style(org.eclipse.sirius.components.view.form. this.getTextAreaDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -122,6 +121,5 @@ public TextAreaDescriptionBuilder isEnabledExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextareaDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextareaDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextareaDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextareaDescriptionStyleBuilder.java index 8deb7934ad..ed4927dd84 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextareaDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextareaDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for TextareaDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextfieldDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextfieldDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextfieldDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextfieldDescriptionBuilder.java index 14e11fc18c..35ad7dbeee 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextfieldDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextfieldDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for TextfieldDescriptionBuilder. @@ -99,7 +99,6 @@ public TextfieldDescriptionBuilder style(org.eclipse.sirius.components.view.form this.getTextfieldDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * @@ -122,6 +121,5 @@ public TextfieldDescriptionBuilder isEnabledExpression(java.lang.String value) { return this; } - } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextfieldDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextfieldDescriptionStyleBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextfieldDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextfieldDescriptionStyleBuilder.java index e5e75a353e..aa867061d5 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TextfieldDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TextfieldDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for TextfieldDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TreeDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TreeDescriptionBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TreeDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TreeDescriptionBuilder.java index a5c6ae5c2c..17153c42f5 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TreeDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/TreeDescriptionBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for TreeDescriptionBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/WidgetDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/WidgetDescriptionBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/WidgetDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/WidgetDescriptionBuilder.java index dfbbf32c7e..fb924c892a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/WidgetDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/WidgetDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for org.eclipse.sirius.components.view.form.WidgetDescription. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/WidgetDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/WidgetDescriptionStyleBuilder.java similarity index 90% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/WidgetDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/WidgetDescriptionStyleBuilder.java index aa43209b2f..da9f9eadb1 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/WidgetDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/form/WidgetDescriptionStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.form; /** * Builder for org.eclipse.sirius.components.view.form.WidgetDescriptionStyle. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateTaskDependencyToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/CreateTaskDependencyToolBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateTaskDependencyToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/CreateTaskDependencyToolBuilder.java index 730a018b39..67a1d7010d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateTaskDependencyToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/CreateTaskDependencyToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for CreateTaskDependencyToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateTaskToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/CreateTaskToolBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateTaskToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/CreateTaskToolBuilder.java index 9dc0b21d0b..40cb0e365c 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateTaskToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/CreateTaskToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for CreateTaskToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteTaskDependencyToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DeleteTaskDependencyToolBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteTaskDependencyToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DeleteTaskDependencyToolBuilder.java index ae8d3e6edd..0dd41032bb 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteTaskDependencyToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DeleteTaskDependencyToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for DeleteTaskDependencyToolBuilder. @@ -22,14 +22,12 @@ public class DeleteTaskDependencyToolBuilder { /** * Create instance org.eclipse.sirius.components.view.gantt.DeleteTaskDependencyTool. - * * @generated */ private org.eclipse.sirius.components.view.gantt.DeleteTaskDependencyTool deleteTaskDependencyTool = org.eclipse.sirius.components.view.gantt.GanttFactory.eINSTANCE.createDeleteTaskDependencyTool(); /** * Return instance org.eclipse.sirius.components.view.gantt.DeleteTaskDependencyTool. - * * @generated */ protected org.eclipse.sirius.components.view.gantt.DeleteTaskDependencyTool getDeleteTaskDependencyTool() { @@ -38,7 +36,6 @@ protected org.eclipse.sirius.components.view.gantt.DeleteTaskDependencyTool getD /** * Return instance org.eclipse.sirius.components.view.gantt.DeleteTaskDependencyTool. - * * @generated */ public org.eclipse.sirius.components.view.gantt.DeleteTaskDependencyTool build() { @@ -54,7 +51,6 @@ public DeleteTaskDependencyToolBuilder name(java.lang.String value) { this.getDeleteTaskDependencyTool().setName(value); return this; } - /** * Setter for Body. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteTaskToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DeleteTaskToolBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteTaskToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DeleteTaskToolBuilder.java index 2aff6f21c8..d514308295 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteTaskToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DeleteTaskToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for DeleteTaskToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropTaskToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DropTaskToolBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropTaskToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DropTaskToolBuilder.java index e84bd94304..3ba774ee3b 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DropTaskToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/DropTaskToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for DropTaskToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditTaskToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/EditTaskToolBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditTaskToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/EditTaskToolBuilder.java index f970d0bd4b..3ee79d191c 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/EditTaskToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/EditTaskToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for EditTaskToolBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GanttBuilders.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/GanttBuilders.java similarity index 96% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GanttBuilders.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/GanttBuilders.java index 54f819bf36..1a20b30033 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GanttBuilders.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/GanttBuilders.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Use to instantiate a new builder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GanttDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/GanttDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GanttDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/GanttDescriptionBuilder.java index 6775a8a995..acd2c6ab0a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/GanttDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/GanttDescriptionBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for GanttDescriptionBuilder. @@ -117,7 +117,6 @@ public GanttDescriptionBuilder deleteTool(org.eclipse.sirius.components.view.gan this.getGanttDescription().setDeleteTool(value); return this; } - /** * Setter for DropTool. * @@ -127,7 +126,6 @@ public GanttDescriptionBuilder dropTool(org.eclipse.sirius.components.view.gantt this.getGanttDescription().setDropTool(value); return this; } - /** * Setter for CreateTaskDependencyTool. * @@ -137,7 +135,6 @@ public GanttDescriptionBuilder createTaskDependencyTool(org.eclipse.sirius.compo this.getGanttDescription().setCreateTaskDependencyTool(value); return this; } - /** * Setter for DeleteTaskDependencyTool. * @@ -147,7 +144,6 @@ public GanttDescriptionBuilder deleteTaskDependencyTool(org.eclipse.sirius.compo this.getGanttDescription().setDeleteTaskDependencyTool(value); return this; } - /** * Setter for DateRoundingExpression. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TaskDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/TaskDescriptionBuilder.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TaskDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/TaskDescriptionBuilder.java index f372b26979..6cf501aa9a 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TaskDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/TaskDescriptionBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for TaskDescriptionBuilder. @@ -51,7 +51,6 @@ public TaskDescriptionBuilder name(java.lang.String value) { this.getTaskDescription().setName(value); return this; } - /** * Setter for DomainType. * @@ -61,7 +60,6 @@ public TaskDescriptionBuilder domainType(java.lang.String value) { this.getTaskDescription().setDomainType(value); return this; } - /** * Setter for SemanticCandidatesExpression. * @@ -125,7 +123,6 @@ public TaskDescriptionBuilder computeStartEndDynamicallyExpression(java.lang.Str this.getTaskDescription().setComputeStartEndDynamicallyExpression(value); return this; } - /** * Setter for TaskDependenciesExpression. * @@ -135,7 +132,6 @@ public TaskDescriptionBuilder taskDependenciesExpression(java.lang.String value) this.getTaskDescription().setTaskDependenciesExpression(value); return this; } - /** * Setter for SubTaskElementDescriptions. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TaskToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/TaskToolBuilder.java similarity index 93% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TaskToolBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/TaskToolBuilder.java index d9555d8e9f..907dcd43fd 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/TaskToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/gantt/TaskToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.gantt; /** * Builder for org.eclipse.sirius.components.view.gantt.TaskTool. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalReferenceWidgetDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ConditionalReferenceWidgetDescriptionStyleBuilder.java similarity index 98% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalReferenceWidgetDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ConditionalReferenceWidgetDescriptionStyleBuilder.java index ee05589af7..bb3301f0e3 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalReferenceWidgetDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ConditionalReferenceWidgetDescriptionStyleBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.reference; /** * Builder for ConditionalReferenceWidgetDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceBuilders.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceBuilders.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceBuilders.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceBuilders.java index 89fc437324..cdff6027cc 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceBuilders.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceBuilders.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.reference; /** * Use to instantiate a new builder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceWidgetDescriptionBuilder.java similarity index 91% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceWidgetDescriptionBuilder.java index 7e51a29e71..622db6f80e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceWidgetDescriptionBuilder.java @@ -10,12 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; - -import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; -import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; -import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; -import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; +package org.eclipse.sirius.components.view.builder.generated.reference; /** * Builder for ReferenceWidgetDescriptionBuilder. @@ -122,7 +117,6 @@ public ReferenceWidgetDescriptionBuilder style(org.eclipse.sirius.components.vie this.getReferenceWidgetDescription().setStyle(value); return this; } - /** * Setter for ConditionalStyles. * diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceWidgetDescriptionStyleBuilder.java similarity index 93% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceWidgetDescriptionStyleBuilder.java index 37d845f322..322f3e32de 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/reference/ReferenceWidgetDescriptionStyleBuilder.java @@ -10,10 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; - -import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; -import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; +package org.eclipse.sirius.components.view.builder.generated.reference; /** * Builder for ReferenceWidgetDescriptionStyleBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ChangeContextBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ChangeContextBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ChangeContextBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ChangeContextBuilder.java index 814fb6de59..8e9639c024 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ChangeContextBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ChangeContextBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for ChangeContextBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ColorPaletteBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ColorPaletteBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ColorPaletteBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ColorPaletteBuilder.java index 1c69a6c680..49f7a2dc82 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ColorPaletteBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ColorPaletteBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for ColorPaletteBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ConditionalBuilder.java similarity index 91% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ConditionalBuilder.java index c8687c10ed..1b364b8fa5 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ConditionalBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for org.eclipse.sirius.components.view.Conditional. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateInstanceBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/CreateInstanceBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateInstanceBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/CreateInstanceBuilder.java index 2d6e65acdb..a8c6ff8f07 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/CreateInstanceBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/CreateInstanceBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for CreateInstanceBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteElementBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/DeleteElementBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteElementBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/DeleteElementBuilder.java index 9ae8301747..e37cd824b2 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DeleteElementBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/DeleteElementBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for DeleteElementBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FixedColorBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/FixedColorBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FixedColorBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/FixedColorBuilder.java index d9b57973f4..62b89c3da0 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/FixedColorBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/FixedColorBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for FixedColorBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ForBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ForBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ForBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ForBuilder.java index 30f7b4f214..b7a1fd091b 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ForBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ForBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for ForBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/IfBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/IfBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/IfBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/IfBuilder.java index 8621033164..6102a1daef 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/IfBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/IfBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for IfBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/LabelStyleBuilder.java similarity index 94% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelStyleBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/LabelStyleBuilder.java index ae91bc392d..aa5d8aa5ee 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LabelStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/LabelStyleBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for org.eclipse.sirius.components.view.LabelStyle. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LetBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/LetBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LetBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/LetBuilder.java index 20b4a2340e..d8825d676b 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/LetBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/LetBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for LetBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OperationBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/OperationBuilder.java similarity index 92% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OperationBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/OperationBuilder.java index bae55acfe5..ae1d694cb4 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/OperationBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/OperationBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for org.eclipse.sirius.components.view.Operation. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RepresentationDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/RepresentationDescriptionBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RepresentationDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/RepresentationDescriptionBuilder.java index f038991d32..a0ad8bebdc 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/RepresentationDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/RepresentationDescriptionBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for org.eclipse.sirius.components.view.RepresentationDescription. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SetValueBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/SetValueBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SetValueBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/SetValueBuilder.java index 1dfd6cccfb..cdbcfa37b5 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SetValueBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/SetValueBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for SetValueBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/UnsetValueBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/UnsetValueBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/UnsetValueBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/UnsetValueBuilder.java index beee1429c9..377ac3ef5d 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/UnsetValueBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/UnsetValueBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for UnsetValueBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/UserColorBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/UserColorBuilder.java similarity index 91% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/UserColorBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/UserColorBuilder.java index 57d38a2202..357dc3c0ad 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/UserColorBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/UserColorBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for org.eclipse.sirius.components.view.UserColor. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ViewBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ViewBuilder.java similarity index 95% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ViewBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ViewBuilder.java index 4a876dcf78..97d0840c64 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ViewBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ViewBuilder.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 @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Builder for ViewBuilder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ViewBuilders.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ViewBuilders.java similarity index 97% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ViewBuilders.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ViewBuilders.java index 9b18039ab1..d0514dc4d1 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ViewBuilders.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/view/ViewBuilders.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.view.builder.generated; +package org.eclipse.sirius.components.view.builder.generated.view; /** * Use to instantiate a new builder. diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generator/BuilderGenerator.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generator/BuilderGenerator.java index 434c99397b..bd6e76cbd6 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generator/BuilderGenerator.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generator/BuilderGenerator.java @@ -47,6 +47,7 @@ * @author cbrun */ public class BuilderGenerator { + private static final String CLASSBODY = "#classbody"; private static final String PACKAGE = "#package"; @@ -138,7 +139,7 @@ private StringBuilder getFactoryClassBody(GenPackage pak) { public #builderClassName new#className() { return new #builderClassName(); } - + """.replace(BUILDER_CLASSNAME, this.builderClasssName(clazz)) .replace("#className", clazz.getName())); } @@ -162,7 +163,7 @@ private StringBuilder getFactory(GenPackage pak, String builderFactoryName, Stri * Obeo - initial API and implementation *******************************************************************************/ package #package; - + /** * Use to instantiate a new builder. * @@ -188,7 +189,7 @@ private StringBuilder getBody(GenClass clazz) { * @generated */ private #eObjType #eObjNameLowerCase = #packageFactory.create#eObjName(); - + /** * Return instance #eObjType. * @generated @@ -196,7 +197,7 @@ private StringBuilder getBody(GenClass clazz) { protected #eObjType get#eObjName() { return this.#eObjNameLowerCase; } - + /** * Return instance #eObjType. * @generated @@ -204,7 +205,7 @@ private StringBuilder getBody(GenClass clazz) { public #eObjType build() { return this.get#eObjName(); } - + """.replace("#packageFactory", clazz.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor()) .replace("#eObjType", clazz.getQualifiedInterfaceName()) .replace("#eObjNameLowerCase", clazz.uncapPrefixedName(clazz.getSafeUncapName())) @@ -244,7 +245,7 @@ private StringBuilder getBody(GenClass clazz) { } return this; } - + """.replace(BUILDER_CLASSNAME, this.builderClasssName(clazz)) .replace("#paramType", feat.getListItemType(clazz)) .replace("#accessor", feat.getAccessorName()) @@ -275,7 +276,7 @@ private StringBuilder getBuilder(GenPackage pak, GenClass clazz, StringBuilder b * Obeo - initial API and implementation *******************************************************************************/ package #package; - + /** * Builder for #qualifiedType. * @@ -283,16 +284,16 @@ private StringBuilder getBuilder(GenPackage pak, GenClass clazz, StringBuilder b * @generated */ public abstract class #builderClassName { - + /** * Builder for #qualifiedType. * @generated */ protected abstract #qualifiedType get#eObjName(); - + #classbody } - + """.replace(BUILDER_CLASSNAME, this.builderClasssName(clazz)) .replace("#qualifiedType", this.qualifiedNameFromGenClass(clazz)) .replace(CLASSBODY, body) @@ -313,7 +314,7 @@ public abstract class #builderClassName { * Obeo - initial API and implementation *******************************************************************************/ package #package; - + /** * Builder for #builderClassName. * @@ -321,10 +322,10 @@ public abstract class #builderClassName { * @generated */ public class #builderClassName { - + #classbody } - + """.replace(BUILDER_CLASSNAME, this.builderClasssName(clazz)) .replace("#qualifiedType", clazz.getQualifiedInterfaceName()) .replace(CLASSBODY, body) @@ -352,7 +353,7 @@ public void doGen(GenModel model) throws IOException { StringBuilder factory = this.getFactory(pak, builderFactoryName, factoryClassBody); String factFileName = builderFactoryName + ".java"; - this.generateOrMerge(jControlModel, this.outputDirectory, factFileName, factory.toString()); + this.generateOrMerge(jControlModel, this.outputDirectory + "/" + model.getModelName().toLowerCase(), factFileName, factory.toString()); for (GenClass clazz : pak.getGenClasses()) { StringBuilder builderBody = this.getBody(clazz); @@ -360,7 +361,7 @@ public void doGen(GenModel model) throws IOException { String fileName = this.builderClasssName(clazz) + ".java"; String contentToGenerate = builder.toString(); - this.generateOrMerge(jControlModel, this.outputDirectory, fileName, contentToGenerate); + this.generateOrMerge(jControlModel, this.outputDirectory + "/" + model.getModelName().toLowerCase(), fileName, contentToGenerate); } } } @@ -370,7 +371,7 @@ private String qualifiedNameFromGenClass(GenClass clazz) { } private String getPackageDeclaration(GenPackage pak) { - return this.basePackage; + return this.basePackage + "." + pak.getGenModel().getModelName().toLowerCase(); } private String getDocumentation(GenFeature feat) { diff --git a/packages/view/backend/sirius-components-view-builder/src/test/java/org/eclipse/sirius/components/view/builder/tests/architecture/ViewBuilderTests.java b/packages/view/backend/sirius-components-view-builder/src/test/java/org/eclipse/sirius/components/view/builder/tests/architecture/ViewBuilderTests.java index ca0ba7055e..cd5328d0fb 100644 --- a/packages/view/backend/sirius-components-view-builder/src/test/java/org/eclipse/sirius/components/view/builder/tests/architecture/ViewBuilderTests.java +++ b/packages/view/backend/sirius-components-view-builder/src/test/java/org/eclipse/sirius/components/view/builder/tests/architecture/ViewBuilderTests.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.sirius.components.view.builder.tests.architecture; -import org.eclipse.sirius.components.view.builder.generated.ReferenceWidgetDescriptionBuilder; -import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; - import static org.assertj.core.api.Assertions.assertThat; + +import org.eclipse.sirius.components.view.builder.generated.reference.ReferenceWidgetDescriptionBuilder; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; import org.junit.jupiter.api.Test; /** @@ -24,6 +24,7 @@ * @author mcharfadi */ public class ViewBuilderTests { + @Test void testBuildWidgetDescription() { var widgetReference = new ReferenceWidgetDescriptionBuilder()