From ceb4b5684285560681a3f53e02fa6daa4c9ddff3 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Mon, 5 Jul 2021 10:35:36 +0200 Subject: [PATCH 1/6] [557] Avoid NPEs with no domainType is set Bug; https://github.com/eclipse-sirius/sirius-components/issues/557 Signed-off-by: Pierre-Charles David --- .../org/eclipse/sirius/web/emf/view/ViewConverter.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/sirius-web-emf/src/main/java/org/eclipse/sirius/web/emf/view/ViewConverter.java b/backend/sirius-web-emf/src/main/java/org/eclipse/sirius/web/emf/view/ViewConverter.java index 984a35e161..98dde1f1a8 100644 --- a/backend/sirius-web-emf/src/main/java/org/eclipse/sirius/web/emf/view/ViewConverter.java +++ b/backend/sirius-web-emf/src/main/java/org/eclipse/sirius/web/emf/view/ViewConverter.java @@ -186,7 +186,12 @@ private String computeDiagramLabel(org.eclipse.sirius.web.view.DiagramDescriptio } private boolean canCreateDiagram(VariableManager variableManager, String domainType) { - return variableManager.get(IRepresentationDescription.CLASS, EClass.class).map(EcoreUtil::create).filter(new DomainClassPredicate(domainType)).isPresent(); + // @formatter:off + return variableManager.get(IRepresentationDescription.CLASS, EClass.class) + .map(EcoreUtil::create) + .filter(new DomainClassPredicate(Optional.ofNullable(domainType).orElse(""))) //$NON-NLS-1$ + .isPresent(); + // @formatter:on } private NodeDescription convert(org.eclipse.sirius.web.view.NodeDescription viewNodeDescription, AQLInterpreter interpreter) { @@ -341,7 +346,7 @@ private Function> getSemanticElementsProvider(org. return candidates.stream() .filter(EObject.class::isInstance) .map(EObject.class::cast) - .filter(candidate -> new DomainClassPredicate(elementDescription.getDomainType()).test(candidate)) + .filter(candidate -> new DomainClassPredicate(Optional.ofNullable(elementDescription.getDomainType()).orElse("")).test(candidate)) //$NON-NLS-1$ .collect(Collectors.toList()); // @formatter:on }; From 67e72abd517aaeb76827c006f260eaa9e0158c86 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Tue, 6 Jul 2021 10:46:02 +0200 Subject: [PATCH 2/6] [557] Fix potential NPE in case of invalid DomainType Bug: https://github.com/eclipse-sirius/sirius-components/issues/557 Signed-off-by: Pierre-Charles David --- .../web/emf/view/CanonicalBehaviors.java | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/backend/sirius-web-emf/src/main/java/org/eclipse/sirius/web/emf/view/CanonicalBehaviors.java b/backend/sirius-web-emf/src/main/java/org/eclipse/sirius/web/emf/view/CanonicalBehaviors.java index 0221266502..2fb4238020 100644 --- a/backend/sirius-web-emf/src/main/java/org/eclipse/sirius/web/emf/view/CanonicalBehaviors.java +++ b/backend/sirius-web-emf/src/main/java/org/eclipse/sirius/web/emf/view/CanonicalBehaviors.java @@ -45,8 +45,7 @@ public CanonicalBehaviors(IObjectService objectService, IEditService editService public Status createNewNode(org.eclipse.sirius.web.view.NodeDescription nodeDescription, VariableManager variableManager) { EObject self = variableManager.get(VariableManager.SELF, EObject.class).orElse(null); String domainType = nodeDescription.getDomainType(); - EObject instance = this.createSemanticInstance(self, domainType); - this.addInParent(self, instance); + this.createSemanticInstance(self, domainType).ifPresent(instance -> this.addInParent(self, instance)); return Status.OK; } @@ -54,10 +53,11 @@ public Status createNewEdge(VariableManager variableManager, EdgeDescription edg EObject semanticSource = variableManager.get(org.eclipse.sirius.web.diagrams.description.EdgeDescription.SEMANTIC_EDGE_SOURCE, EObject.class).get(); EObject semanticTarget = variableManager.get(org.eclipse.sirius.web.diagrams.description.EdgeDescription.SEMANTIC_EDGE_TARGET, EObject.class).get(); if (edgeDescription.isIsDomainBasedEdge()) { - EObject instance = this.createSemanticInstance(semanticSource, edgeDescription.getDomainType()); - this.addInParent(semanticSource, instance); - this.addReferenceTo(instance, semanticSource); - this.addReferenceTo(instance, semanticTarget); + this.createSemanticInstance(semanticSource, edgeDescription.getDomainType()).ifPresent(instance -> { + this.addInParent(semanticSource, instance); + this.addReferenceTo(instance, semanticSource); + this.addReferenceTo(instance, semanticTarget); + }); } else { this.addReferenceTo(semanticSource, semanticTarget); } @@ -83,24 +83,28 @@ private Optional self(VariableManager variableManager) { return variableManager.get(VariableManager.SELF, Object.class); } - private EObject createSemanticInstance(EObject self, String domainType) { + private Optional createSemanticInstance(EObject self, String domainType) { EPackage ePackage = self.eClass().getEPackage(); // @formatter:off - EClass klass = ePackage - .getEClassifiers().stream() - .filter(classifier -> classifier instanceof EClass && Objects.equals(domainType, classifier.getName())) - .map(EClass.class::cast) - .findFirst() - .get(); + var optionalKlass = ePackage + .getEClassifiers().stream() + .filter(classifier -> classifier instanceof EClass && Objects.equals(domainType, classifier.getName())) + .map(EClass.class::cast) + .findFirst(); // @formatter:on - EObject instance = ePackage.getEFactoryInstance().create(klass); - // @formatter:off - // Assume the first stringly-typed attribute represents the object's name/label - klass.getEAllAttributes().stream().filter(attr -> Objects.equals(String.class, attr.getEType().getInstanceClass())).findFirst().ifPresent(labelAttribute -> { - instance.eSet(labelAttribute, "New " + klass.getName()); //$NON-NLS-1$ - }); - // @formatter:on - return instance; + if (optionalKlass.isPresent()) { + EClass klass = optionalKlass.get(); + EObject instance = ePackage.getEFactoryInstance().create(klass); + // @formatter:off + // Assume the first stringly-typed attribute represents the object's name/label + klass.getEAllAttributes().stream().filter(attr -> Objects.equals(String.class, attr.getEType().getInstanceClass())).findFirst().ifPresent(labelAttribute -> { + instance.eSet(labelAttribute, "New " + klass.getName()); //$NON-NLS-1$ + }); + // @formatter:on + return Optional.of(instance); + } else { + return Optional.empty(); + } } private void addInParent(EObject parent, EObject instance) { From 8e2357c91aa61609b8575296fcf34c4caf38b3c5 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Tue, 6 Jul 2021 10:40:48 +0200 Subject: [PATCH 3/6] [557] Improve default values for domain elements - Set a non-null default for domain's URI. - Make sure entities, attributes and relations created from the explorer have some valid initial state. Bug: https://github.com/eclipse-sirius/sirius-components/issues/557 Signed-off-by: Pierre-Charles David --- .../domain/provider/DomainItemProvider.java | 7 +++++-- .../domain/provider/EntityItemProvider.java | 21 +++++++++++++++---- .../org/eclipse/sirius/web/domain/Domain.java | 5 +++-- .../sirius/web/domain/impl/DomainImpl.java | 2 +- .../web/domain/impl/DomainPackageImpl.java | 4 ++-- .../src/main/resources/model/domain.ecore | 3 ++- 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/backend/sirius-web-domain-edit/src/main/java/org/eclipse/sirius/web/domain/provider/DomainItemProvider.java b/backend/sirius-web-domain-edit/src/main/java/org/eclipse/sirius/web/domain/provider/DomainItemProvider.java index 6465fb77ae..ed11fbe804 100644 --- a/backend/sirius-web-domain-edit/src/main/java/org/eclipse/sirius/web/domain/provider/DomainItemProvider.java +++ b/backend/sirius-web-domain-edit/src/main/java/org/eclipse/sirius/web/domain/provider/DomainItemProvider.java @@ -25,6 +25,7 @@ import org.eclipse.sirius.web.domain.Domain; import org.eclipse.sirius.web.domain.DomainFactory; import org.eclipse.sirius.web.domain.DomainPackage; +import org.eclipse.sirius.web.domain.Entity; /** * This is the item provider adapter for a {@link org.eclipse.sirius.web.domain.Domain} object. @@ -157,13 +158,15 @@ public void notifyChanged(Notification notification) { * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created * under this object. * - * @generated + * @generated NOT */ @Override protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(this.createChildParameter(DomainPackage.Literals.DOMAIN__TYPES, DomainFactory.eINSTANCE.createEntity())); + Entity newEntity = DomainFactory.eINSTANCE.createEntity(); + newEntity.setName("NewEntity"); //$NON-NLS-1$ + newChildDescriptors.add(this.createChildParameter(DomainPackage.Literals.DOMAIN__TYPES, newEntity)); } } diff --git a/backend/sirius-web-domain-edit/src/main/java/org/eclipse/sirius/web/domain/provider/EntityItemProvider.java b/backend/sirius-web-domain-edit/src/main/java/org/eclipse/sirius/web/domain/provider/EntityItemProvider.java index a1e705cc8a..83ce28a4a8 100644 --- a/backend/sirius-web-domain-edit/src/main/java/org/eclipse/sirius/web/domain/provider/EntityItemProvider.java +++ b/backend/sirius-web-domain-edit/src/main/java/org/eclipse/sirius/web/domain/provider/EntityItemProvider.java @@ -22,9 +22,12 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; +import org.eclipse.sirius.web.domain.Attribute; +import org.eclipse.sirius.web.domain.DataType; import org.eclipse.sirius.web.domain.DomainFactory; import org.eclipse.sirius.web.domain.DomainPackage; import org.eclipse.sirius.web.domain.Entity; +import org.eclipse.sirius.web.domain.Relation; /** * This is the item provider adapter for a {@link org.eclipse.sirius.web.domain.Entity} object. @@ -172,15 +175,25 @@ public void notifyChanged(Notification notification) { * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created * under this object. * - * @generated + * @generated NOT */ @Override protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(this.createChildParameter(DomainPackage.Literals.ENTITY__ATTRIBUTES, DomainFactory.eINSTANCE.createAttribute())); - - newChildDescriptors.add(this.createChildParameter(DomainPackage.Literals.ENTITY__RELATIONS, DomainFactory.eINSTANCE.createRelation())); + Attribute newAttribute = DomainFactory.eINSTANCE.createAttribute(); + newAttribute.setName("newString"); //$NON-NLS-1$ + newAttribute.setType(DataType.STRING); + newChildDescriptors.add(this.createChildParameter(DomainPackage.Literals.ENTITY__ATTRIBUTES, newAttribute)); + + Relation newRelation = DomainFactory.eINSTANCE.createRelation(); + newRelation.setName("relation"); //$NON-NLS-1$ + newRelation.setMany(true); + if (object instanceof Entity) { + Entity owner = (Entity) object; + newRelation.setTargetType(owner); + } + newChildDescriptors.add(this.createChildParameter(DomainPackage.Literals.ENTITY__RELATIONS, newRelation)); } } diff --git a/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/Domain.java b/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/Domain.java index 0b6e886e86..6fdb9edff5 100644 --- a/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/Domain.java +++ b/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/Domain.java @@ -31,12 +31,13 @@ */ public interface Domain extends NamedElement { /** - * Returns the value of the 'Uri' attribute. + * Returns the value of the 'Uri' attribute. The default value is "domain://sample". + * * * @return the value of the 'Uri' attribute. * @see #setUri(String) * @see org.eclipse.sirius.web.domain.DomainPackage#getDomain_Uri() - * @model + * @model default="domain://sample" * @generated */ String getUri(); diff --git a/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/impl/DomainImpl.java b/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/impl/DomainImpl.java index c38ced7c4b..8e53f095a8 100644 --- a/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/impl/DomainImpl.java +++ b/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/impl/DomainImpl.java @@ -47,7 +47,7 @@ public class DomainImpl extends NamedElementImpl implements Domain { * @generated * @ordered */ - protected static final String URI_EDEFAULT = null; + protected static final String URI_EDEFAULT = "domain://sample"; //$NON-NLS-1$ /** * The cached value of the '{@link #getUri() Uri}' attribute. diff --git a/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/impl/DomainPackageImpl.java b/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/impl/DomainPackageImpl.java index 94aa1810b1..67efd92e1c 100644 --- a/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/impl/DomainPackageImpl.java +++ b/backend/sirius-web-domain/src/main/java/org/eclipse/sirius/web/domain/impl/DomainPackageImpl.java @@ -431,8 +431,8 @@ public void initializePackageContents() { IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEClass(this.domainEClass, Domain.class, "Domain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - this.initEAttribute(this.getDomain_Uri(), this.ecorePackage.getEString(), "uri", null, 0, 1, Domain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, //$NON-NLS-1$ - !IS_DERIVED, IS_ORDERED); + this.initEAttribute(this.getDomain_Uri(), this.ecorePackage.getEString(), "uri", "domain://sample", 0, 1, Domain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, //$NON-NLS-1$//$NON-NLS-2$ + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEReference(this.getDomain_Types(), this.getEntity(), null, "types", null, 0, -1, Domain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, //$NON-NLS-1$ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/backend/sirius-web-domain/src/main/resources/model/domain.ecore b/backend/sirius-web-domain/src/main/resources/model/domain.ecore index b7e6bff129..c07c56f07a 100644 --- a/backend/sirius-web-domain/src/main/resources/model/domain.ecore +++ b/backend/sirius-web-domain/src/main/resources/model/domain.ecore @@ -5,7 +5,8 @@ - + From e52921b379c8634e95fb55d52293925fca04ba88 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Tue, 6 Jul 2021 11:10:43 +0200 Subject: [PATCH 4/6] [557] Improve default values in the view model Bug: https://github.com/eclipse-sirius/sirius-components/issues/557 Signed-off-by: Pierre-Charles David --- .../DiagramDescriptionItemProvider.java | 15 ++++-- ...DiagramElementDescriptionItemProvider.java | 14 ++++-- .../provider/EdgeDescriptionItemProvider.java | 9 ++-- .../provider/NodeDescriptionItemProvider.java | 13 ++++-- .../web/view/provider/ViewItemProvider.java | 7 ++- backend/sirius-web-view/build.properties | 18 ++++++++ backend/sirius-web-view/plugin.properties | 13 ++++++ backend/sirius-web-view/plugin.xml | 42 +++++++++++++++++ .../sirius/web/view/ChangeContext.java | 5 +- .../eclipse/sirius/web/view/Conditional.java | 5 +- .../sirius/web/view/CreateInstance.java | 5 +- .../web/view/DiagramElementDescription.java | 6 +-- .../sirius/web/view/EdgeDescription.java | 6 +-- .../eclipse/sirius/web/view/NodeStyle.java | 2 +- .../web/view/RepresentationDescription.java | 10 ++-- .../org/eclipse/sirius/web/view/Style.java | 12 ++--- .../org/eclipse/sirius/web/view/Tool.java | 5 +- .../web/view/impl/ChangeContextImpl.java | 2 +- .../view/impl/ConditionalEdgeStyleImpl.java | 6 +-- .../sirius/web/view/impl/ConditionalImpl.java | 2 +- .../view/impl/ConditionalNodeStyleImpl.java | 6 +-- .../web/view/impl/CreateInstanceImpl.java | 2 +- .../impl/DiagramElementDescriptionImpl.java | 4 +- .../web/view/impl/EdgeDescriptionImpl.java | 4 +- .../sirius/web/view/impl/EdgeStyleImpl.java | 2 +- .../sirius/web/view/impl/NodeStyleImpl.java | 2 +- .../impl/RepresentationDescriptionImpl.java | 6 +-- .../sirius/web/view/impl/StyleImpl.java | 4 +- .../sirius/web/view/impl/ToolImpl.java | 2 +- .../sirius/web/view/impl/ViewPackageImpl.java | 46 +++++++++---------- .../src/main/resources/model/view.ecore | 35 ++++++++------ 31 files changed, 211 insertions(+), 99 deletions(-) create mode 100644 backend/sirius-web-view/build.properties create mode 100644 backend/sirius-web-view/plugin.properties create mode 100644 backend/sirius-web-view/plugin.xml diff --git a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/DiagramDescriptionItemProvider.java b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/DiagramDescriptionItemProvider.java index 53d99b289a..d1fefab6a6 100644 --- a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/DiagramDescriptionItemProvider.java +++ b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/DiagramDescriptionItemProvider.java @@ -23,6 +23,9 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.web.view.DiagramDescription; +import org.eclipse.sirius.web.view.EdgeDescription; +import org.eclipse.sirius.web.view.EdgeStyle; +import org.eclipse.sirius.web.view.NodeDescription; import org.eclipse.sirius.web.view.ViewFactory; import org.eclipse.sirius.web.view.ViewPackage; @@ -159,15 +162,21 @@ public void notifyChanged(Notification notification) { * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created * under this object. * - * @generated + * @generated NOT */ @Override protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_DESCRIPTION__NODE_DESCRIPTIONS, ViewFactory.eINSTANCE.createNodeDescription())); + NodeDescription nodeChild = ViewFactory.eINSTANCE.createNodeDescription(); + nodeChild.setStyle(ViewFactory.eINSTANCE.createNodeStyle()); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_DESCRIPTION__NODE_DESCRIPTIONS, nodeChild)); - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_DESCRIPTION__EDGE_DESCRIPTIONS, ViewFactory.eINSTANCE.createEdgeDescription())); + EdgeDescription edgeChild = ViewFactory.eINSTANCE.createEdgeDescription(); + EdgeStyle newEdgeStyle = ViewFactory.eINSTANCE.createEdgeStyle(); + newEdgeStyle.setColor("#002639"); //$NON-NLS-1$ + edgeChild.setStyle(newEdgeStyle); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_DESCRIPTION__EDGE_DESCRIPTIONS, edgeChild)); } } diff --git a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/DiagramElementDescriptionItemProvider.java b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/DiagramElementDescriptionItemProvider.java index b748a35c93..9822447059 100644 --- a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/DiagramElementDescriptionItemProvider.java +++ b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/DiagramElementDescriptionItemProvider.java @@ -29,7 +29,9 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; +import org.eclipse.sirius.web.view.DeleteTool; import org.eclipse.sirius.web.view.DiagramElementDescription; +import org.eclipse.sirius.web.view.LabelEditTool; import org.eclipse.sirius.web.view.ViewFactory; import org.eclipse.sirius.web.view.ViewPackage; @@ -196,15 +198,21 @@ public void notifyChanged(Notification notification) { * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created * under this object. * - * @generated + * @generated NOT */ @Override protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__DELETE_TOOL, ViewFactory.eINSTANCE.createDeleteTool())); + LabelEditTool newLabelEditTool = ViewFactory.eINSTANCE.createLabelEditTool(); + newLabelEditTool.setName("Edit Label"); //$NON-NLS-1$ + newLabelEditTool.getBody().add(ViewFactory.eINSTANCE.createChangeContext()); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__LABEL_EDIT_TOOL, newLabelEditTool)); - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__LABEL_EDIT_TOOL, ViewFactory.eINSTANCE.createLabelEditTool())); + DeleteTool newDeleteTool = ViewFactory.eINSTANCE.createDeleteTool(); + newDeleteTool.setName("Delete"); //$NON-NLS-1$ + newDeleteTool.getBody().add(ViewFactory.eINSTANCE.createChangeContext()); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__DELETE_TOOL, newDeleteTool)); } /** diff --git a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/EdgeDescriptionItemProvider.java b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/EdgeDescriptionItemProvider.java index 683f0f1fe8..00b72befe6 100644 --- a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/EdgeDescriptionItemProvider.java +++ b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/EdgeDescriptionItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.web.view.EdgeDescription; +import org.eclipse.sirius.web.view.EdgeTool; import org.eclipse.sirius.web.view.ViewFactory; import org.eclipse.sirius.web.view.ViewPackage; @@ -226,10 +227,12 @@ public void notifyChanged(Notification notification) { protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__STYLE, ViewFactory.eINSTANCE.createEdgeStyle())); - - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__EDGE_TOOLS, ViewFactory.eINSTANCE.createEdgeTool())); + EdgeTool newEdgeTool = ViewFactory.eINSTANCE.createEdgeTool(); + newEdgeTool.setName("Create Edge"); //$NON-NLS-1$ + newEdgeTool.getBody().add(ViewFactory.eINSTANCE.createChangeContext()); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__EDGE_TOOLS, newEdgeTool)); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__STYLE, ViewFactory.eINSTANCE.createEdgeStyle())); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__CONDITIONAL_STYLES, ViewFactory.eINSTANCE.createConditionalEdgeStyle())); } diff --git a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/NodeDescriptionItemProvider.java b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/NodeDescriptionItemProvider.java index 0cb1a5ee4d..47c82efae0 100644 --- a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/NodeDescriptionItemProvider.java +++ b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/NodeDescriptionItemProvider.java @@ -21,6 +21,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.web.view.NodeDescription; +import org.eclipse.sirius.web.view.NodeTool; import org.eclipse.sirius.web.view.ViewFactory; import org.eclipse.sirius.web.view.ViewPackage; @@ -151,12 +152,16 @@ public void notifyChanged(Notification notification) { protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__CHILDREN_DESCRIPTIONS, ViewFactory.eINSTANCE.createNodeDescription())); + NodeDescription nodeChild = ViewFactory.eINSTANCE.createNodeDescription(); + nodeChild.setStyle(ViewFactory.eINSTANCE.createNodeStyle()); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__CHILDREN_DESCRIPTIONS, nodeChild)); - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__STYLE, ViewFactory.eINSTANCE.createNodeStyle())); - - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__NODE_TOOLS, ViewFactory.eINSTANCE.createNodeTool())); + NodeTool newNodeTool = ViewFactory.eINSTANCE.createNodeTool(); + newNodeTool.setName("Create Node"); //$NON-NLS-1$ + newNodeTool.getBody().add(ViewFactory.eINSTANCE.createChangeContext()); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__NODE_TOOLS, newNodeTool)); + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__STYLE, ViewFactory.eINSTANCE.createNodeStyle())); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__CONDITIONAL_STYLES, ViewFactory.eINSTANCE.createConditionalNodeStyle())); } diff --git a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/ViewItemProvider.java b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/ViewItemProvider.java index 7cb6545b54..fb19521adf 100644 --- a/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/ViewItemProvider.java +++ b/backend/sirius-web-view-edit/src/main/java/org/eclipse/sirius/web/view/provider/ViewItemProvider.java @@ -27,6 +27,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; +import org.eclipse.sirius.web.view.DiagramDescription; import org.eclipse.sirius.web.view.View; import org.eclipse.sirius.web.view.ViewFactory; import org.eclipse.sirius.web.view.ViewPackage; @@ -144,13 +145,15 @@ public void notifyChanged(Notification notification) { * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created * under this object. * - * @generated + * @generated NOT */ @Override protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.VIEW__DESCRIPTIONS, ViewFactory.eINSTANCE.createDiagramDescription())); + DiagramDescription newDiagramDescription = ViewFactory.eINSTANCE.createDiagramDescription(); + newDiagramDescription.setName("New Diagram Description"); //$NON-NLS-1$ + newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.VIEW__DESCRIPTIONS, newDiagramDescription)); } /** diff --git a/backend/sirius-web-view/build.properties b/backend/sirius-web-view/build.properties new file mode 100644 index 0000000000..4993c221cd --- /dev/null +++ b/backend/sirius-web-view/build.properties @@ -0,0 +1,18 @@ +# Copyright (c) 2021 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 + +bin.includes = .,\ + model/,\ + plugin.xml,\ + plugin.properties +jars.compile.order = . +source.. = src/main/java/ +output.. = bin/ diff --git a/backend/sirius-web-view/plugin.properties b/backend/sirius-web-view/plugin.properties new file mode 100644 index 0000000000..48605ebbba --- /dev/null +++ b/backend/sirius-web-view/plugin.properties @@ -0,0 +1,13 @@ +# Copyright (c) 2021 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 + +pluginName = View Model +providerName = www.example.org diff --git a/backend/sirius-web-view/plugin.xml b/backend/sirius-web-view/plugin.xml new file mode 100644 index 0000000000..bd697d8507 --- /dev/null +++ b/backend/sirius-web-view/plugin.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/ChangeContext.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/ChangeContext.java index 7a5a1b566f..4a77097fe5 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/ChangeContext.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/ChangeContext.java @@ -28,12 +28,13 @@ */ public interface ChangeContext extends Operation { /** - * Returns the value of the 'Expression' attribute. + * Returns the value of the 'Expression' attribute. The default value is "aql:self". + * * * @return the value of the 'Expression' attribute. * @see #setExpression(String) * @see org.eclipse.sirius.web.view.ViewPackage#getChangeContext_Expression() - * @model required="true" + * @model default="aql:self" required="true" * @generated */ String getExpression(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Conditional.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Conditional.java index f9393b3530..b44e136d27 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Conditional.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Conditional.java @@ -30,12 +30,13 @@ */ public interface Conditional extends EObject { /** - * Returns the value of the 'Condition' attribute. + * Returns the value of the 'Condition' attribute. The default value is "aql:false". + * * * @return the value of the 'Condition' attribute. * @see #setCondition(String) * @see org.eclipse.sirius.web.view.ViewPackage#getConditional_Condition() - * @model required="true" + * @model default="aql:false" required="true" * @generated */ String getCondition(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/CreateInstance.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/CreateInstance.java index d1b2a8522f..8c28cf9de8 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/CreateInstance.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/CreateInstance.java @@ -75,12 +75,13 @@ public interface CreateInstance extends Operation { void setReferenceName(String value); /** - * Returns the value of the 'Variable Name' attribute. + * Returns the value of the 'Variable Name' attribute. The default value is + * "newInstance". * * @return the value of the 'Variable Name' attribute. * @see #setVariableName(String) * @see org.eclipse.sirius.web.view.ViewPackage#getCreateInstance_VariableName() - * @model required="true" + * @model default="newInstance" required="true" * @generated */ String getVariableName(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/DiagramElementDescription.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/DiagramElementDescription.java index bb420fb59e..da51e05bad 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/DiagramElementDescription.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/DiagramElementDescription.java @@ -58,13 +58,13 @@ public interface DiagramElementDescription extends EObject { void setDomainType(String value); /** - * Returns the value of the 'Semantic Candidates Expression' attribute. + * Returns the value of the 'Semantic Candidates Expression' attribute. The default value is + * "aql:self.eContents()". * * @return the value of the 'Semantic Candidates Expression' attribute. * @see #setSemanticCandidatesExpression(String) * @see org.eclipse.sirius.web.view.ViewPackage#getDiagramElementDescription_SemanticCandidatesExpression() - * @model + * @model default="aql:self.eContents()" * @generated */ String getSemanticCandidatesExpression(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/EdgeDescription.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/EdgeDescription.java index b5f6c80747..896b2f80ea 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/EdgeDescription.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/EdgeDescription.java @@ -131,13 +131,13 @@ public interface EdgeDescription extends DiagramElementDescription { void setSourceNodesExpression(String value); /** - * Returns the value of the 'Target Nodes Expression' attribute. + * Returns the value of the 'Target Nodes Expression' attribute. The default value is + * "aql:self.eCrossReferences()". * * @return the value of the 'Target Nodes Expression' attribute. * @see #setTargetNodesExpression(String) * @see org.eclipse.sirius.web.view.ViewPackage#getEdgeDescription_TargetNodesExpression() - * @model + * @model default="aql:self.eCrossReferences()" * @generated */ String getTargetNodesExpression(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/NodeStyle.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/NodeStyle.java index 29d7f41541..f211d0d1ce 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/NodeStyle.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/NodeStyle.java @@ -81,7 +81,7 @@ public interface NodeStyle extends Style { * @return the value of the 'Shape' attribute. * @see #setShape(String) * @see org.eclipse.sirius.web.view.ViewPackage#getNodeStyle_Shape() - * @model required="true" + * @model * @generated */ String getShape(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/RepresentationDescription.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/RepresentationDescription.java index fd8c9c3717..eafbfe1532 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/RepresentationDescription.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/RepresentationDescription.java @@ -33,12 +33,13 @@ */ public interface RepresentationDescription extends EObject { /** - * Returns the value of the 'Name' attribute. + * Returns the value of the 'Name' attribute. The default value is + * "NewRepresentationDescription". * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.sirius.web.view.ViewPackage#getRepresentationDescription_Name() - * @model + * @model default="NewRepresentationDescription" * @generated */ String getName(); @@ -55,12 +56,13 @@ public interface RepresentationDescription extends EObject { void setName(String value); /** - * Returns the value of the 'Domain Type' attribute. + * Returns the value of the 'Domain Type' attribute. The default value is "". * * @return the value of the 'Domain Type' attribute. * @see #setDomainType(String) * @see org.eclipse.sirius.web.view.ViewPackage#getRepresentationDescription_DomainType() - * @model + * @model default="" * @generated */ String getDomainType(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Style.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Style.java index 412ec7da19..e6b6c3b588 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Style.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Style.java @@ -32,13 +32,13 @@ */ public interface Style extends EObject { /** - * Returns the value of the 'Color' attribute. The default value is "rgb(0, 0, 0)". - * + * Returns the value of the 'Color' attribute. The default value is "#a590df". * * @return the value of the 'Color' attribute. * @see #setColor(String) * @see org.eclipse.sirius.web.view.ViewPackage#getStyle_Color() - * @model default="rgb(0, 0, 0)" + * @model default="#a590df" * @generated */ String getColor(); @@ -55,13 +55,13 @@ public interface Style extends EObject { void setColor(String value); /** - * Returns the value of the 'Border Color' attribute. The default value is - * "rgb(0, 0, 0)". + * Returns the value of the 'Border Color' attribute. The default value is "#33B0C3". + * * * @return the value of the 'Border Color' attribute. * @see #setBorderColor(String) * @see org.eclipse.sirius.web.view.ViewPackage#getStyle_BorderColor() - * @model default="rgb(0, 0, 0)" required="true" + * @model default="#33B0C3" required="true" * @generated */ String getBorderColor(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Tool.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Tool.java index 05f01944b6..cf3578acdb 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Tool.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/Tool.java @@ -32,12 +32,13 @@ */ public interface Tool extends EObject { /** - * Returns the value of the 'Name' attribute. + * Returns the value of the 'Name' attribute. The default value is "\"Tool\"". * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.sirius.web.view.ViewPackage#getTool_Name() - * @model required="true" + * @model default="\"Tool\"" required="true" * @generated */ String getName(); diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/ChangeContextImpl.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/ChangeContextImpl.java index f920d2c8f7..21842229ab 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/ChangeContextImpl.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/ChangeContextImpl.java @@ -38,7 +38,7 @@ public class ChangeContextImpl extends OperationImpl implements ChangeContext { * @generated * @ordered */ - protected static final String EXPRESSION_EDEFAULT = null; + protected static final String EXPRESSION_EDEFAULT = "aql:self"; //$NON-NLS-1$ /** * The cached value of the '{@link #getExpression() Expression}' attribute. diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/CreateInstanceImpl.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/CreateInstanceImpl.java index f9d14a9bf0..59532a338c 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/CreateInstanceImpl.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/CreateInstanceImpl.java @@ -81,7 +81,7 @@ public class CreateInstanceImpl extends OperationImpl implements CreateInstance * @generated * @ordered */ - protected static final String VARIABLE_NAME_EDEFAULT = null; + protected static final String VARIABLE_NAME_EDEFAULT = "newInstance"; //$NON-NLS-1$ /** * The cached value of the '{@link #getVariableName() Variable Name}' attribute. diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/DiagramElementDescriptionImpl.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/DiagramElementDescriptionImpl.java index b23c26d5ac..85029e64b8 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/DiagramElementDescriptionImpl.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/DiagramElementDescriptionImpl.java @@ -71,7 +71,7 @@ public abstract class DiagramElementDescriptionImpl extends MinimalEObjectImpl.C * @generated * @ordered */ - protected static final String SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT = null; + protected static final String SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT = "aql:self.eContents()"; //$NON-NLS-1$ /** * The cached value of the '{@link #getSemanticCandidatesExpression() Semantic Candidates Expression}' @@ -91,7 +91,7 @@ public abstract class DiagramElementDescriptionImpl extends MinimalEObjectImpl.C * @generated * @ordered */ - protected static final String LABEL_EXPRESSION_EDEFAULT = null; + protected static final String LABEL_EXPRESSION_EDEFAULT = "aql:self.name"; //$NON-NLS-1$ /** * The cached value of the '{@link #getLabelExpression() Label Expression}' attribute. diff --git a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/RepresentationDescriptionImpl.java b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/RepresentationDescriptionImpl.java index 018489fb78..be2119324e 100644 --- a/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/RepresentationDescriptionImpl.java +++ b/backend/sirius-web-view/src/main/java/org/eclipse/sirius/web/view/impl/RepresentationDescriptionImpl.java @@ -43,7 +43,7 @@ public abstract class RepresentationDescriptionImpl extends MinimalEObjectImpl.C * @generated * @ordered */ - protected static final String NAME_EDEFAULT = null; + protected static final String NAME_EDEFAULT = "NewRepresentationDescription"; //$NON-NLS-1$ /** * The cached value of the '{@link #getName() Name}' attribute. - - - - - - - - - - - - - - - - - - - - diff --git a/backend/sirius-web-view/build.properties b/backend/sirius-web-view/build.properties deleted file mode 100644 index 4993c221cd..0000000000 --- a/backend/sirius-web-view/build.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2021 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 - -bin.includes = .,\ - model/,\ - plugin.xml,\ - plugin.properties -jars.compile.order = . -source.. = src/main/java/ -output.. = bin/ diff --git a/backend/sirius-web-view/plugin.properties b/backend/sirius-web-view/plugin.properties deleted file mode 100644 index 48605ebbba..0000000000 --- a/backend/sirius-web-view/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2021 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 - -pluginName = View Model -providerName = www.example.org diff --git a/backend/sirius-web-view/plugin.xml b/backend/sirius-web-view/plugin.xml deleted file mode 100644 index bd697d8507..0000000000 --- a/backend/sirius-web-view/plugin.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - From 0430f1c01625222ff4aee18720c64736e0cc1f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20B=C3=A9gaudeau?= Date: Thu, 8 Jul 2021 17:11:30 +0200 Subject: [PATCH 6/6] [releng] Bump version to v0.3.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Bégaudeau --- backend/pom.xml | 2 +- backend/sirius-web-annotations-spring/pom.xml | 2 +- backend/sirius-web-annotations/pom.xml | 2 +- backend/sirius-web-api/pom.xml | 10 +++---- backend/sirius-web-collaborative-api/pom.xml | 8 +++--- .../pom.xml | 8 +++--- .../pom.xml | 8 +++--- .../pom.xml | 8 +++--- .../pom.xml | 8 +++--- backend/sirius-web-compatibility/pom.xml | 18 ++++++------- backend/sirius-web-components/pom.xml | 4 +-- backend/sirius-web-core-api/pom.xml | 8 +++--- .../sirius-web-diagrams-layout-api/pom.xml | 4 +-- backend/sirius-web-diagrams-layout/pom.xml | 14 +++++----- backend/sirius-web-diagrams-tests/pom.xml | 4 +-- backend/sirius-web-diagrams/pom.xml | 8 +++--- backend/sirius-web-domain-design/pom.xml | 4 +-- backend/sirius-web-domain-edit/pom.xml | 4 +-- backend/sirius-web-domain/pom.xml | 2 +- backend/sirius-web-emf/pom.xml | 26 +++++++++---------- backend/sirius-web-forms-tests/pom.xml | 4 +-- backend/sirius-web-forms/pom.xml | 10 +++---- backend/sirius-web-graphiql/pom.xml | 2 +- backend/sirius-web-graphql-schema/pom.xml | 22 ++++++++-------- backend/sirius-web-graphql-utils/pom.xml | 6 ++--- backend/sirius-web-graphql-voyager/pom.xml | 2 +- backend/sirius-web-graphql/pom.xml | 26 +++++++++---------- backend/sirius-web-interpreter/pom.xml | 2 +- backend/sirius-web-persistence/pom.xml | 8 +++--- backend/sirius-web-representations/pom.xml | 4 +-- backend/sirius-web-services-api/pom.xml | 12 ++++----- backend/sirius-web-services/pom.xml | 12 ++++----- .../pom.xml | 16 ++++++------ .../pom.xml | 12 ++++----- .../pom.xml | 8 +++--- .../pom.xml | 12 ++++----- .../sirius-web-spring-collaborative/pom.xml | 10 +++---- backend/sirius-web-spring-graphql-api/pom.xml | 4 +-- backend/sirius-web-spring-graphql/pom.xml | 12 ++++----- backend/sirius-web-spring-starter/pom.xml | 20 +++++++------- backend/sirius-web-spring-tests/pom.xml | 4 +-- backend/sirius-web-spring/pom.xml | 10 +++---- backend/sirius-web-tests/pom.xml | 4 +-- backend/sirius-web-trees/pom.xml | 8 +++--- backend/sirius-web-validation/pom.xml | 8 +++--- backend/sirius-web-view-edit/pom.xml | 4 +-- backend/sirius-web-view/pom.xml | 2 +- frontend/package-lock.json | 2 +- frontend/package.json | 2 +- 49 files changed, 200 insertions(+), 200 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 55688aea9e..c60e61ee34 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -15,7 +15,7 @@ org.eclipse.sirius.web sirius-components - 0.3.4 + 0.3.5 sirius-components Sirius Components diff --git a/backend/sirius-web-annotations-spring/pom.xml b/backend/sirius-web-annotations-spring/pom.xml index e3f3c10f67..53d3d611bd 100644 --- a/backend/sirius-web-annotations-spring/pom.xml +++ b/backend/sirius-web-annotations-spring/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-annotations-spring - 0.3.4 + 0.3.5 sirius-web-annotations-spring Sirius Web Annotations Spring diff --git a/backend/sirius-web-annotations/pom.xml b/backend/sirius-web-annotations/pom.xml index a1c7651f67..494ad72534 100644 --- a/backend/sirius-web-annotations/pom.xml +++ b/backend/sirius-web-annotations/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 sirius-web-annotations Sirius Web Annotations diff --git a/backend/sirius-web-api/pom.xml b/backend/sirius-web-api/pom.xml index b403f1f34e..8422a35fdc 100644 --- a/backend/sirius-web-api/pom.xml +++ b/backend/sirius-web-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-api - 0.3.4 + 0.3.5 sirius-web-api Sirius Web API @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-forms - 0.3.4 + 0.3.5 io.projectreactor @@ -66,7 +66,7 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-collaborative-api/pom.xml b/backend/sirius-web-collaborative-api/pom.xml index cce5a999a4..386119b438 100644 --- a/backend/sirius-web-collaborative-api/pom.xml +++ b/backend/sirius-web-collaborative-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 sirius-web-collaborative-api Sirius Web Collaborative API @@ -55,17 +55,17 @@ org.eclipse.sirius.web sirius-web-core-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-collaborative-diagrams-api/pom.xml b/backend/sirius-web-collaborative-diagrams-api/pom.xml index af3fde526d..d6e1691486 100644 --- a/backend/sirius-web-collaborative-diagrams-api/pom.xml +++ b/backend/sirius-web-collaborative-diagrams-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-collaborative-diagrams-api - 0.3.4 + 0.3.5 sirius-web-collaborative-diagrams-api Sirius Web Collaborative Diagrams API @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-diagrams - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-collaborative-forms-api/pom.xml b/backend/sirius-web-collaborative-forms-api/pom.xml index 459b567d3e..7ff60c69d4 100644 --- a/backend/sirius-web-collaborative-forms-api/pom.xml +++ b/backend/sirius-web-collaborative-forms-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-collaborative-forms-api - 0.3.4 + 0.3.5 sirius-web-collaborative-forms-api Sirius Web Collaborative Forms API @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-forms - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-collaborative-trees-api/pom.xml b/backend/sirius-web-collaborative-trees-api/pom.xml index f44604e16c..d3a8f3ee3e 100644 --- a/backend/sirius-web-collaborative-trees-api/pom.xml +++ b/backend/sirius-web-collaborative-trees-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-collaborative-trees-api - 0.3.4 + 0.3.5 sirius-web-collaborative-trees-api Sirius Web Collaborative Trees API @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-trees - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-collaborative-validation-api/pom.xml b/backend/sirius-web-collaborative-validation-api/pom.xml index 1faaa671ca..e9088c9458 100644 --- a/backend/sirius-web-collaborative-validation-api/pom.xml +++ b/backend/sirius-web-collaborative-validation-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-collaborative-validation-api - 0.3.4 + 0.3.5 sirius-web-collaborative-validation-api Sirius Web Collaborative Validation API @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-validation - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-compatibility/pom.xml b/backend/sirius-web-compatibility/pom.xml index 2134086161..dd6f7f73dd 100644 --- a/backend/sirius-web-compatibility/pom.xml +++ b/backend/sirius-web-compatibility/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-compatibility - 0.3.4 + 0.3.5 sirius-web-compatibility Sirius Web Compatibility @@ -72,7 +72,7 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test @@ -82,38 +82,38 @@ org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-core-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-diagrams - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-forms - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-trees - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-interpreter - 0.3.4 + 0.3.5 org.eclipse.emf diff --git a/backend/sirius-web-components/pom.xml b/backend/sirius-web-components/pom.xml index d98b2de64b..edc12b7ce7 100644 --- a/backend/sirius-web-components/pom.xml +++ b/backend/sirius-web-components/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-components - 0.3.4 + 0.3.5 sirius-web-components Sirius Web Components @@ -52,7 +52,7 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-core-api/pom.xml b/backend/sirius-web-core-api/pom.xml index c3d5481b7a..eb9d810ca3 100644 --- a/backend/sirius-web-core-api/pom.xml +++ b/backend/sirius-web-core-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-core-api - 0.3.4 + 0.3.5 sirius-web-core-api Sirius Web Core API @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-diagrams-layout-api/pom.xml b/backend/sirius-web-diagrams-layout-api/pom.xml index 9d47274402..c706e6ede0 100644 --- a/backend/sirius-web-diagrams-layout-api/pom.xml +++ b/backend/sirius-web-diagrams-layout-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-diagrams-layout-api - 0.3.4 + 0.3.5 sirius-web-diagrams-layout-api Sirius Web Diagrams Layout API @@ -42,7 +42,7 @@ org.eclipse.sirius.web sirius-web-diagrams - 0.3.4 + 0.3.5 diff --git a/backend/sirius-web-diagrams-layout/pom.xml b/backend/sirius-web-diagrams-layout/pom.xml index 9aef53249e..c76e2b8d6a 100644 --- a/backend/sirius-web-diagrams-layout/pom.xml +++ b/backend/sirius-web-diagrams-layout/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-diagrams-layout - 0.3.4 + 0.3.5 sirius-web-diagrams-layout Sirius Web Diagrams layout @@ -65,17 +65,17 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-core-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-diagrams-layout-api - 0.3.4 + 0.3.5 org.eclipse.elk @@ -112,7 +112,7 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test @@ -127,12 +127,12 @@ org.eclipse.sirius.web sirius-web-diagrams - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-diagrams-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-diagrams-tests/pom.xml b/backend/sirius-web-diagrams-tests/pom.xml index a2549e1614..963ff70006 100644 --- a/backend/sirius-web-diagrams-tests/pom.xml +++ b/backend/sirius-web-diagrams-tests/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-diagrams-tests - 0.3.4 + 0.3.5 sirius-web-diagrams-tests Sirius Web Diagrams Tests @@ -42,7 +42,7 @@ org.eclipse.sirius.web sirius-web-diagrams - 0.3.4 + 0.3.5 org.assertj diff --git a/backend/sirius-web-diagrams/pom.xml b/backend/sirius-web-diagrams/pom.xml index 76167d518f..60a03eb36a 100644 --- a/backend/sirius-web-diagrams/pom.xml +++ b/backend/sirius-web-diagrams/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-diagrams - 0.3.4 + 0.3.5 sirius-web-diagrams Sirius Web Diagrams @@ -42,12 +42,12 @@ org.eclipse.sirius.web sirius-web-components - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 org.springframework.boot @@ -57,7 +57,7 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-domain-design/pom.xml b/backend/sirius-web-domain-design/pom.xml index be214ee9e2..ca51eb376d 100644 --- a/backend/sirius-web-domain-design/pom.xml +++ b/backend/sirius-web-domain-design/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-domain-design - 0.3.4 + 0.3.5 sirius-web-domain-design Sirius Web Domain Definition DSL - Graphical Modeler Definition @@ -68,7 +68,7 @@ org.eclipse.sirius.web sirius-web-domain - 0.3.4 + 0.3.5 diff --git a/backend/sirius-web-domain-edit/pom.xml b/backend/sirius-web-domain-edit/pom.xml index 53773f3197..c6d5e7e241 100644 --- a/backend/sirius-web-domain-edit/pom.xml +++ b/backend/sirius-web-domain-edit/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-domain-edit - 0.3.4 + 0.3.5 sirius-web-domain-edit Sirius Web Domain Definition DSL - Edit Support @@ -68,7 +68,7 @@ org.eclipse.sirius.web sirius-web-domain - 0.3.4 + 0.3.5 diff --git a/backend/sirius-web-domain/pom.xml b/backend/sirius-web-domain/pom.xml index 002700451b..8d290bffc3 100644 --- a/backend/sirius-web-domain/pom.xml +++ b/backend/sirius-web-domain/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-domain - 0.3.4 + 0.3.5 sirius-web-domain Sirius Web Domain Definition DSL diff --git a/backend/sirius-web-emf/pom.xml b/backend/sirius-web-emf/pom.xml index a4b2b17347..ba5b0e690e 100644 --- a/backend/sirius-web-emf/pom.xml +++ b/backend/sirius-web-emf/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-emf - 0.3.4 + 0.3.5 sirius-web-emf Sirius Web EMF @@ -70,47 +70,47 @@ org.eclipse.sirius.web sirius-web-spring-graphql-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-forms-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-trees-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-validation-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-compatibility - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-interpreter - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-domain - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-view - 0.3.4 + 0.3.5 org.eclipse.emf @@ -159,19 +159,19 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-collaborative - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-forms-tests/pom.xml b/backend/sirius-web-forms-tests/pom.xml index 2a5e715995..a292221a08 100644 --- a/backend/sirius-web-forms-tests/pom.xml +++ b/backend/sirius-web-forms-tests/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-forms-tests - 0.3.4 + 0.3.5 sirius-web-forms-tests Sirius Web Forms Tests @@ -42,7 +42,7 @@ org.eclipse.sirius.web sirius-web-forms - 0.3.4 + 0.3.5 org.assertj diff --git a/backend/sirius-web-forms/pom.xml b/backend/sirius-web-forms/pom.xml index 6737493d7b..ac1b818c1b 100644 --- a/backend/sirius-web-forms/pom.xml +++ b/backend/sirius-web-forms/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-forms - 0.3.4 + 0.3.5 sirius-web-forms Sirius Web Forms @@ -46,17 +46,17 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-components - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 org.springframework.boot @@ -66,7 +66,7 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-graphiql/pom.xml b/backend/sirius-web-graphiql/pom.xml index 197ed7775a..eeefd799c2 100644 --- a/backend/sirius-web-graphiql/pom.xml +++ b/backend/sirius-web-graphiql/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-graphiql - 0.3.4 + 0.3.5 sirius-web-graphiql Sirius Web Graphiql support. This project contribute a GraphQL query tool on the /graphiql/index.html URI. diff --git a/backend/sirius-web-graphql-schema/pom.xml b/backend/sirius-web-graphql-schema/pom.xml index 6a6d49b090..03e4c04e19 100644 --- a/backend/sirius-web-graphql-schema/pom.xml +++ b/backend/sirius-web-graphql-schema/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-graphql-schema - 0.3.4 + 0.3.5 sirius-web-graphql-schema Sirius Web GraphQL Schema @@ -46,42 +46,42 @@ org.eclipse.sirius.web sirius-web-graphql-utils - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-graphql-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-services-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-diagrams-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-forms-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-validation-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-trees-api - 0.3.4 + 0.3.5 org.springframework.boot @@ -91,13 +91,13 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-graphql-utils/pom.xml b/backend/sirius-web-graphql-utils/pom.xml index 8a68651c55..4369ab98ce 100644 --- a/backend/sirius-web-graphql-utils/pom.xml +++ b/backend/sirius-web-graphql-utils/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-graphql-utils - 0.3.4 + 0.3.5 sirius-web-graphql-utils Sirius Web GraphQL Utils @@ -43,7 +43,7 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 com.graphql-java @@ -53,7 +53,7 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-graphql-voyager/pom.xml b/backend/sirius-web-graphql-voyager/pom.xml index 4cefdcf610..9ba577716d 100644 --- a/backend/sirius-web-graphql-voyager/pom.xml +++ b/backend/sirius-web-graphql-voyager/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-graphql-voyager - 0.3.4 + 0.3.5 sirius-web-graphql-voyager Sirius Web Graph Voyager. This project contribute a GraphQL API UX thanks to the https://github.com/APIs-guru/graphql-voyager project. diff --git a/backend/sirius-web-graphql/pom.xml b/backend/sirius-web-graphql/pom.xml index 1e4b822ac0..fec1c5369d 100644 --- a/backend/sirius-web-graphql/pom.xml +++ b/backend/sirius-web-graphql/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-graphql - 0.3.4 + 0.3.5 sirius-web-graphql Sirius Web GraphQL @@ -42,52 +42,52 @@ org.eclipse.sirius.web sirius-web-interpreter - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-annotations-spring - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-graphql-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-graphql-schema - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-services-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-diagrams-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-forms-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-trees-api - 0.3.4 + 0.3.5 org.springframework.boot @@ -97,13 +97,13 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-interpreter/pom.xml b/backend/sirius-web-interpreter/pom.xml index ba4331669b..357c6c56c7 100644 --- a/backend/sirius-web-interpreter/pom.xml +++ b/backend/sirius-web-interpreter/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-interpreter - 0.3.4 + 0.3.5 sirius-web-interpreter Sirius Web Intepreter diff --git a/backend/sirius-web-persistence/pom.xml b/backend/sirius-web-persistence/pom.xml index 368c936712..e05b94c883 100644 --- a/backend/sirius-web-persistence/pom.xml +++ b/backend/sirius-web-persistence/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-persistence - 0.3.4 + 0.3.5 sirius-web-persistence Sirius Web Persistence @@ -60,7 +60,7 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.springframework.boot @@ -70,13 +70,13 @@ org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-representations/pom.xml b/backend/sirius-web-representations/pom.xml index 26398bf19b..fa0ad439c8 100644 --- a/backend/sirius-web-representations/pom.xml +++ b/backend/sirius-web-representations/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 sirius-web-representations Sirius Web Representations @@ -42,7 +42,7 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 diff --git a/backend/sirius-web-services-api/pom.xml b/backend/sirius-web-services-api/pom.xml index ce2af5cfcc..029b7b7944 100644 --- a/backend/sirius-web-services-api/pom.xml +++ b/backend/sirius-web-services-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-services-api - 0.3.4 + 0.3.5 sirius-web-services-api Sirius Web Services API @@ -46,27 +46,27 @@ org.eclipse.sirius.web sirius-web-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-core-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-graphql-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-services/pom.xml b/backend/sirius-web-services/pom.xml index 6018e7fd73..4d038a8525 100644 --- a/backend/sirius-web-services/pom.xml +++ b/backend/sirius-web-services/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-services - 0.3.4 + 0.3.5 sirius-web-services Sirius Web Services @@ -50,27 +50,27 @@ org.eclipse.sirius.web sirius-web-services-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-emf - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-persistence - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-spring-collaborative-diagrams/pom.xml b/backend/sirius-web-spring-collaborative-diagrams/pom.xml index ea5f8f0c15..3b47956185 100644 --- a/backend/sirius-web-spring-collaborative-diagrams/pom.xml +++ b/backend/sirius-web-spring-collaborative-diagrams/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-diagrams - 0.3.4 + 0.3.5 sirius-web-spring-collaborative-diagrams Sirius Web Spring Collaborative Diagrams @@ -50,39 +50,39 @@ org.eclipse.sirius.web sirius-web-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-diagrams-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-collaborative - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-diagrams-layout - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-diagrams-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-spring-collaborative-forms/pom.xml b/backend/sirius-web-spring-collaborative-forms/pom.xml index c50cb7600c..792587a3ef 100644 --- a/backend/sirius-web-spring-collaborative-forms/pom.xml +++ b/backend/sirius-web-spring-collaborative-forms/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-forms - 0.3.4 + 0.3.5 sirius-web-spring-collaborative-forms Sirius Web Spring Collaborative Forms @@ -50,28 +50,28 @@ org.eclipse.sirius.web sirius-web-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-forms-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-collaborative - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-spring-collaborative-trees/pom.xml b/backend/sirius-web-spring-collaborative-trees/pom.xml index 585efabc5c..6c88fa9d02 100644 --- a/backend/sirius-web-spring-collaborative-trees/pom.xml +++ b/backend/sirius-web-spring-collaborative-trees/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-trees - 0.3.4 + 0.3.5 sirius-web-spring-collaborative-trees Sirius Web Spring Collaborative Trees @@ -58,18 +58,18 @@ org.eclipse.sirius.web sirius-web-collaborative-trees-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-spring-collaborative-validation/pom.xml b/backend/sirius-web-spring-collaborative-validation/pom.xml index 5fde2eab48..6af52dc53e 100644 --- a/backend/sirius-web-spring-collaborative-validation/pom.xml +++ b/backend/sirius-web-spring-collaborative-validation/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-validation - 0.3.4 + 0.3.5 sirius-web-spring-collaborative-validation Sirius Web Spring Collaborative Validation @@ -51,28 +51,28 @@ org.eclipse.sirius.web sirius-web-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-validation-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-collaborative - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-spring-collaborative/pom.xml b/backend/sirius-web-spring-collaborative/pom.xml index f9a6d1df9d..a822bdcdc7 100644 --- a/backend/sirius-web-spring-collaborative/pom.xml +++ b/backend/sirius-web-spring-collaborative/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative - 0.3.4 + 0.3.5 sirius-web-spring-collaborative Sirius Web Spring Collaborative @@ -62,23 +62,23 @@ org.eclipse.sirius.web sirius-web-core-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-collaborative-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-spring-graphql-api/pom.xml b/backend/sirius-web-spring-graphql-api/pom.xml index f31cfc45d4..47a2a9ec14 100644 --- a/backend/sirius-web-spring-graphql-api/pom.xml +++ b/backend/sirius-web-spring-graphql-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-graphql-api - 0.3.4 + 0.3.5 sirius-web-spring-graphql-api Sirius Web Spring GraphQL API @@ -48,7 +48,7 @@ org.eclipse.sirius.web sirius-web-annotations-spring - 0.3.4 + 0.3.5 diff --git a/backend/sirius-web-spring-graphql/pom.xml b/backend/sirius-web-spring-graphql/pom.xml index 261bbe0d89..058d161e7b 100644 --- a/backend/sirius-web-spring-graphql/pom.xml +++ b/backend/sirius-web-spring-graphql/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-graphql - 0.3.4 + 0.3.5 sirius-web-spring-graphql Sirius Web Spring GraphQL @@ -68,28 +68,28 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-graphql-utils - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-graphql-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-spring-starter/pom.xml b/backend/sirius-web-spring-starter/pom.xml index 7c4b5b899f..09ed95f317 100644 --- a/backend/sirius-web-spring-starter/pom.xml +++ b/backend/sirius-web-spring-starter/pom.xml @@ -15,7 +15,7 @@ org.eclipse.sirius.web sirius-web-spring-starter - 0.3.4 + 0.3.5 sirius-web-spring-starter Sirius Web Spring Starter @@ -39,47 +39,47 @@ org.eclipse.sirius.web sirius-web-spring-graphql - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-diagrams-layout - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-collaborative - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-collaborative-diagrams - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-collaborative-forms - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-collaborative-trees - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-spring-collaborative-validation - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-emf - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-compatibility - 0.3.4 + 0.3.5 diff --git a/backend/sirius-web-spring-tests/pom.xml b/backend/sirius-web-spring-tests/pom.xml index 036761ea4a..7da4a8f725 100644 --- a/backend/sirius-web-spring-tests/pom.xml +++ b/backend/sirius-web-spring-tests/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 sirius-web-spring-tests Sirius Web Spring Tests @@ -46,7 +46,7 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.springframework diff --git a/backend/sirius-web-spring/pom.xml b/backend/sirius-web-spring/pom.xml index fcce8b42c8..7bc1d89f11 100644 --- a/backend/sirius-web-spring/pom.xml +++ b/backend/sirius-web-spring/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring - 0.3.4 + 0.3.5 sirius-web-spring Sirius Web Spring @@ -50,12 +50,12 @@ org.eclipse.sirius.web sirius-web-services-api - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-emf - 0.3.4 + 0.3.5 org.springframework.boot @@ -65,13 +65,13 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test org.eclipse.sirius.web sirius-web-spring-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-tests/pom.xml b/backend/sirius-web-tests/pom.xml index 813556052a..9efabf1531 100644 --- a/backend/sirius-web-tests/pom.xml +++ b/backend/sirius-web-tests/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 sirius-web-tests Sirius Web Tests @@ -51,7 +51,7 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 diff --git a/backend/sirius-web-trees/pom.xml b/backend/sirius-web-trees/pom.xml index f300cb92e3..35d9aa1e48 100644 --- a/backend/sirius-web-trees/pom.xml +++ b/backend/sirius-web-trees/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-trees - 0.3.4 + 0.3.5 sirius-web-trees Sirius Web Trees @@ -42,17 +42,17 @@ org.eclipse.sirius.web sirius-web-annotations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-validation/pom.xml b/backend/sirius-web-validation/pom.xml index 6a05d98b6c..905fd17e98 100644 --- a/backend/sirius-web-validation/pom.xml +++ b/backend/sirius-web-validation/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-validation - 0.3.4 + 0.3.5 sirius-web-validation Sirius Web Validation @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-components - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-representations - 0.3.4 + 0.3.5 org.eclipse.sirius.web sirius-web-tests - 0.3.4 + 0.3.5 test diff --git a/backend/sirius-web-view-edit/pom.xml b/backend/sirius-web-view-edit/pom.xml index 4e20863308..e9cd07429f 100644 --- a/backend/sirius-web-view-edit/pom.xml +++ b/backend/sirius-web-view-edit/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-view-edit - 0.3.4 + 0.3.5 sirius-web-view-edit Sirius Web View Definition DSL - Edit Support @@ -68,7 +68,7 @@ org.eclipse.sirius.web sirius-web-view - 0.3.4 + 0.3.5 diff --git a/backend/sirius-web-view/pom.xml b/backend/sirius-web-view/pom.xml index 05dbbf9124..e95f146c36 100644 --- a/backend/sirius-web-view/pom.xml +++ b/backend/sirius-web-view/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-view - 0.3.4 + 0.3.5 sirius-web-view Sirius Web View Definition DSL diff --git a/frontend/package-lock.json b/frontend/package-lock.json index ee54d90d7b..9d2363de04 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,6 +1,6 @@ { "name": "@eclipse-sirius/sirius-components", - "version": "0.3.4", + "version": "0.3.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/frontend/package.json b/frontend/package.json index 713029d253..7ac4f96faa 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-sirius/sirius-components", - "version": "0.3.4", + "version": "0.3.5", "author": "Eclipse Sirius", "license": "EPL-2.0", "description": "Reusable components used to build the Sirius Web frontend",