diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 222dae534e..59671332ad 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -86,6 +86,7 @@ This will be fixed in the next version.
- https://github.com/eclipse-sirius/sirius-web/issues/2208[#2208] [diagram] Add Cypress tests for React Flow.
- https://github.com/eclipse-sirius/sirius-web/issues/2198[#2198] [view] Add a default Color Palette on View creation
- https://github.com/eclipse-sirius/sirius-web/issues/2228[#2228] [domain] Creating a domain from the onboard area action now initialize its name.
+- https://github.com/eclipse-sirius/sirius-web/issues/2329[#2329] [form] Change the default representation in the details view for non containment reference from a select widget to a reference widget.
== v2023.8.0
diff --git a/integration-tests/cypress/e2e/project/edit/color-palette.cy.js b/integration-tests/cypress/e2e/project/edit/color-palette.cy.js
index fefd9e9608..ce4848c2ea 100644
--- a/integration-tests/cypress/e2e/project/edit/color-palette.cy.js
+++ b/integration-tests/cypress/e2e/project/edit/color-palette.cy.js
@@ -54,6 +54,7 @@ describe('/projects/:projectId/edit - Color Palette', () => {
cy.getByTestId('Name').clear().type('OtherColorPalette{enter}');
cy.getByTestId('OtherColorPalette-more').click();
cy.getByTestId('new-object').click();
+ cy.getByTestId('childCreationDescription').children('[role="button"]').invoke('text').should('have.length.gt', 1);
cy.getByTestId('childCreationDescription').click().get('[data-value="Fixed Color"]').should('exist');
});
@@ -63,9 +64,12 @@ describe('/projects/:projectId/edit - Color Palette', () => {
cy.get('[title="diagram::DiagramDescription"]').dblclick();
cy.getByTestId('Entity1 Node-toggle').click();
cy.get('[title="diagram::RectangularNodeStyleDescription"]').click();
- cy.getByTestId('Label Color').click().get('[data-value="color_dark"]').should('exist').click();
- cy.getByTestId('Color').click().get('[data-value="color_dark"]').should('exist').click();
- cy.getByTestId('Border Color').click().get('[data-value="border_blue"]').should('exist').click();
+ cy.getByTestId('Label Color').click();
+ cy.getByTestId('option-color_dark').should('exist').click();
+ cy.getByTestId('Color').click();
+ cy.getByTestId('option-color_dark').should('exist').click();
+ cy.getByTestId('Border Color').click();
+ cy.getByTestId('option-border_green').should('exist').click();
});
it('can select color from color palette in edge style properties', () => {
@@ -75,7 +79,6 @@ describe('/projects/:projectId/edit - Color Palette', () => {
cy.getByTestId('LinkedTo Edge-toggle').click();
cy.get('[title="diagram::EdgeStyle"]').click();
cy.getByTestId('Color').click();
- cy.contains('FixedColor color_blue').click();
+ cy.getByTestId('option-color_blue').should('exist').click();
});
});
-
diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml b/packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml
index eb46819d26..24806115e8 100644
--- a/packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml
+++ b/packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml
@@ -12,14 +12,14 @@
Obeo - initial API and implementation
-->
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
org.springframework.boot
spring-boot-starter-parent
3.1.2
-
+
org.eclipse.sirius
sirius-components-compatibility-emf
@@ -75,6 +75,11 @@
sirius-components-emf
2023.8.2
+
+ org.eclipse.sirius
+ sirius-components-widget-reference
+ 2023.8.2
+
org.springframework.boot
spring-boot-starter-test
diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MonoValuedNonContainmentReferenceIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MonoValuedNonContainmentReferenceIfDescriptionProvider.java
deleted file mode 100644
index dbd26b9787..0000000000
--- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MonoValuedNonContainmentReferenceIfDescriptionProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019, 2023 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.compatibility.emf.properties;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.sirius.components.compatibility.emf.properties.api.IPropertiesValidationProvider;
-import org.eclipse.sirius.components.compatibility.forms.WidgetIdProvider;
-import org.eclipse.sirius.components.core.api.IEditingContext;
-import org.eclipse.sirius.components.core.api.IObjectService;
-import org.eclipse.sirius.components.forms.components.SelectComponent;
-import org.eclipse.sirius.components.forms.description.IfDescription;
-import org.eclipse.sirius.components.forms.description.SelectDescription;
-import org.eclipse.sirius.components.representations.Failure;
-import org.eclipse.sirius.components.representations.IStatus;
-import org.eclipse.sirius.components.representations.Success;
-import org.eclipse.sirius.components.representations.VariableManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Provides the default description of the widget to use to support mono-valued non-containment reference.
- *
- * @author sbegaudeau
- */
-public class MonoValuedNonContainmentReferenceIfDescriptionProvider {
-
- private static final String ID_DESCRIPTION_ID = "MonoValued NonContainment Reference";
-
- private static final String SELECT_DESCRIPTION_ID = "Select";
-
- private final ComposedAdapterFactory composedAdapterFactory;
-
- private final IObjectService objectService;
-
- private final IPropertiesValidationProvider propertiesValidationProvider;
-
- private final Logger logger = LoggerFactory.getLogger(MonoValuedNonContainmentReferenceIfDescriptionProvider.class);
-
- private final Function semanticTargetIdProvider;
-
- public MonoValuedNonContainmentReferenceIfDescriptionProvider(ComposedAdapterFactory composedAdapterFactory, IObjectService objectService,
- IPropertiesValidationProvider propertiesValidationProvider, Function semanticTargetIdProvider) {
- this.composedAdapterFactory = Objects.requireNonNull(composedAdapterFactory);
- this.objectService = Objects.requireNonNull(objectService);
- this.propertiesValidationProvider = Objects.requireNonNull(propertiesValidationProvider);
- this.semanticTargetIdProvider = Objects.requireNonNull(semanticTargetIdProvider);
-
- }
-
- public IfDescription getIfDescription() {
- // @formatter:off
- return IfDescription.newIfDescription(ID_DESCRIPTION_ID)
- .targetObjectIdProvider(this.semanticTargetIdProvider)
- .predicate(this.getPredicate())
- .controlDescriptions(List.of(this.getSelectDescription()))
- .build();
- // @formatter:on
- }
-
- private Function getPredicate() {
- return variableManager -> {
- var optionalEReference = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EReference.class);
- return optionalEReference.filter(eReference -> {
- boolean isCandidate = true;
- isCandidate = isCandidate && !eReference.isMany();
- isCandidate = isCandidate && !eReference.isContainment();
- return isCandidate;
- }).isPresent();
- };
- }
-
- private SelectDescription getSelectDescription() {
- // @formatter:off
- return SelectDescription.newSelectDescription(SELECT_DESCRIPTION_ID)
- .targetObjectIdProvider(this.semanticTargetIdProvider)
- .idProvider(new WidgetIdProvider())
- .labelProvider(this.getLabelProvider())
- .valueProvider(this.getValueProvider())
- .optionsProvider(this.getOptionsProvider())
- .optionIdProvider(this.getOptionIdProvider())
- .optionLabelProvider(this.getOptionLabelProvider())
- .optionIconURLProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, Object.class).map(this.objectService::getImagePath).orElse(""))
- .newValueHandler(this.getNewValueHandler())
- .diagnosticsProvider(this.propertiesValidationProvider.getDiagnosticsProvider())
- .kindProvider(this.propertiesValidationProvider.getKindProvider())
- .messageProvider(this.propertiesValidationProvider.getMessageProvider())
- .build();
- // @formatter:on
- }
-
- private BiFunction getNewValueHandler() {
- return (variableManager, newValue) -> {
- var optionalEObject = variableManager.get(VariableManager.SELF, EObject.class);
- var optionalEReference = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EReference.class);
- var optionalEditingContext = variableManager.get(IEditingContext.EDITING_CONTEXT, IEditingContext.class);
-
- IStatus result = new Failure("");
- if (optionalEObject.isPresent() && optionalEReference.isPresent()) {
- EObject eObject = optionalEObject.get();
- EReference eReference = optionalEReference.get();
-
- if (newValue == null || newValue.isBlank()) {
- try {
- eObject.eUnset(eReference);
- result = new Success();
- } catch (IllegalArgumentException | ClassCastException | ArrayStoreException exception) {
- this.logger.warn(exception.getMessage(), exception);
- }
- } else {
- // @formatter:off
- var optionalNewValueToSet = optionalEditingContext.flatMap(context -> this.objectService.getObject(context, newValue))
- .filter(EObject.class::isInstance)
- .map(EObject.class::cast);
- // @formatter:on
- if (optionalNewValueToSet.isPresent()) {
- EObject newValueToSet = optionalNewValueToSet.get();
- try {
- eObject.eSet(eReference, newValueToSet);
- result = new Success();
- } catch (IllegalArgumentException | ClassCastException | ArrayStoreException exception) {
- this.logger.warn(exception.getMessage(), exception);
- }
- }
- }
- }
- return result;
- };
- }
-
- private Function getLabelProvider() {
- return new EStructuralFeatureLabelProvider(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, this.composedAdapterFactory);
- }
-
- private Function getValueProvider() {
- return variableManager -> {
- Object object = variableManager.getVariables().get(VariableManager.SELF);
- Object eStructuralFeature = variableManager.getVariables().get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE);
-
- if (object instanceof EObject && eStructuralFeature instanceof EReference) {
- EObject eObject = (EObject) object;
- EReference eReference = (EReference) eStructuralFeature;
-
- Object value = eObject.eGet(eReference);
- if (value != null) {
- return this.objectService.getId(value);
- }
- }
- return null;
- };
- }
-
- private Function> getOptionsProvider() {
- return new EStructuralFeatureChoiceOfValueProvider(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, this.composedAdapterFactory);
- }
-
- private Function getOptionIdProvider() {
- return variableManager -> {
- Object object = variableManager.getVariables().get(SelectComponent.CANDIDATE_VARIABLE);
- String objectId = this.objectService.getId(object);
- return objectId;
- };
- }
-
- private Function getOptionLabelProvider() {
- return variableManager -> {
- Object object = variableManager.getVariables().get(SelectComponent.CANDIDATE_VARIABLE);
- String objectLabel = this.objectService.getFullLabel(object);
- return objectLabel;
- };
- }
-
-}
diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MultiValuedNonContainmentReferenceIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MultiValuedNonContainmentReferenceIfDescriptionProvider.java
deleted file mode 100644
index a3249c6620..0000000000
--- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MultiValuedNonContainmentReferenceIfDescriptionProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019, 2023 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.compatibility.emf.properties;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.sirius.components.compatibility.emf.properties.api.IPropertiesValidationProvider;
-import org.eclipse.sirius.components.compatibility.forms.WidgetIdProvider;
-import org.eclipse.sirius.components.core.api.IEditingContext;
-import org.eclipse.sirius.components.core.api.IObjectService;
-import org.eclipse.sirius.components.forms.components.SelectComponent;
-import org.eclipse.sirius.components.forms.description.IfDescription;
-import org.eclipse.sirius.components.forms.description.MultiSelectDescription;
-import org.eclipse.sirius.components.representations.Failure;
-import org.eclipse.sirius.components.representations.IStatus;
-import org.eclipse.sirius.components.representations.Success;
-import org.eclipse.sirius.components.representations.VariableManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Provides the default description of the widget to use to support multi-valued non-containment reference.
- *
- * @author sbegaudeau
- */
-public class MultiValuedNonContainmentReferenceIfDescriptionProvider {
-
- private static final String ID_DESCRIPTION_ID = "MultiValued NonContainment Reference";
-
- private static final String MULTI_SELECT_DESCRIPTION_ID = "MultiSelect";
-
- private final ComposedAdapterFactory composedAdapterFactory;
-
- private final IObjectService objectService;
-
- private final IPropertiesValidationProvider propertiesValidationProvider;
-
- private final Logger logger = LoggerFactory.getLogger(MultiValuedNonContainmentReferenceIfDescriptionProvider.class);
-
- private final Function semanticTargetIdProvider;
-
- public MultiValuedNonContainmentReferenceIfDescriptionProvider(ComposedAdapterFactory composedAdapterFactory, IObjectService objectService,
- IPropertiesValidationProvider propertiesValidationProvider, Function semanticTargetIdProvider) {
- this.composedAdapterFactory = Objects.requireNonNull(composedAdapterFactory);
- this.objectService = Objects.requireNonNull(objectService);
- this.propertiesValidationProvider = Objects.requireNonNull(propertiesValidationProvider);
- this.semanticTargetIdProvider = Objects.requireNonNull(semanticTargetIdProvider);
- }
-
- public IfDescription getIfDescription() {
- // @formatter:off
- return IfDescription.newIfDescription(ID_DESCRIPTION_ID)
- .targetObjectIdProvider(this.semanticTargetIdProvider)
- .predicate(this.getPredicate())
- .controlDescriptions(List.of(this.getMultiSelectDescription()))
- .build();
- // @formatter:on
- }
-
- private Function getPredicate() {
- return variableManager -> {
- var optionalEReference = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EReference.class);
- return optionalEReference.filter(eReference -> {
- boolean isCandidate = true;
- isCandidate = isCandidate && eReference.isMany();
- isCandidate = isCandidate && !eReference.isContainment();
- return isCandidate;
- }).isPresent();
- };
- }
-
- private MultiSelectDescription getMultiSelectDescription() {
- // @formatter:off
- return MultiSelectDescription.newMultiSelectDescription(MULTI_SELECT_DESCRIPTION_ID)
- .targetObjectIdProvider(this.semanticTargetIdProvider)
- .idProvider(new WidgetIdProvider())
- .labelProvider(this.getLabelProvider())
- .valuesProvider(this.getValuesProvider())
- .optionsProvider(this.getOptionsProvider())
- .optionIdProvider(this.getOptionIdProvider())
- .optionLabelProvider(this.getOptionLabelProvider())
- .optionIconURLProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, Object.class).map(this.objectService::getImagePath).orElse(""))
- .newValuesHandler(this.getNewValuesHandler())
- .diagnosticsProvider(this.propertiesValidationProvider.getDiagnosticsProvider())
- .kindProvider(this.propertiesValidationProvider.getKindProvider())
- .messageProvider(this.propertiesValidationProvider.getMessageProvider())
- .build();
- // @formatter:on
- }
-
- private BiFunction, IStatus> getNewValuesHandler() {
- return (variableManager, newValues) -> {
- IStatus status = new Failure("");
- var optionalEObject = variableManager.get(VariableManager.SELF, EObject.class);
- var optionalEReference = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EReference.class);
- var optionalEditingContext = variableManager.get(IEditingContext.EDITING_CONTEXT, IEditingContext.class);
-
- if (optionalEObject.isPresent() && optionalEReference.isPresent()) {
- EObject eObject = optionalEObject.get();
- EReference eReference = optionalEReference.get();
- EList refElements = (EList) eObject.eGet(eReference);
- List newValuesToSet = new ArrayList<>();
-
- for (String newValue : newValues) {
- // @formatter:off
- var optionalNewValueToSet = optionalEditingContext.flatMap(context -> this.objectService.getObject(context, newValue))
- .filter(EObject.class::isInstance)
- .map(EObject.class::cast);
- // @formatter:on
- if (optionalNewValueToSet.isPresent()) {
- EObject newValueToSet = optionalNewValueToSet.get();
- newValuesToSet.add(newValueToSet);
- try {
- if (!refElements.contains(newValueToSet)) {
- refElements.add(newValueToSet);
- }
- } catch (IllegalArgumentException | ClassCastException | ArrayStoreException exception) {
- this.logger.warn(exception.getMessage(), exception);
- }
- } else {
- this.logger.warn("The " + newValue + " cannot be retrieved and set to " + eReference.getName() + " of " + eObject.toString());
- }
- }
-
- refElements.removeIf(refElt -> !newValuesToSet.contains(refElt));
-
- status = new Success();
- }
- return status;
- };
- }
-
- private Function getLabelProvider() {
- return new EStructuralFeatureLabelProvider(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, this.composedAdapterFactory);
- }
-
- private Function> getValuesProvider() {
- return variableManager -> {
- Object object = variableManager.getVariables().get(VariableManager.SELF);
- Object eStructuralFeature = variableManager.getVariables().get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE);
-
- if (object instanceof EObject && eStructuralFeature instanceof EReference) {
- EObject eObject = (EObject) object;
- EReference eReference = (EReference) eStructuralFeature;
-
- Object value = eObject.eGet(eReference);
- if (value instanceof EList>) {
- return ((EList>) value).stream().map(this.objectService::getId).toList();
- }
- }
- return null;
- };
- }
-
- private Function> getOptionsProvider() {
- return new EStructuralFeatureChoiceOfValueProvider(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, this.composedAdapterFactory);
- }
-
- private Function getOptionIdProvider() {
- return variableManager -> {
- Object object = variableManager.getVariables().get(SelectComponent.CANDIDATE_VARIABLE);
- String objectId = this.objectService.getId(object);
- return objectId;
- };
- }
-
- private Function getOptionLabelProvider() {
- return variableManager -> {
- Object object = variableManager.getVariables().get(SelectComponent.CANDIDATE_VARIABLE);
- String objectLabel = this.objectService.getFullLabel(object);
- return objectLabel;
- };
- }
-
-}
diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/NonContainmentReferenceIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/NonContainmentReferenceIfDescriptionProvider.java
new file mode 100644
index 0000000000..c7c9338022
--- /dev/null
+++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/NonContainmentReferenceIfDescriptionProvider.java
@@ -0,0 +1,151 @@
+/*******************************************************************************
+ * Copyright (c) 2023 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.compatibility.emf.properties;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.sirius.components.compatibility.forms.WidgetIdProvider;
+import org.eclipse.sirius.components.core.api.IObjectService;
+import org.eclipse.sirius.components.forms.description.IfDescription;
+import org.eclipse.sirius.components.representations.VariableManager;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetComponent;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetDescription;
+
+/**
+ * Provides the default description of the widget to use to support non-containment reference.
+ *
+ * @author frouene
+ */
+public class NonContainmentReferenceIfDescriptionProvider {
+
+ private static final String ID_DESCRIPTION_ID = "NonContainment Reference";
+
+ private static final String REFERENCE_WIDGET_DESCRIPTION_ID = "ReferenceWidget";
+
+ private final ComposedAdapterFactory composedAdapterFactory;
+
+ private final IObjectService objectService;
+
+ private final Function semanticTargetIdProvider;
+
+ public NonContainmentReferenceIfDescriptionProvider(ComposedAdapterFactory composedAdapterFactory, IObjectService objectService, Function semanticTargetIdProvider) {
+ this.composedAdapterFactory = Objects.requireNonNull(composedAdapterFactory);
+ this.objectService = Objects.requireNonNull(objectService);
+ this.semanticTargetIdProvider = Objects.requireNonNull(semanticTargetIdProvider);
+ }
+
+ public IfDescription getIfDescription() {
+ return IfDescription.newIfDescription(ID_DESCRIPTION_ID)
+ .targetObjectIdProvider(this.semanticTargetIdProvider)
+ .predicate(this.getPredicate())
+ .controlDescriptions(List.of(this.getReferenceWidgetDescription()))
+ .build();
+ }
+
+ private Function getPredicate() {
+ return variableManager -> {
+ var optionalEReference = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EReference.class);
+ return optionalEReference.filter(eReference -> !eReference.isContainment()).isPresent();
+ };
+ }
+
+ private ReferenceWidgetDescription getReferenceWidgetDescription() {
+ return ReferenceWidgetDescription.newReferenceWidgetDescription(REFERENCE_WIDGET_DESCRIPTION_ID)
+ .targetObjectIdProvider(this.semanticTargetIdProvider)
+ .idProvider(new WidgetIdProvider())
+ .labelProvider(this.getLabelProvider())
+ .optionsProvider(this.getOptionsProvider())
+ .iconURLProvider(variableManager -> "")
+ .itemsProvider(this::getReferenceValue)
+ .itemIdProvider(this::getItemId)
+ .itemKindProvider(this::getItemKind)
+ .itemLabelProvider(this::getItemLabel)
+ .itemImageURLProvider(this::getItemIconURL)
+ .settingProvider(this::resolveSetting)
+ .styleProvider(variableManager -> null)
+ .ownerIdProvider(this::getOwnerId)
+ .diagnosticsProvider(variableManager -> List.of())
+ .kindProvider(object -> "")
+ .messageProvider(object -> "")
+ .build();
+ }
+
+ private List> getReferenceValue(VariableManager variableManager) {
+ List> value = List.of();
+ EStructuralFeature.Setting setting = this.resolveSetting(variableManager);
+ if (setting != null) {
+ var rawValue = setting.get(true);
+ if (setting.getEStructuralFeature().isMany()) {
+ value = (List>) rawValue;
+ } else if (rawValue != null) {
+ value = List.of(rawValue);
+ } else {
+ value = List.of();
+ }
+ }
+ return value;
+ }
+
+ private Function> getOptionsProvider() {
+ return new EStructuralFeatureChoiceOfValueProvider(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, this.composedAdapterFactory);
+ }
+
+ private EStructuralFeature.Setting resolveSetting(VariableManager variableManager) {
+ EObject referenceOwner = variableManager.get(VariableManager.SELF, EObject.class).orElse(null);
+ var optionalEReference = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EReference.class);
+
+ if (referenceOwner != null && optionalEReference.isPresent()) {
+ return ((InternalEObject) referenceOwner).eSetting(optionalEReference.get());
+ } else {
+ return null;
+ }
+ }
+
+ private Optional
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.checkstyle b/packages/forms/backend/sirius-components-collaborative-widget-reference/.checkstyle
new file mode 100644
index 0000000000..f62c550f18
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.checkstyle
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.classpath b/packages/forms/backend/sirius-components-collaborative-widget-reference/.classpath
new file mode 100644
index 0000000000..2a5a91b976
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.classpath
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.project b/packages/forms/backend/sirius-components-collaborative-widget-reference/.project
new file mode 100644
index 0000000000..541dc4580f
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.project
@@ -0,0 +1,34 @@
+
+
+ sirius-components-collaborative-widget-reference
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.springframework.ide.eclipse.boot.validation.springbootbuilder
+
+
+
+
+ net.sf.eclipsecs.core.CheckstyleBuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+ net.sf.eclipsecs.core.CheckstyleNature
+
+
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.core.resources.prefs b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..29abf99956
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/=UTF-8
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.core.runtime.prefs b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..a287fefdba
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,3 @@
+#Mon Sep 24 15:04:19 CEST 2007
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.apt.core.prefs b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000000..d4313d4b25
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.core.prefs b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..2ab93cd0a5
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,505 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
+org.eclipse.jdt.core.formatter.align_with_spaces=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assertion_message=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_record_components=16
+org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.text_block_indentation=0
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.ui.prefs b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..f789e687ad
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,210 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=true
+cleanup.always_use_this_for_non_static_method_access=true
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=false
+cleanup.qualify_static_method_accesses_with_declaring_class=true
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_modifiers=false
+cleanup.remove_redundant_semicolons=false
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=false
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=false
+cleanup_profile=_Sirius
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Sirius
+formatter_settings_version=21
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=com;fr;java;javax;org;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=/*******************************************************************************\n * Copyright (c) ${year} Obeo.\n * This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v2.0\n * which accompanies this distribution, and is available at\n * https\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier\: EPL-2.0\n *\n * Contributors\:\n * Obeo - initial API and implementation\n *******************************************************************************//**\n * @author ${user}\n *//**\n * \n *//**\n * ${tags}\n *//**\n * ${tags}\n * ${see_to_target}\n */${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}\n\n\n\n${exception_var}.printStackTrace();${body_statement}${body_statement}return ${field};${field} \= ${param};/**\n * @author ${user}\n *\n * ${tags}\n */\n
+sp_cleanup.add_all=false
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=true
+sp_cleanup.always_use_this_for_non_static_method_access=true
+sp_cleanup.array_with_curly=false
+sp_cleanup.arrays_fill=false
+sp_cleanup.bitwise_conditional_expression=false
+sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_value_rather_than_comparison=false
+sp_cleanup.break_loop=false
+sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
+sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
+sp_cleanup.convert_to_switch_expressions=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.do_while_rather_than_while=false
+sp_cleanup.double_negation=false
+sp_cleanup.else_if=false
+sp_cleanup.embedded_if=false
+sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.hash=false
+sp_cleanup.if_condition=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
+sp_cleanup.join=false
+sp_cleanup.lazy_logical_operator=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.map_cloning=false
+sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.no_string_creation=false
+sp_cleanup.no_super=false
+sp_cleanup.number_suffix=false
+sp_cleanup.objects_equals=false
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
+sp_cleanup.organize_imports=true
+sp_cleanup.overridden_assignment=false
+sp_cleanup.overridden_assignment_move_decl=false
+sp_cleanup.plain_replacement=false
+sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=false
+sp_cleanup.primitive_parsing=false
+sp_cleanup.primitive_rather_than_wrapper=false
+sp_cleanup.primitive_serialization=false
+sp_cleanup.pull_out_if_from_if_else=false
+sp_cleanup.pull_up_assignment=false
+sp_cleanup.push_down_negation=false
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
+sp_cleanup.redundant_falling_through_block_end=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_semicolons=false
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_method_parameters=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
+sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
+sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuffer_to_stringbuilder=false
+sp_cleanup.stringbuilder=false
+sp_cleanup.stringbuilder_for_local_vars=false
+sp_cleanup.stringconcat_to_textblock=false
+sp_cleanup.substring=false
+sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
+sp_cleanup.ternary_operator=false
+sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_directly_map_method=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false
+sp_cleanup.use_unboxing=false
+sp_cleanup.use_var=false
+sp_cleanup.useless_continue=false
+sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.m2e.core.prefs b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..96b30f9805
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=pom.xml
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.springframework.ide.eclipse.prefs b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.springframework.ide.eclipse.prefs
new file mode 100644
index 0000000000..a12794d68f
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/.settings/org.springframework.ide.eclipse.prefs
@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/README.adoc b/packages/forms/backend/sirius-components-collaborative-widget-reference/README.adoc
new file mode 100644
index 0000000000..873c5f226d
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/README.adoc
@@ -0,0 +1,9 @@
+= sirius-components-collaborative-widget-reference
+
+== Goal
+
+This project provides support for collaborative edition layer.
+
+== Dependencies
+
+- sirius-components-widget-reference
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/pom.xml b/packages/forms/backend/sirius-components-collaborative-widget-reference/pom.xml
new file mode 100644
index 0000000000..a11d473508
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/pom.xml
@@ -0,0 +1,140 @@
+
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 3.0.6
+
+
+ org.eclipse.sirius
+ sirius-components-collaborative-widget-reference
+ 2023.8.2
+ sirius-components-collaborative-widget-reference
+ Sirius Components Collaborative Forms :: Reference Widget
+
+
+ 17
+
+
+
+
+ github
+ Apache Maven Packages
+ https://maven.pkg.github.com/eclipse-sirius/sirius-components
+
+
+
+
+
+ org.springframework
+ spring-context
+
+
+ io.micrometer
+ micrometer-core
+
+
+ org.eclipse.sirius
+ sirius-components-widget-reference
+ 2023.8.2
+
+
+ org.eclipse.sirius
+ sirius-components-view-emf
+ 2023.8.2
+
+
+ org.eclipse.sirius
+ sirius-components-tests
+ 2023.8.2
+ test
+
+
+ org.eclipse.sirius
+ sirius-components-spring-tests
+ 2023.8.2
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ io.projectreactor
+ reactor-test
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ 3.2.0
+
+ ../../../releng/backend/sirius-components-resources/checkstyle/CheckstyleConfiguration.xml
+ true
+ true
+ true
+
+
+
+ validate
+ validate
+
+ check
+
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.8.10
+
+
+
+ prepare-agent
+
+
+
+ report
+ prepare-package
+
+ report
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+
+ jar
+
+
+
+
+
+
+
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceEMFConfiguration.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceEMFConfiguration.java
similarity index 95%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceEMFConfiguration.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceEMFConfiguration.java
index 88780c08ab..fa70e515cb 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceEMFConfiguration.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceEMFConfiguration.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference;
+package org.eclipse.sirius.components.collaborative.widget.reference;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EPackage;
@@ -28,6 +28,7 @@
*/
@Configuration
public class ReferenceEMFConfiguration {
+
@Bean
public EPackage referenceWidgetEPackage() {
return ReferencePackage.eINSTANCE;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescriptionConverterProvider.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterProvider.java
similarity index 96%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescriptionConverterProvider.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterProvider.java
index 43b82c0b14..1eb05d8c83 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescriptionConverterProvider.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterProvider.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference;
+package org.eclipse.sirius.components.collaborative.widget.reference;
import org.eclipse.emf.ecore.util.Switch;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java
similarity index 96%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java
index 812301580c..ae7943ea65 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference;
+package org.eclipse.sirius.components.collaborative.widget.reference;
import java.util.ArrayList;
import java.util.Arrays;
@@ -48,6 +48,9 @@
import org.eclipse.sirius.components.representations.VariableManager;
import org.eclipse.sirius.components.view.Operation;
import org.eclipse.sirius.components.view.emf.OperationInterpreter;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetComponent;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetStyle;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetStyleProvider;
import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription;
import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle;
import org.eclipse.sirius.components.widgets.reference.util.ReferenceSwitch;
@@ -110,7 +113,10 @@ public AbstractWidgetDescription caseReferenceWidgetDescription(ReferenceWidgetD
.itemImageURLProvider(this::getItemIconURL)
.settingProvider(variableManager -> this.resolveSetting(referenceDescription, variableManager))
.ownerIdProvider(variableManager -> this.getOwnerId(referenceDescription, variableManager))
- .styleProvider(styleProvider);
+ .styleProvider(styleProvider)
+ .diagnosticsProvider(variableManager -> List.of())
+ .kindProvider(object -> "")
+ .messageProvider(object -> "");
if (referenceDescription.getHelpExpression() != null && !referenceDescription.getHelpExpression().isBlank()) {
builder.helpTextProvider(this.getStringValueProvider(referenceDescription.getHelpExpression()));
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/browser/ModelBrowserTreePathProvider.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowserTreePathProvider.java
similarity index 98%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/browser/ModelBrowserTreePathProvider.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowserTreePathProvider.java
index 442767cce9..af92cf57e1 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/browser/ModelBrowserTreePathProvider.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowserTreePathProvider.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.browser;
+package org.eclipse.sirius.components.collaborative.widget.reference.browser;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/browser/ModelBrowsersDescriptionProvider.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowsersDescriptionProvider.java
similarity index 99%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/browser/ModelBrowsersDescriptionProvider.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowsersDescriptionProvider.java
index 91c0f0173c..d4b6f8882e 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/browser/ModelBrowsersDescriptionProvider.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/browser/ModelBrowsersDescriptionProvider.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.browser;
+package org.eclipse.sirius.components.collaborative.widget.reference.browser;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/MutationClickReferenceValueDataFetcher.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/MutationClickReferenceValueDataFetcher.java
similarity index 93%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/MutationClickReferenceValueDataFetcher.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/MutationClickReferenceValueDataFetcher.java
index fac1ba46c1..dd1ed5d381 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/MutationClickReferenceValueDataFetcher.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/MutationClickReferenceValueDataFetcher.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.datafetchers;
+package org.eclipse.sirius.components.collaborative.widget.reference.datafetchers;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,11 +18,11 @@
import java.util.concurrent.CompletableFuture;
import org.eclipse.sirius.components.annotations.spring.graphql.MutationDataFetcher;
+import org.eclipse.sirius.components.collaborative.widget.reference.dto.ClickReferenceValueInput;
import org.eclipse.sirius.components.core.api.IPayload;
import org.eclipse.sirius.components.graphql.api.IDataFetcherWithFieldCoordinates;
import org.eclipse.sirius.components.graphql.api.IEditingContextDispatcher;
import org.eclipse.sirius.components.graphql.api.IExceptionWrapper;
-import org.eclipse.sirius.components.widget.reference.dto.ClickReferenceValueInput;
import graphql.schema.DataFetchingEnvironment;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/MutationEditReferenceDataFetcher.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/MutationEditReferenceDataFetcher.java
similarity index 93%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/MutationEditReferenceDataFetcher.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/MutationEditReferenceDataFetcher.java
index 5f273fed2f..8c931297fd 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/MutationEditReferenceDataFetcher.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/MutationEditReferenceDataFetcher.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.datafetchers;
+package org.eclipse.sirius.components.collaborative.widget.reference.datafetchers;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,11 +18,11 @@
import java.util.concurrent.CompletableFuture;
import org.eclipse.sirius.components.annotations.spring.graphql.MutationDataFetcher;
+import org.eclipse.sirius.components.collaborative.widget.reference.dto.EditReferenceInput;
import org.eclipse.sirius.components.core.api.IPayload;
import org.eclipse.sirius.components.graphql.api.IDataFetcherWithFieldCoordinates;
import org.eclipse.sirius.components.graphql.api.IEditingContextDispatcher;
import org.eclipse.sirius.components.graphql.api.IExceptionWrapper;
-import org.eclipse.sirius.components.widget.reference.dto.EditReferenceInput;
import graphql.schema.DataFetchingEnvironment;
@@ -33,6 +33,7 @@
*/
@MutationDataFetcher(type = "Mutation", field = "editReference")
public class MutationEditReferenceDataFetcher implements IDataFetcherWithFieldCoordinates> {
+
private static final String INPUT_ARGUMENT = "input";
private final ObjectMapper objectMapper;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceValueHasClickActionDataFetcher.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceValueHasClickActionDataFetcher.java
similarity index 93%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceValueHasClickActionDataFetcher.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceValueHasClickActionDataFetcher.java
index a1dc0e39f8..401a012a8d 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceValueHasClickActionDataFetcher.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceValueHasClickActionDataFetcher.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.datafetchers;
+package org.eclipse.sirius.components.collaborative.widget.reference.datafetchers;
import org.eclipse.sirius.components.annotations.spring.graphql.QueryDataFetcher;
import org.eclipse.sirius.components.graphql.api.IDataFetcherWithFieldCoordinates;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceValueIconURLDataFetcher.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceValueIconURLDataFetcher.java
similarity index 95%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceValueIconURLDataFetcher.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceValueIconURLDataFetcher.java
index c504fed89c..733dd39df6 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceValueIconURLDataFetcher.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceValueIconURLDataFetcher.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.datafetchers;
+package org.eclipse.sirius.components.collaborative.widget.reference.datafetchers;
import org.eclipse.sirius.components.annotations.spring.graphql.QueryDataFetcher;
import org.eclipse.sirius.components.graphql.api.IDataFetcherWithFieldCoordinates;
@@ -29,6 +29,7 @@
*/
@QueryDataFetcher(type = "ReferenceValue", field = "iconURL")
public class ReferenceValueIconURLDataFetcher implements IDataFetcherWithFieldCoordinates {
+
@Override
public String get(DataFetchingEnvironment environment) throws Exception {
ReferenceValue item = environment.getSource();
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceWidgetReferenceDataFetcher.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceWidgetReferenceDataFetcher.java
similarity index 96%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceWidgetReferenceDataFetcher.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceWidgetReferenceDataFetcher.java
index 5b4e263681..37b927676a 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/datafetchers/ReferenceWidgetReferenceDataFetcher.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/datafetchers/ReferenceWidgetReferenceDataFetcher.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.datafetchers;
+package org.eclipse.sirius.components.collaborative.widget.reference.datafetchers;
import java.util.Objects;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/dto/ClickReferenceValueInput.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/dto/ClickReferenceValueInput.java
similarity index 93%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/dto/ClickReferenceValueInput.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/dto/ClickReferenceValueInput.java
index f7ed2abbca..12e7aaf458 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/dto/ClickReferenceValueInput.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/dto/ClickReferenceValueInput.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.dto;
+package org.eclipse.sirius.components.collaborative.widget.reference.dto;
import java.util.UUID;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/dto/EditReferenceInput.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/dto/EditReferenceInput.java
similarity index 92%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/dto/EditReferenceInput.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/dto/EditReferenceInput.java
index 9e14498771..fb68ccb956 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/dto/EditReferenceInput.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/dto/EditReferenceInput.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.dto;
+package org.eclipse.sirius.components.collaborative.widget.reference.dto;
import java.util.List;
import java.util.UUID;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/handlers/ClickReferenceValueEventHandler.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/ClickReferenceValueEventHandler.java
similarity index 96%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/handlers/ClickReferenceValueEventHandler.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/ClickReferenceValueEventHandler.java
index 71b8726751..45131c0682 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/handlers/ClickReferenceValueEventHandler.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/ClickReferenceValueEventHandler.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.handlers;
+package org.eclipse.sirius.components.collaborative.widget.reference.handlers;
import java.util.Collection;
import java.util.Objects;
@@ -22,6 +22,7 @@
import org.eclipse.sirius.components.collaborative.forms.api.IFormInput;
import org.eclipse.sirius.components.collaborative.forms.api.IFormQueryService;
import org.eclipse.sirius.components.collaborative.forms.messages.ICollaborativeFormMessageService;
+import org.eclipse.sirius.components.collaborative.widget.reference.dto.ClickReferenceValueInput;
import org.eclipse.sirius.components.core.api.ErrorPayload;
import org.eclipse.sirius.components.core.api.IEditingContext;
import org.eclipse.sirius.components.core.api.IPayload;
@@ -32,7 +33,6 @@
import org.eclipse.sirius.components.representations.Success;
import org.eclipse.sirius.components.widget.reference.ReferenceValue;
import org.eclipse.sirius.components.widget.reference.ReferenceWidget;
-import org.eclipse.sirius.components.widget.reference.dto.ClickReferenceValueInput;
import org.springframework.stereotype.Service;
import io.micrometer.core.instrument.Counter;
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/handlers/EditReferenceEventHandler.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/EditReferenceEventHandler.java
similarity index 97%
rename from packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/handlers/EditReferenceEventHandler.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/EditReferenceEventHandler.java
index 7d35de55b3..b6bfa10510 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/handlers/EditReferenceEventHandler.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/EditReferenceEventHandler.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.handlers;
+package org.eclipse.sirius.components.collaborative.widget.reference.handlers;
import java.util.List;
import java.util.Objects;
@@ -23,6 +23,7 @@
import org.eclipse.sirius.components.collaborative.forms.api.IFormInput;
import org.eclipse.sirius.components.collaborative.forms.api.IFormQueryService;
import org.eclipse.sirius.components.collaborative.forms.messages.ICollaborativeFormMessageService;
+import org.eclipse.sirius.components.collaborative.widget.reference.dto.EditReferenceInput;
import org.eclipse.sirius.components.core.api.ErrorPayload;
import org.eclipse.sirius.components.core.api.IEditingContext;
import org.eclipse.sirius.components.core.api.IObjectService;
@@ -33,7 +34,6 @@
import org.eclipse.sirius.components.representations.IStatus;
import org.eclipse.sirius.components.representations.Success;
import org.eclipse.sirius.components.widget.reference.ReferenceWidget;
-import org.eclipse.sirius.components.widget.reference.dto.EditReferenceInput;
import org.springframework.stereotype.Service;
import io.micrometer.core.instrument.Counter;
@@ -48,6 +48,7 @@
*/
@Service
public class EditReferenceEventHandler implements IFormEventHandler {
+
private final IFormQueryService formQueryService;
private final ICollaborativeFormMessageService messageService;
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/resources/.gitkeep b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/main/resources/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/ArchitectureConstants.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/ArchitectureConstants.java
new file mode 100644
index 0000000000..e7415f9002
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/ArchitectureConstants.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2023 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.collaborative.widget.reference.architecture;
+
+import com.tngtech.archunit.core.domain.JavaClasses;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.core.importer.ImportOption;
+
+/**
+ * Constants shared across multiple tests.
+ *
+ * @author frouene
+ */
+public final class ArchitectureConstants {
+
+ public static final String SIRIUS_COMPONENTS_COLLABORATIVE_FORMS_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.widget.reference..";
+
+ // @formatter:off
+ public static final JavaClasses CLASSES = new ClassFileImporter()
+ .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_JARS)
+ .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS)
+ .importPackages(SIRIUS_COMPONENTS_COLLABORATIVE_FORMS_ROOT_PACKAGE);
+ // @formatter:on
+
+ private ArchitectureConstants() {
+ // Prevent instantiation
+ }
+}
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/CodingRulesTests.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/CodingRulesTests.java
new file mode 100644
index 0000000000..8eca4837df
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/CodingRulesTests.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2023 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.collaborative.widget.reference.architecture;
+
+import com.tngtech.archunit.core.domain.JavaClasses;
+
+import org.eclipse.sirius.components.tests.architecture.AbstractCodingRulesTests;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Coding rules tests.
+ *
+ * @author frouene
+ */
+public class CodingRulesTests extends AbstractCodingRulesTests {
+
+ @Override
+ protected String getProjectRootPackage() {
+ return ArchitectureConstants.SIRIUS_COMPONENTS_COLLABORATIVE_FORMS_ROOT_PACKAGE;
+ }
+
+ @Override
+ protected JavaClasses getClasses() {
+ return ArchitectureConstants.CLASSES;
+ }
+
+ @Test
+ @Override
+ public void noClassesShouldUseApacheCommons() {
+ super.noClassesShouldUseApacheCommons();
+ }
+}
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/SpringCodingRulesTests.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/SpringCodingRulesTests.java
new file mode 100644
index 0000000000..82ea3f5d5e
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/architecture/SpringCodingRulesTests.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2023 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.collaborative.widget.reference.architecture;
+
+import com.tngtech.archunit.core.domain.JavaClasses;
+
+import org.eclipse.sirius.components.spring.tests.architecture.AbstractSpringCodingRulesTests;
+
+/**
+ * Spring coding rules tests.
+ *
+ * @author frouene
+ */
+public class SpringCodingRulesTests extends AbstractSpringCodingRulesTests {
+
+ @Override
+ protected String getProjectRootPackage() {
+ return ArchitectureConstants.SIRIUS_COMPONENTS_COLLABORATIVE_FORMS_ROOT_PACKAGE;
+ }
+
+ @Override
+ protected JavaClasses getClasses() {
+ return ArchitectureConstants.CLASSES;
+ }
+
+}
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/handlers/ClickReferenceValueEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/ClickReferenceValueEventHandlerTests.java
similarity index 98%
rename from packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/handlers/ClickReferenceValueEventHandlerTests.java
rename to packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/ClickReferenceValueEventHandlerTests.java
index fc70764761..75506a0b5c 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/handlers/ClickReferenceValueEventHandlerTests.java
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/java/org/eclipse/sirius/components/collaborative/widget/reference/handlers/ClickReferenceValueEventHandlerTests.java
@@ -10,7 +10,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.components.widget.reference.handlers;
+package org.eclipse.sirius.components.collaborative.widget.reference.handlers;
import static org.assertj.core.api.Assertions.assertThat;
@@ -31,6 +31,7 @@
import org.eclipse.sirius.components.collaborative.api.ChangeKind;
import org.eclipse.sirius.components.collaborative.forms.api.IFormQueryService;
import org.eclipse.sirius.components.collaborative.forms.messages.ICollaborativeFormMessageService;
+import org.eclipse.sirius.components.collaborative.widget.reference.dto.ClickReferenceValueInput;
import org.eclipse.sirius.components.core.api.ErrorPayload;
import org.eclipse.sirius.components.core.api.IEditingContext;
import org.eclipse.sirius.components.core.api.IPayload;
@@ -44,7 +45,6 @@
import org.eclipse.sirius.components.representations.Success;
import org.eclipse.sirius.components.widget.reference.ReferenceValue;
import org.eclipse.sirius.components.widget.reference.ReferenceWidget;
-import org.eclipse.sirius.components.widget.reference.dto.ClickReferenceValueInput;
import org.junit.jupiter.api.Test;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/resources/logback-test.xml b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..122c46e103
--- /dev/null
+++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/src/test/resources/logback-test.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/packages/forms/backend/sirius-components-widget-reference/pom.xml b/packages/forms/backend/sirius-components-widget-reference/pom.xml
index af938b3d6f..0a8b664999 100644
--- a/packages/forms/backend/sirius-components-widget-reference/pom.xml
+++ b/packages/forms/backend/sirius-components-widget-reference/pom.xml
@@ -12,14 +12,14 @@
Obeo - initial API and implementation
-->
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
org.springframework.boot
spring-boot-starter-parent
3.1.2
-
+
org.eclipse.sirius
sirius-components-widget-reference
@@ -59,11 +59,6 @@
sirius-components-forms
2023.8.2
-
- org.eclipse.sirius
- sirius-components-view-emf
- 2023.8.2
-
org.eclipse.sirius
sirius-components-view-form
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescription.java b/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescription.java
index b684e39092..bcf092f3b4 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescription.java
+++ b/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetDescription.java
@@ -164,6 +164,12 @@ public static final class Builder {
private Function ownerIdProvider;
+ private Function> diagnosticsProvider;
+
+ private Function kindProvider;
+
+ private Function messageProvider;
+
private Builder(String id) {
this.id = Objects.requireNonNull(id);
}
@@ -248,6 +254,21 @@ public Builder ownerIdProvider(Function ownerIdProvider
return this;
}
+ public Builder diagnosticsProvider(Function> diagnosticsProvider) {
+ this.diagnosticsProvider = Objects.requireNonNull(diagnosticsProvider);
+ return this;
+ }
+
+ public Builder kindProvider(Function kindProvider) {
+ this.kindProvider = Objects.requireNonNull(kindProvider);
+ return this;
+ }
+
+ public Builder messageProvider(Function messageProvider) {
+ this.messageProvider = Objects.requireNonNull(messageProvider);
+ return this;
+ }
+
public ReferenceWidgetDescription build() {
ReferenceWidgetDescription referenceWidgetDescription = new ReferenceWidgetDescription();
referenceWidgetDescription.id = Objects.requireNonNull(this.id);
@@ -267,6 +288,9 @@ public ReferenceWidgetDescription build() {
referenceWidgetDescription.itemClickHandlerProvider = this.itemClickHandlerProvider; // Optional on purpose
referenceWidgetDescription.styleProvider = Objects.requireNonNull(this.styleProvider);
referenceWidgetDescription.ownerIdProvider = Objects.requireNonNull(this.ownerIdProvider);
+ referenceWidgetDescription.diagnosticsProvider = Objects.requireNonNull(this.diagnosticsProvider);
+ referenceWidgetDescription.kindProvider = Objects.requireNonNull(this.kindProvider);
+ referenceWidgetDescription.messageProvider = Objects.requireNonNull(this.messageProvider);
return referenceWidgetDescription;
}
}
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetPreviewConverterProvider.java b/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetPreviewConverterProvider.java
index be37c558d2..708f29c49f 100644
--- a/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetPreviewConverterProvider.java
+++ b/packages/forms/backend/sirius-components-widget-reference/src/main/java/org/eclipse/sirius/components/widget/reference/ReferenceWidgetPreviewConverterProvider.java
@@ -44,38 +44,45 @@ public AbstractWidgetDescription caseReferenceWidgetDescription(org.eclipse.siri
VariableManager childVariableManager = variableManager.createChild();
childVariableManager.put(VariableManager.SELF, referenceDescription);
String id = formDescriptionEditorDescription.getTargetObjectIdProvider().apply(childVariableManager);
- var builder = ReferenceWidgetDescription.newReferenceWidgetDescription(UUID.randomUUID().toString())
- .idProvider(vm -> id)
- .targetObjectIdProvider(vm -> "")
- .labelProvider(vm -> ReferenceWidgetPreviewConverterProvider.this.getWidgetLabel(referenceDescription, "Reference"))
- .iconURLProvider(variableManager -> "")
- .isReadOnlyProvider(variableManager -> false)
- .itemsProvider(variableManager -> List.of())
- .optionsProvider(variableManager -> List.of())
- .itemIdProvider(variableManager -> "")
- .itemKindProvider(variableManager -> "")
- .itemLabelProvider(variableManager -> "")
- .itemKindProvider(variableManager -> "")
- .itemLabelProvider(variableManager -> "")
- .itemImageURLProvider(variableManager -> "")
- .settingProvider(variableManager -> {
- // We need a non-null Setting instance which does not depend on any actual instance model.
- EObject owner = EcorePackage.Literals.ECLASS;
- return ((InternalEObject) owner).eSetting(EcorePackage.Literals.ECLASS__EALL_STRUCTURAL_FEATURES);
- })
- .ownerIdProvider(variableManager -> "")
- .itemClickHandlerProvider(variableManager -> new Success())
- .styleProvider(variableManager -> ReferenceWidgetPreviewConverterProvider.this.getWidgetStyle(referenceDescription, variableManager));
+ var builder = ReferenceWidgetPreviewConverterProvider.this.getReferenceWidgetDescriptionBuilder(referenceDescription, id);
if (referenceDescription.getHelpExpression() != null && !referenceDescription.getHelpExpression().isBlank()) {
String helpText = ReferenceWidgetPreviewConverterProvider.this.getWidgetHelpText(referenceDescription);
builder.helpTextProvider(variableManager -> helpText);
}
return builder.build();
}
-
};
}
+ public ReferenceWidgetDescription.Builder getReferenceWidgetDescriptionBuilder(org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription referenceDescription,
+ String id) {
+ return ReferenceWidgetDescription.newReferenceWidgetDescription(UUID.randomUUID().toString())
+ .idProvider(vm -> id)
+ .targetObjectIdProvider(vm -> "")
+ .labelProvider(vm -> this.getWidgetLabel(referenceDescription, "Reference"))
+ .iconURLProvider(variableManager -> "")
+ .isReadOnlyProvider(variableManager -> false)
+ .itemsProvider(variableManager -> List.of())
+ .optionsProvider(variableManager -> List.of())
+ .itemIdProvider(variableManager -> "")
+ .itemKindProvider(variableManager -> "")
+ .itemLabelProvider(variableManager -> "")
+ .itemKindProvider(variableManager -> "")
+ .itemLabelProvider(variableManager -> "")
+ .itemImageURLProvider(variableManager -> "")
+ .settingProvider(variableManager -> {
+ // We need a non-null Setting instance which does not depend on any actual instance model.
+ EObject owner = EcorePackage.Literals.ECLASS;
+ return ((InternalEObject) owner).eSetting(EcorePackage.Literals.ECLASS__EALL_STRUCTURAL_FEATURES);
+ })
+ .ownerIdProvider(variableManager -> "")
+ .itemClickHandlerProvider(variableManager -> new Success())
+ .styleProvider(variableManager -> ReferenceWidgetPreviewConverterProvider.this.getWidgetStyle(referenceDescription, variableManager))
+ .diagnosticsProvider(variableManager -> List.of())
+ .kindProvider(object -> "")
+ .messageProvider(object -> "");
+ }
+
public String getWidgetLabel(org.eclipse.sirius.components.view.form.WidgetDescription widgetDescription, String defaultLabel) {
String widgetLabel = defaultLabel;
String name = widgetDescription.getName();
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/ArchitectureConstants.java b/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/ArchitectureConstants.java
new file mode 100644
index 0000000000..29858513a7
--- /dev/null
+++ b/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/ArchitectureConstants.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2023 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.widget.reference.architecture;
+
+import com.tngtech.archunit.core.domain.JavaClasses;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.core.importer.ImportOption;
+
+/**
+ * Constants shared across multiple tests.
+ *
+ * @author frouene
+ */
+public final class ArchitectureConstants {
+
+ public static final String SIRIUS_COMPONENTS_FORMS_ROOT_PACKAGE = "org.eclipse.sirius.components.widget.reference..";
+
+ // @formatter:off
+ public static final JavaClasses CLASSES = new ClassFileImporter()
+ .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_JARS)
+ .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS)
+ .importPackages(SIRIUS_COMPONENTS_FORMS_ROOT_PACKAGE);
+ // @formatter:on
+
+ private ArchitectureConstants() {
+ // Prevent instantiation
+ }
+}
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/CodingRulesTests.java b/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/CodingRulesTests.java
new file mode 100644
index 0000000000..05d8ba8dc3
--- /dev/null
+++ b/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/CodingRulesTests.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2023 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.widget.reference.architecture;
+
+import com.tngtech.archunit.core.domain.JavaClasses;
+
+import org.eclipse.sirius.components.tests.architecture.AbstractCodingRulesTests;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Coding rules tests.
+ *
+ * @author frouene
+ */
+public class CodingRulesTests extends AbstractCodingRulesTests {
+
+ @Override
+ protected String getProjectRootPackage() {
+ return ArchitectureConstants.SIRIUS_COMPONENTS_FORMS_ROOT_PACKAGE;
+ }
+
+ @Override
+ protected JavaClasses getClasses() {
+ return ArchitectureConstants.CLASSES;
+ }
+
+ @Test
+ @Override
+ public void noClassesShouldUseApacheCommons() {
+ super.noClassesShouldUseApacheCommons();
+ }
+
+}
diff --git a/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/ImmutableTests.java b/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/ImmutableTests.java
new file mode 100644
index 0000000000..9850b55364
--- /dev/null
+++ b/packages/forms/backend/sirius-components-widget-reference/src/test/java/org/eclipse/sirius/components/widget/reference/architecture/ImmutableTests.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2023 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.widget.reference.architecture;
+
+import com.tngtech.archunit.core.domain.JavaClasses;
+
+import org.eclipse.sirius.components.tests.architecture.AbstractImmutableTests;
+
+/**
+ * Immutable tests.
+ *
+ * @author frouene
+ */
+public class ImmutableTests extends AbstractImmutableTests {
+
+ @Override
+ protected String getProjectRootPackage() {
+ return ArchitectureConstants.SIRIUS_COMPONENTS_FORMS_ROOT_PACKAGE;
+ }
+
+ @Override
+ protected JavaClasses getClasses() {
+ return ArchitectureConstants.CLASSES;
+ }
+
+}
diff --git a/packages/sirius-web/backend/sirius-web-sample-application/pom.xml b/packages/sirius-web/backend/sirius-web-sample-application/pom.xml
index d4816f5791..cca6d4263a 100644
--- a/packages/sirius-web/backend/sirius-web-sample-application/pom.xml
+++ b/packages/sirius-web/backend/sirius-web-sample-application/pom.xml
@@ -189,7 +189,13 @@
sirius-components-widget-reference
2023.8.2
- org.eclipse.sirius
+
+ org.eclipse.sirius
+ sirius-components-collaborative-widget-reference
+ 2023.8.2
+
+
+ org.eclipse.sirius
sirius-components-forms-tests
2023.8.2
test
diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewPropertiesDescriptionRegistryConfigurer.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewPropertiesDescriptionRegistryConfigurer.java
index 61c3e0a0d6..c9dfef42a9 100644
--- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewPropertiesDescriptionRegistryConfigurer.java
+++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewPropertiesDescriptionRegistryConfigurer.java
@@ -33,8 +33,7 @@
import org.eclipse.sirius.components.compatibility.emf.properties.EBooleanIfDescriptionProvider;
import org.eclipse.sirius.components.compatibility.emf.properties.EEnumIfDescriptionProvider;
import org.eclipse.sirius.components.compatibility.emf.properties.EStringIfDescriptionProvider;
-import org.eclipse.sirius.components.compatibility.emf.properties.MonoValuedNonContainmentReferenceIfDescriptionProvider;
-import org.eclipse.sirius.components.compatibility.emf.properties.MultiValuedNonContainmentReferenceIfDescriptionProvider;
+import org.eclipse.sirius.components.compatibility.emf.properties.NonContainmentReferenceIfDescriptionProvider;
import org.eclipse.sirius.components.compatibility.emf.properties.NumberIfDescriptionProvider;
import org.eclipse.sirius.components.compatibility.emf.properties.api.IPropertiesValidationProvider;
import org.eclipse.sirius.components.core.api.IObjectService;
@@ -194,8 +193,7 @@ public boolean handles(EAttribute eAttribute) {
ifDescriptions.add(new EBooleanIfDescriptionProvider(this.composedAdapterFactory, this.propertiesValidationProvider, this.semanticTargetIdProvider).getIfDescription());
ifDescriptions.add(new EEnumIfDescriptionProvider(this.composedAdapterFactory, this.propertiesValidationProvider, this.semanticTargetIdProvider).getIfDescription());
- ifDescriptions.add(new MonoValuedNonContainmentReferenceIfDescriptionProvider(this.composedAdapterFactory, this.objectService, this.propertiesValidationProvider, this.semanticTargetIdProvider).getIfDescription());
- ifDescriptions.add(new MultiValuedNonContainmentReferenceIfDescriptionProvider(this.composedAdapterFactory, this.objectService, this.propertiesValidationProvider, this.semanticTargetIdProvider).getIfDescription());
+ ifDescriptions.add(new NonContainmentReferenceIfDescriptionProvider(this.composedAdapterFactory, this.objectService, this.semanticTargetIdProvider).getIfDescription());
var numericDataTypes = List.of(
EcorePackage.Literals.EINT,
@@ -209,7 +207,7 @@ public boolean handles(EAttribute eAttribute) {
EcorePackage.Literals.ESHORT,
EcorePackage.Literals.ESHORT_OBJECT,
ViewPackage.Literals.LENGTH
- );
+ );
for (var dataType : numericDataTypes) {
ifDescriptions.add(new NumberIfDescriptionProvider(dataType, this.composedAdapterFactory, this.propertiesValidationProvider, this.emfMessageService, this.semanticTargetIdProvider).getIfDescription());
}
diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/NodeStylePropertiesConfigurer.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/NodeStylePropertiesConfigurer.java
index 81536ee08b..86872c73fa 100644
--- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/NodeStylePropertiesConfigurer.java
+++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/NodeStylePropertiesConfigurer.java
@@ -27,6 +27,9 @@
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.domain.EditingDomain;
@@ -65,6 +68,8 @@
import org.eclipse.sirius.components.view.emf.AQLTextfieldCustomizer;
import org.eclipse.sirius.components.view.emf.CustomImageMetadata;
import org.eclipse.sirius.components.view.emf.ICustomImageMetadataSearchService;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetComponent;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetDescription;
import org.springframework.stereotype.Component;
/**
@@ -174,20 +179,11 @@ private List getGeneralControlDescription() {
style -> ((NodeStyleDescription) style).isShowIcon(),
(style, newValue) -> ((NodeStyleDescription) style).setShowIcon(newValue),
DiagramPackage.Literals.NODE_STYLE_DESCRIPTION__SHOW_ICON),
- this.createUserColorSelectionField("nodestyle.labelColor", "Label Color", DiagramPackage.Literals.NODE_STYLE_DESCRIPTION__LABEL_COLOR
- , NodeStyleDescription.class
- , NodeStyleDescription::getLabelColor
- , NodeStyleDescription::setLabelColor),
- this.createUserColorSelectionField("nodestyle.color", "Color", DiagramPackage.Literals.STYLE__COLOR
- , NodeStyleDescription.class
- , NodeStyleDescription::getColor
- , NodeStyleDescription::setColor),
- this.createUserColorSelectionField("nodestyle.borderColor"
+ this.createUserColorReferenceWidget("nodestyle.labelColor", "Label Color", DiagramPackage.Literals.NODE_STYLE_DESCRIPTION__LABEL_COLOR),
+ this.createUserColorReferenceWidget("nodestyle.color", "Color", DiagramPackage.Literals.STYLE__COLOR),
+ this.createUserColorReferenceWidget("nodestyle.borderColor"
, "Border Color"
- , DiagramPackage.Literals.BORDER_STYLE__BORDER_COLOR
- , BorderStyle.class
- , BorderStyle::getBorderColor
- , BorderStyle::setBorderColor),
+ , DiagramPackage.Literals.BORDER_STYLE__BORDER_COLOR),
this.createTextField("nodestyle.borderRadius", "Border Radius",
style -> String.valueOf(((NodeStyleDescription) style).getBorderRadius()),
(style, newBorderRadius) -> {
@@ -369,59 +365,71 @@ private SelectDescription createBorderLineStyleSelectionField(String id, Object
// @formatter:on
}
- private SelectDescription createUserColorSelectionField(String id, String label, Object feature, Class styleType
- , Function colorGetter, BiConsumer colorSetter) {
- return SelectDescription.newSelectDescription(id)
- .idProvider(variableManager -> id)
- .targetObjectIdProvider(this.semanticTargetIdProvider)
- .labelProvider(variableManager -> label)
- .valueProvider(variableManager -> variableManager.get(VariableManager.SELF, styleType)
- .map(colorGetter)
- .map(UserColor::getName)
- .orElse(EMPTY))
- .optionsProvider(variableManager -> this.getColorsFromColorPalettesStream(variableManager).toList())
- .optionIdProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, UserColor.class)
- .map(UserColor::getName)
- .orElse(EMPTY))
- .optionLabelProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, UserColor.class)
- .map(UserColor::getName)
- .orElse(EMPTY))
- .optionIconURLProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, Object.class).map(this.objectService::getImagePath).orElse(""))
- .newValueHandler((variableManager, newValue) ->
- variableManager.get(VariableManager.SELF, styleType)
- .map((style) -> {
- if (newValue != null) {
- this.getColorsFromColorPalettesStream(variableManager)
- .filter(userColor -> newValue.equals(userColor.getName()))
- .findFirst()
- .ifPresentOrElse(userColor -> colorSetter.accept(style, userColor), () -> colorSetter.accept(style, null));
- }
- return new Success();
- }).orElseGet(() -> new Failure(""))
- )
- .diagnosticsProvider(this.getDiagnosticsProvider(feature))
- .kindProvider(this::kindProvider)
- .messageProvider(this::messageProvider)
- .build();
+ private ReferenceWidgetDescription createUserColorReferenceWidget(String id, String label, Object feature) {
+ return ReferenceWidgetDescription.newReferenceWidgetDescription(id)
+ .targetObjectIdProvider(this.semanticTargetIdProvider)
+ .idProvider(variableManager -> id)
+ .labelProvider(variableManager -> label)
+ .optionsProvider(variableManager -> this.getColorsFromColorPalettesStream(variableManager).toList())
+ .iconURLProvider(variableManager -> "")
+ .itemsProvider(variableManager -> this.getReferenceValue(variableManager, feature))
+ .itemIdProvider(variableManager -> this.getItem(variableManager).map(this.objectService::getId).orElse(""))
+ .itemKindProvider(variableManager -> this.getItem(variableManager).map(this.objectService::getKind).orElse(""))
+ .itemLabelProvider(variableManager -> this.getItem(variableManager).map(this.objectService::getLabel).orElse(""))
+ .itemImageURLProvider(variableManager -> this.getItem(variableManager).map(this.objectService::getImagePath).orElse(""))
+ .settingProvider(variableManager -> this.resolveSetting(variableManager, feature))
+ .styleProvider(variableManager -> null)
+ .ownerIdProvider(variableManager -> variableManager.get(VariableManager.SELF, EObject.class).map(this.objectService::getId).orElse(""))
+ .diagnosticsProvider(this.getDiagnosticsProvider(feature))
+ .kindProvider(this::kindProvider)
+ .messageProvider(this::messageProvider)
+ .build();
+ }
+
+ private Optional getItem(VariableManager variableManager) {
+ return variableManager.get(ReferenceWidgetComponent.ITEM_VARIABLE, Object.class);
+ }
+
+ private List> getReferenceValue(VariableManager variableManager, Object feature) {
+ List> value = List.of();
+ EStructuralFeature.Setting setting = this.resolveSetting(variableManager, feature);
+ if (setting != null) {
+ var rawValue = setting.get(true);
+ if (rawValue != null) {
+ value = List.of(rawValue);
+ } else {
+ value = List.of();
+ }
+ }
+ return value;
+ }
+
+ private EStructuralFeature.Setting resolveSetting(VariableManager variableManager, Object feature) {
+ EObject referenceOwner = variableManager.get(VariableManager.SELF, EObject.class).orElse(null);
+ if (referenceOwner != null && feature instanceof EReference reference) {
+ return ((InternalEObject) referenceOwner).eSetting(reference);
+ } else {
+ return null;
+ }
}
private Stream getColorsFromColorPalettesStream(VariableManager variableManager) {
return variableManager.get(IEditingContext.EDITING_CONTEXT, IEditingContext.class)
- .filter(EditingContext.class::isInstance)
- .map(EditingContext.class::cast)
- .map(EditingContext::getDomain)
- .map(EditingDomain::getResourceSet)
- .map(ResourceSet::getResources)
- .stream()
- .flatMap(EList::stream)
- .map(Resource::getContents)
- .flatMap(EList::stream)
- .filter(View.class::isInstance)
- .map(View.class::cast)
- .map(View::getColorPalettes)
- .flatMap(EList::stream)
- .map(ColorPalette::getColors)
- .flatMap(EList::stream);
+ .filter(EditingContext.class::isInstance)
+ .map(EditingContext.class::cast)
+ .map(EditingContext::getDomain)
+ .map(EditingDomain::getResourceSet)
+ .map(ResourceSet::getResources)
+ .stream()
+ .flatMap(EList::stream)
+ .map(Resource::getContents)
+ .flatMap(EList::stream)
+ .filter(View.class::isInstance)
+ .map(View.class::cast)
+ .map(View::getColorPalettes)
+ .flatMap(EList::stream)
+ .map(ColorPalette::getColors)
+ .flatMap(EList::stream);
}
private SelectDescription createShapeSelectionField(Object feature) {