From 176d8bc48f49ace0060d74fcaf69bd13712367f6 Mon Sep 17 00:00:00 2001 From: Michael Charfadi Date: Fri, 15 Mar 2024 11:43:46 +0100 Subject: [PATCH] [3250] Change the reference widget generated code package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://github.com/eclipse-sirius/sirius-web/issues/3250 Signed-off-by: Michaƫl Charfadi --- CHANGELOG.adoc | 1 + .../ReferenceWidgetDescriptionProvider.java | 2 +- ...ferenceWidgetPreviewConverterProvider.java | 10 +-- .../DomainPropertiesConfigurer.java | 4 +- .../sirius-components-view-builder/pom.xml | 19 +++++ ...eferenceWidgetDescriptionStyleBuilder.java | 15 ++-- .../ReferenceWidgetDescriptionBuilder.java | 24 ++++-- ...eferenceWidgetDescriptionStyleBuilder.java | 15 ++-- .../tests/architecture/ViewBuilderTests.java | 44 ++++++++++ .../reference/ReferenceEMFConfiguration.java | 2 +- ...renceWidgetDescriptionConverterSwitch.java | 6 +- .../ReferenceWidgetStyleProvider.java | 2 +- ...nceWidgetDescriptionStyleItemProvider.java | 6 +- .../ReferenceItemProviderAdapterFactory.java | 19 +++-- ...eferenceWidgetDescriptionItemProvider.java | 8 +- ...nceWidgetDescriptionStyleItemProvider.java | 6 +- ...tionalReferenceWidgetDescriptionStyle.java | 4 +- .../widget}/reference/ReferenceFactory.java | 6 +- .../widget}/reference/ReferencePackage.java | 82 +++++++++---------- .../reference/ReferenceWidgetDescription.java | 30 +++---- .../ReferenceWidgetDescriptionStyle.java | 10 +-- ...alReferenceWidgetDescriptionStyleImpl.java | 20 ++--- .../reference/impl/ReferenceFactoryImpl.java | 12 +-- .../reference/impl/ReferencePackageImpl.java | 14 ++-- .../impl/ReferenceWidgetDescriptionImpl.java | 14 ++-- .../ReferenceWidgetDescriptionStyleImpl.java | 18 ++-- .../util/ReferenceAdapterFactory.java | 24 +++--- .../reference/util/ReferenceSwitch.java | 12 +-- .../main/resources/model/reference.genmodel | 4 +- scripts/check-coverage.jsh | 2 +- 30 files changed, 257 insertions(+), 178 deletions(-) create mode 100644 packages/view/backend/sirius-components-view-builder/src/test/java/org/eclipse/sirius/components/view/builder/tests/architecture/ViewBuilderTests.java rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/ConditionalReferenceWidgetDescriptionStyle.java (84%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/ReferenceFactory.java (89%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/ReferencePackage.java (82%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/ReferenceWidgetDescription.java (74%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/ReferenceWidgetDescriptionStyle.java (76%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/impl/ConditionalReferenceWidgetDescriptionStyleImpl.java (94%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/impl/ReferenceFactoryImpl.java (89%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/impl/ReferencePackageImpl.java (95%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/impl/ReferenceWidgetDescriptionImpl.java (96%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/impl/ReferenceWidgetDescriptionStyleImpl.java (94%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/util/ReferenceAdapterFactory.java (89%) rename packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/{widgets => view/widget}/reference/util/ReferenceSwitch.java (95%) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index ec0a32d4f3..d560898f3c 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -73,6 +73,7 @@ Having `Viewer` as a type did not bring any additional value and it created some - https://github.com/eclipse-sirius/sirius-web/issues/3096[#3096] [tree] `TreeConfiguration` has a new parameter `List activeFilterIds`. - https://github.com/eclipse-sirius/sirius-web/issues/3019[#3019] [form] Allow consumers of Sirius Components to reuse the reference widget without the form description editor or the view DSL. - https://github.com/eclipse-sirius/sirius-web/issues/3246[#3246] [view] Remove representation specific code from `ViewRepresentationDescriptionSearchService` +- https://github.com/eclipse-sirius/sirius-web/issues/3250[#3250] [form] Change the base package of the reference widget from `org.eclipse.sirius.components.widgets.reference` to `org.eclipse.sirius.components.widgets.reference.view` === Dependency update diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/reference/ReferenceWidgetDescriptionProvider.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/reference/ReferenceWidgetDescriptionProvider.java index 17ddbd4dad..3825d0e5c6 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/reference/ReferenceWidgetDescriptionProvider.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/reference/ReferenceWidgetDescriptionProvider.java @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.sirius.components.collaborative.widget.reference.ReferenceWidgetDescriptor; import org.eclipse.sirius.components.formdescriptioneditors.IWidgetDescriptionProvider; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; import org.springframework.stereotype.Service; /** diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/reference/ReferenceWidgetPreviewConverterProvider.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/reference/ReferenceWidgetPreviewConverterProvider.java index 8e94f6bda5..3765b7a07a 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/reference/ReferenceWidgetPreviewConverterProvider.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/reference/ReferenceWidgetPreviewConverterProvider.java @@ -24,8 +24,8 @@ import org.eclipse.sirius.components.view.emf.widget.reference.ReferenceWidgetStyleProvider; import org.eclipse.sirius.components.widget.reference.ReferenceWidgetDescription; import org.eclipse.sirius.components.widget.reference.ReferenceWidgetStyle; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle; -import org.eclipse.sirius.components.widgets.reference.util.ReferenceSwitch; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.util.ReferenceSwitch; import org.springframework.stereotype.Service; /** @@ -40,7 +40,7 @@ public class ReferenceWidgetPreviewConverterProvider implements IWidgetPreviewCo public Switch getWidgetConverter(FormDescriptionEditorDescription formDescriptionEditorDescription, VariableManager variableManager) { return new ReferenceSwitch<>() { @Override - public AbstractWidgetDescription caseReferenceWidgetDescription(org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription referenceDescription) { + public AbstractWidgetDescription caseReferenceWidgetDescription(org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription referenceDescription) { VariableManager childVariableManager = variableManager.createChild(); childVariableManager.put(VariableManager.SELF, referenceDescription); String id = formDescriptionEditorDescription.getTargetObjectIdProvider().apply(childVariableManager); @@ -54,7 +54,7 @@ public AbstractWidgetDescription caseReferenceWidgetDescription(org.eclipse.siri }; } - public ReferenceWidgetDescription.Builder getReferenceWidgetDescriptionBuilder(org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription referenceDescription, String id) { + public ReferenceWidgetDescription.Builder getReferenceWidgetDescriptionBuilder(org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription referenceDescription, String id) { return ReferenceWidgetDescription.newReferenceWidgetDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) .targetObjectIdProvider(vm -> "") @@ -107,7 +107,7 @@ public String getWidgetHelpText(org.eclipse.sirius.components.view.form.WidgetDe return helpText; } - private ReferenceWidgetStyle getWidgetStyle(org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription referenceDescription, VariableManager variableManager) { + private ReferenceWidgetStyle getWidgetStyle(org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription referenceDescription, VariableManager variableManager) { ReferenceWidgetDescriptionStyle style = referenceDescription.getStyle(); if (style == null) { return null; diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/DomainPropertiesConfigurer.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/DomainPropertiesConfigurer.java index d970f5da80..a0ceb3d9c2 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/DomainPropertiesConfigurer.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/DomainPropertiesConfigurer.java @@ -43,8 +43,8 @@ import org.eclipse.sirius.components.view.form.SelectDescription; import org.eclipse.sirius.components.view.form.TextfieldDescription; import org.eclipse.sirius.components.view.form.WidgetDescription; -import org.eclipse.sirius.components.widgets.reference.ReferenceFactory; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; import org.eclipse.sirius.web.sample.services.DomainAttributeServices; import org.eclipse.sirius.web.services.api.representations.IInMemoryViewRegistry; import org.springframework.context.annotation.Configuration; diff --git a/packages/view/backend/sirius-components-view-builder/pom.xml b/packages/view/backend/sirius-components-view-builder/pom.xml index 85cc94ea5d..2e9582cb15 100644 --- a/packages/view/backend/sirius-components-view-builder/pom.xml +++ b/packages/view/backend/sirius-components-view-builder/pom.xml @@ -112,6 +112,25 @@ + + org.jacoco + jacoco-maven-plugin + 0.8.10 + + + + prepare-agent + + + + report + prepare-package + + report + + + + org.codehaus.mojo exec-maven-plugin diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalReferenceWidgetDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalReferenceWidgetDescriptionStyleBuilder.java index 3a521ab29c..8f6ead1d4e 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalReferenceWidgetDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ConditionalReferenceWidgetDescriptionStyleBuilder.java @@ -12,6 +12,9 @@ *******************************************************************************/ package org.eclipse.sirius.components.view.builder.generated; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; + /** * Builder for ConditionalReferenceWidgetDescriptionStyleBuilder. * @@ -21,24 +24,24 @@ public class ConditionalReferenceWidgetDescriptionStyleBuilder { /** - * Create instance org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle. + * Create instance org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle. * @generated */ - private org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle conditionalReferenceWidgetDescriptionStyle = org.eclipse.sirius.components.widgets.reference.ReferenceFactory.eINSTANCE.createConditionalReferenceWidgetDescriptionStyle(); + private org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle conditionalReferenceWidgetDescriptionStyle = org.eclipse.sirius.components.view.widget.reference.ReferenceFactory.eINSTANCE.createConditionalReferenceWidgetDescriptionStyle(); /** - * Return instance org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle. + * Return instance org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle. * @generated */ - protected org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle getConditionalReferenceWidgetDescriptionStyle() { + protected org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle getConditionalReferenceWidgetDescriptionStyle() { return this.conditionalReferenceWidgetDescriptionStyle; } /** - * Return instance org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle. + * Return instance org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle. * @generated */ - public org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle build() { + public org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle build() { return this.getConditionalReferenceWidgetDescriptionStyle(); } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionBuilder.java index 4300303e97..7e51a29e71 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionBuilder.java @@ -12,6 +12,11 @@ *******************************************************************************/ package org.eclipse.sirius.components.view.builder.generated; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; + /** * Builder for ReferenceWidgetDescriptionBuilder. * @@ -21,24 +26,24 @@ public class ReferenceWidgetDescriptionBuilder { /** - * Create instance org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription. + * Create instance org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription. * @generated */ - private org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription referenceWidgetDescription = org.eclipse.sirius.components.widgets.reference.ReferenceFactory.eINSTANCE.createReferenceWidgetDescription(); + private org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription referenceWidgetDescription = org.eclipse.sirius.components.view.widget.reference.ReferenceFactory.eINSTANCE.createReferenceWidgetDescription(); /** - * Return instance org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription. + * Return instance org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription. * @generated */ - protected org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription getReferenceWidgetDescription() { + protected org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription getReferenceWidgetDescription() { return this.referenceWidgetDescription; } /** - * Return instance org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription. + * Return instance org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription. * @generated */ - public org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription build() { + public org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription build() { return this.getReferenceWidgetDescription(); } @@ -113,17 +118,18 @@ public ReferenceWidgetDescriptionBuilder body(org.eclipse.sirius.components.view * * @generated */ - public ReferenceWidgetDescriptionBuilder style(org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle value) { + public ReferenceWidgetDescriptionBuilder style(org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle value) { this.getReferenceWidgetDescription().setStyle(value); return this; } + /** * Setter for ConditionalStyles. * * @generated */ - public ReferenceWidgetDescriptionBuilder conditionalStyles(org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle ... values) { - for (org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle value : values) { + public ReferenceWidgetDescriptionBuilder conditionalStyles(org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle ... values) { + for (org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle value : values) { this.getReferenceWidgetDescription().getConditionalStyles().add(value); } return this; diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionStyleBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionStyleBuilder.java index c13e48c339..37d845f322 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionStyleBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/ReferenceWidgetDescriptionStyleBuilder.java @@ -12,6 +12,9 @@ *******************************************************************************/ package org.eclipse.sirius.components.view.builder.generated; +import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; + /** * Builder for ReferenceWidgetDescriptionStyleBuilder. * @@ -21,24 +24,24 @@ public class ReferenceWidgetDescriptionStyleBuilder { /** - * Create instance org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle. + * Create instance org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle. * @generated */ - private org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle referenceWidgetDescriptionStyle = org.eclipse.sirius.components.widgets.reference.ReferenceFactory.eINSTANCE.createReferenceWidgetDescriptionStyle(); + private org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle referenceWidgetDescriptionStyle = org.eclipse.sirius.components.view.widget.reference.ReferenceFactory.eINSTANCE.createReferenceWidgetDescriptionStyle(); /** - * Return instance org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle. + * Return instance org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle. * @generated */ - protected org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle getReferenceWidgetDescriptionStyle() { + protected org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle getReferenceWidgetDescriptionStyle() { return this.referenceWidgetDescriptionStyle; } /** - * Return instance org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle. + * Return instance org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle. * @generated */ - public org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle build() { + public org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle build() { return this.getReferenceWidgetDescriptionStyle(); } diff --git a/packages/view/backend/sirius-components-view-builder/src/test/java/org/eclipse/sirius/components/view/builder/tests/architecture/ViewBuilderTests.java b/packages/view/backend/sirius-components-view-builder/src/test/java/org/eclipse/sirius/components/view/builder/tests/architecture/ViewBuilderTests.java new file mode 100644 index 0000000000..ca0ba7055e --- /dev/null +++ b/packages/view/backend/sirius-components-view-builder/src/test/java/org/eclipse/sirius/components/view/builder/tests/architecture/ViewBuilderTests.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.components.view.builder.tests.architecture; + +import org.eclipse.sirius.components.view.builder.generated.ReferenceWidgetDescriptionBuilder; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; + +import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; + +/** + * Tests for instancing widget with generated builder. + * + * @author mcharfadi + */ +public class ViewBuilderTests { + @Test + void testBuildWidgetDescription() { + var widgetReference = new ReferenceWidgetDescriptionBuilder() + .name("name") + .referenceNameExpression("referenceNameExpression") + .referenceOwnerExpression("referenceOwnerExpression") + .helpExpression("helpExpression") + .isEnabledExpression("isEnabledExpression") + .build(); + + assertThat(widgetReference).isInstanceOf(ReferenceWidgetDescription.class); + assertThat(widgetReference.getReferenceNameExpression()).isEqualTo("referenceNameExpression"); + assertThat(widgetReference.getName()).isEqualTo("name"); + assertThat(widgetReference.getReferenceOwnerExpression()).isEqualTo("referenceOwnerExpression"); + assertThat(widgetReference.getHelpExpression()).isEqualTo("helpExpression"); + assertThat(widgetReference.getIsEnabledExpression()).isEqualTo("isEnabledExpression"); + } +} diff --git a/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceEMFConfiguration.java b/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceEMFConfiguration.java index f16c6104c8..9ddcf1b0c1 100644 --- a/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceEMFConfiguration.java +++ b/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceEMFConfiguration.java @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.sirius.components.emf.configuration.ChildExtenderProvider; import org.eclipse.sirius.components.view.form.FormPackage; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; import org.eclipse.sirius.components.widgets.reference.provider.ReferenceItemProviderAdapterFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java b/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java index 8c14b13289..d339bdf14f 100644 --- a/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java +++ b/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java @@ -53,9 +53,9 @@ import org.eclipse.sirius.components.view.form.FormElementDescription; import org.eclipse.sirius.components.widget.reference.ReferenceWidgetComponent; import org.eclipse.sirius.components.widget.reference.ReferenceWidgetStyle; -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; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.util.ReferenceSwitch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetStyleProvider.java b/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetStyleProvider.java index 1afd4d5458..8ccab6fa7c 100644 --- a/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetStyleProvider.java +++ b/packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetStyleProvider.java @@ -18,7 +18,7 @@ import org.eclipse.sirius.components.representations.VariableManager; import org.eclipse.sirius.components.view.FixedColor; import org.eclipse.sirius.components.widget.reference.ReferenceWidgetStyle; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; /** * The style provider for the Reference Widget. diff --git a/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ConditionalReferenceWidgetDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ConditionalReferenceWidgetDescriptionStyleItemProvider.java index 86b8b2eef5..f9255a7bb8 100644 --- a/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ConditionalReferenceWidgetDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ConditionalReferenceWidgetDescriptionStyleItemProvider.java @@ -24,12 +24,12 @@ import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.components.view.ViewPackage; import org.eclipse.sirius.components.view.provider.ConditionalItemProvider; -import org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; /** * This is the item provider adapter for a - * {@link org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle} object. * * @generated diff --git a/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceItemProviderAdapterFactory.java b/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceItemProviderAdapterFactory.java index 1f7b0ada41..0687f23921 100644 --- a/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceItemProviderAdapterFactory.java +++ b/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceItemProviderAdapterFactory.java @@ -41,8 +41,11 @@ import org.eclipse.sirius.components.view.form.FormPackage; import org.eclipse.sirius.components.view.form.GroupDescription; import org.eclipse.sirius.components.view.form.util.FormSwitch; -import org.eclipse.sirius.components.widgets.reference.ReferenceFactory; -import org.eclipse.sirius.components.widgets.reference.util.ReferenceAdapterFactory; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; +import org.eclipse.sirius.components.view.widget.reference.util.ReferenceAdapterFactory; /** * This is the factory that is used to provide the interfaces needed to support Viewers. The adapters generated by this @@ -80,7 +83,7 @@ public class ReferenceItemProviderAdapterFactory extends ReferenceAdapterFactory /** * This keeps track of the one adapter used for all - * {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription} instances. * * @generated @@ -89,7 +92,7 @@ public class ReferenceItemProviderAdapterFactory extends ReferenceAdapterFactory /** * This keeps track of the one adapter used for all - * {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle} instances. * * @generated @@ -98,7 +101,7 @@ public class ReferenceItemProviderAdapterFactory extends ReferenceAdapterFactory /** * This keeps track of the one adapter used for all - * {@link org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle} instances. + * {@link ConditionalReferenceWidgetDescriptionStyle} instances. * * * @generated @@ -119,7 +122,7 @@ public ReferenceItemProviderAdapterFactory() { } /** - * This creates an adapter for a {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription}. + * This creates an adapter for a {@link ReferenceWidgetDescription}. * * * @generated @@ -135,7 +138,7 @@ public Adapter createReferenceWidgetDescriptionAdapter() { /** * This creates an adapter for a - * {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle}. + * {@link ReferenceWidgetDescriptionStyle}. * * * @generated @@ -151,7 +154,7 @@ public Adapter createReferenceWidgetDescriptionStyleAdapter() { /** * This creates an adapter for a - * {@link org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle}. * * @generated diff --git a/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceWidgetDescriptionItemProvider.java b/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceWidgetDescriptionItemProvider.java index aadb3d1983..afe7251707 100644 --- a/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceWidgetDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceWidgetDescriptionItemProvider.java @@ -25,13 +25,13 @@ import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.components.view.ViewFactory; import org.eclipse.sirius.components.view.form.provider.WidgetDescriptionItemProvider; -import org.eclipse.sirius.components.widgets.reference.ReferenceFactory; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; /** * This is the item provider adapter for a - * {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription} object. + * {@link ReferenceWidgetDescription} object. * * * @generated diff --git a/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceWidgetDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceWidgetDescriptionStyleItemProvider.java index 2a805a32a4..6afe14c242 100644 --- a/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceWidgetDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-widget-reference-view-edit/src/main/java/org/eclipse/sirius/components/widgets/reference/provider/ReferenceWidgetDescriptionStyleItemProvider.java @@ -24,12 +24,12 @@ import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.components.view.ViewPackage; import org.eclipse.sirius.components.view.form.provider.WidgetDescriptionStyleItemProvider; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; /** * This is the item provider adapter for a - * {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle} object. * * @generated diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ConditionalReferenceWidgetDescriptionStyle.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ConditionalReferenceWidgetDescriptionStyle.java similarity index 84% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ConditionalReferenceWidgetDescriptionStyle.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ConditionalReferenceWidgetDescriptionStyle.java index 82a211bce6..26da8ce117 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ConditionalReferenceWidgetDescriptionStyle.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ConditionalReferenceWidgetDescriptionStyle.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference; +package org.eclipse.sirius.components.view.widget.reference; import org.eclipse.sirius.components.view.Conditional; @@ -19,7 +19,7 @@ * Style'. * * - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getConditionalReferenceWidgetDescriptionStyle() + * @see ReferencePackage#getConditionalReferenceWidgetDescriptionStyle() * @model * @generated */ diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceFactory.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceFactory.java similarity index 89% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceFactory.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceFactory.java index 291a32be4b..c193873fb4 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceFactory.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceFactory.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference; +package org.eclipse.sirius.components.view.widget.reference; import org.eclipse.emf.ecore.EFactory; @@ -18,7 +18,7 @@ * The Factory for the model. It provides a create method for each non-abstract class of * the model. * - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage + * @see ReferencePackage * @generated */ public interface ReferenceFactory extends EFactory { @@ -27,7 +27,7 @@ public interface ReferenceFactory extends EFactory { * * @generated */ - ReferenceFactory eINSTANCE = org.eclipse.sirius.components.widgets.reference.impl.ReferenceFactoryImpl.init(); + ReferenceFactory eINSTANCE = org.eclipse.sirius.components.view.widget.reference.impl.ReferenceFactoryImpl.init(); /** * Returns a new object of class 'Widget Description'. diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferencePackage.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferencePackage.java similarity index 82% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferencePackage.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferencePackage.java index 53700b2cfe..adb08ee8da 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferencePackage.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferencePackage.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference; +package org.eclipse.sirius.components.view.widget.reference; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -30,7 +30,7 @@ * * * - * @see org.eclipse.sirius.components.widgets.reference.ReferenceFactory + * @see ReferenceFactory * @model kind="package" * @generated */ @@ -59,11 +59,11 @@ public interface ReferencePackage extends EPackage { /** * The meta object id for the - * '{@link org.eclipse.sirius.components.widgets.reference.impl.ReferenceWidgetDescriptionImpl Widget + * '{@link org.eclipse.sirius.components.view.widget.reference.impl.ReferenceWidgetDescriptionImpl Widget * Description}' class. * - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferenceWidgetDescriptionImpl - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferencePackageImpl#getReferenceWidgetDescription() + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferenceWidgetDescriptionImpl + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferencePackageImpl#getReferenceWidgetDescription() * @generated */ int REFERENCE_WIDGET_DESCRIPTION = 0; @@ -167,11 +167,11 @@ public interface ReferencePackage extends EPackage { /** * The meta object id for the - * '{@link org.eclipse.sirius.components.widgets.reference.impl.ReferenceWidgetDescriptionStyleImpl Widget + * '{@link org.eclipse.sirius.components.view.widget.reference.impl.ReferenceWidgetDescriptionStyleImpl Widget * Description Style}' class. * - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferenceWidgetDescriptionStyleImpl - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferencePackageImpl#getReferenceWidgetDescriptionStyle() + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferenceWidgetDescriptionStyleImpl + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferencePackageImpl#getReferenceWidgetDescriptionStyle() * @generated */ int REFERENCE_WIDGET_DESCRIPTION_STYLE = 1; @@ -244,11 +244,11 @@ public interface ReferencePackage extends EPackage { /** * The meta object id for the - * '{@link org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl + * '{@link org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl * Conditional Reference Widget Description Style}' class. * - * @see org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferencePackageImpl#getConditionalReferenceWidgetDescriptionStyle() + * @see org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferencePackageImpl#getConditionalReferenceWidgetDescriptionStyle() * @generated */ int CONDITIONAL_REFERENCE_WIDGET_DESCRIPTION_STYLE = 2; @@ -258,7 +258,7 @@ public interface ReferencePackage extends EPackage { * * @generated */ - ReferencePackage eINSTANCE = org.eclipse.sirius.components.widgets.reference.impl.ReferencePackageImpl.init(); + ReferencePackage eINSTANCE = org.eclipse.sirius.components.view.widget.reference.impl.ReferencePackageImpl.init(); /** * The feature id for the 'Condition' attribute. @@ -336,22 +336,22 @@ public interface ReferencePackage extends EPackage { /** * Returns the meta object for class - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription Widget Description}'. + * '{@link ReferenceWidgetDescription Widget Description}'. * * * @return the meta object for class 'Widget Description'. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription + * @see ReferenceWidgetDescription * @generated */ EClass getReferenceWidgetDescription(); /** * Returns the meta object for the attribute - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getReferenceOwnerExpression + * '{@link ReferenceWidgetDescription#getReferenceOwnerExpression * Reference Owner Expression}'. * * @return the meta object for the attribute 'Reference Owner Expression'. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getReferenceOwnerExpression() + * @see ReferenceWidgetDescription#getReferenceOwnerExpression() * @see #getReferenceWidgetDescription() * @generated */ @@ -359,11 +359,11 @@ public interface ReferencePackage extends EPackage { /** * Returns the meta object for the attribute - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getReferenceNameExpression + * '{@link ReferenceWidgetDescription#getReferenceNameExpression * Reference Name Expression}'. * * @return the meta object for the attribute 'Reference Name Expression'. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getReferenceNameExpression() + * @see ReferenceWidgetDescription#getReferenceNameExpression() * @see #getReferenceWidgetDescription() * @generated */ @@ -371,23 +371,23 @@ public interface ReferencePackage extends EPackage { /** * Returns the meta object for the containment reference list - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getBody Body}'. * * @return the meta object for the containment reference list 'Body'. * @generated - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getBody() + * @see ReferenceWidgetDescription#getBody() * @see #getReferenceWidgetDescription() */ EReference getReferenceWidgetDescription_Body(); /** * Returns the meta object for the containment reference - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getStyle Style}'. + * '{@link ReferenceWidgetDescription#getStyle Style}'. * * * @return the meta object for the containment reference 'Style'. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getStyle() + * @see ReferenceWidgetDescription#getStyle() * @see #getReferenceWidgetDescription() * @generated */ @@ -395,11 +395,11 @@ public interface ReferencePackage extends EPackage { /** * Returns the meta object for the containment reference list - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getConditionalStyles + * '{@link ReferenceWidgetDescription#getConditionalStyles * Conditional Styles}'. * * @return the meta object for the containment reference list 'Conditional Styles'. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getConditionalStyles() + * @see ReferenceWidgetDescription#getConditionalStyles() * @see #getReferenceWidgetDescription() * @generated */ @@ -407,22 +407,22 @@ public interface ReferencePackage extends EPackage { /** * Returns the meta object for class - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle Widget Description + * '{@link ReferenceWidgetDescriptionStyle Widget Description * Style}'. * * @return the meta object for class 'Widget Description Style'. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle + * @see ReferenceWidgetDescriptionStyle * @generated */ EClass getReferenceWidgetDescriptionStyle(); /** * Returns the meta object for the reference - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle#getColor + * '{@link ReferenceWidgetDescriptionStyle#getColor * Color}'. * * @return the meta object for the reference 'Color'. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle#getColor() + * @see ReferenceWidgetDescriptionStyle#getColor() * @see #getReferenceWidgetDescriptionStyle() * @generated */ @@ -430,22 +430,22 @@ public interface ReferencePackage extends EPackage { /** * Returns the meta object for class - * '{@link org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle + * '{@link ConditionalReferenceWidgetDescriptionStyle * Conditional Reference Widget Description Style}'. * * @return the meta object for class 'Conditional Reference Widget Description Style'. - * @see org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle + * @see ConditionalReferenceWidgetDescriptionStyle * @generated */ EClass getConditionalReferenceWidgetDescriptionStyle(); /** * Returns the meta object for the attribute - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getIsEnabledExpression Is + * '{@link ReferenceWidgetDescription#getIsEnabledExpression Is * Enabled Expression}'. * * @return the meta object for the attribute 'Is Enabled Expression'. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getIsEnabledExpression() + * @see ReferenceWidgetDescription#getIsEnabledExpression() * @see #getReferenceWidgetDescription() * @generated */ @@ -476,11 +476,11 @@ interface Literals { /** * The meta object literal for the - * '{@link org.eclipse.sirius.components.widgets.reference.impl.ReferenceWidgetDescriptionImpl Widget + * '{@link org.eclipse.sirius.components.view.widget.reference.impl.ReferenceWidgetDescriptionImpl Widget * Description}' class. * - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferenceWidgetDescriptionImpl - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferencePackageImpl#getReferenceWidgetDescription() + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferenceWidgetDescriptionImpl + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferencePackageImpl#getReferenceWidgetDescription() * @generated */ EClass REFERENCE_WIDGET_DESCRIPTION = eINSTANCE.getReferenceWidgetDescription(); @@ -527,11 +527,11 @@ interface Literals { /** * The meta object literal for the - * '{@link org.eclipse.sirius.components.widgets.reference.impl.ReferenceWidgetDescriptionStyleImpl Widget + * '{@link org.eclipse.sirius.components.view.widget.reference.impl.ReferenceWidgetDescriptionStyleImpl Widget * Description Style}' class. * - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferenceWidgetDescriptionStyleImpl - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferencePackageImpl#getReferenceWidgetDescriptionStyle() + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferenceWidgetDescriptionStyleImpl + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferencePackageImpl#getReferenceWidgetDescriptionStyle() * @generated */ EClass REFERENCE_WIDGET_DESCRIPTION_STYLE = eINSTANCE.getReferenceWidgetDescriptionStyle(); @@ -546,13 +546,13 @@ interface Literals { /** * The meta object literal for the - * '{@link org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl + * '{@link org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl * Conditional Reference Widget Description Style}' class. * * @generated - * @see org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl - * @see org.eclipse.sirius.components.widgets.reference.impl.ReferencePackageImpl#getConditionalReferenceWidgetDescriptionStyle() + * @see org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl + * @see org.eclipse.sirius.components.view.widget.reference.impl.ReferencePackageImpl#getConditionalReferenceWidgetDescriptionStyle() */ EClass CONDITIONAL_REFERENCE_WIDGET_DESCRIPTION_STYLE = eINSTANCE.getConditionalReferenceWidgetDescriptionStyle(); diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceWidgetDescription.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceWidgetDescription.java similarity index 74% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceWidgetDescription.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceWidgetDescription.java index 85c826e11e..fdc8500626 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceWidgetDescription.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceWidgetDescription.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference; +package org.eclipse.sirius.components.view.widget.reference; import org.eclipse.emf.common.util.EList; import org.eclipse.sirius.components.view.Operation; @@ -24,15 +24,15 @@ * The following features are supported: *

*
    - *
  • {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getReferenceOwnerExpression + *
  • {@link ReferenceWidgetDescription#getReferenceOwnerExpression * Reference Owner Expression}
  • - *
  • {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getReferenceNameExpression + *
  • {@link ReferenceWidgetDescription#getReferenceNameExpression * Reference Name Expression}
  • *
* * @model * @generated - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescription() + * @see ReferencePackage#getReferenceWidgetDescription() */ public interface ReferenceWidgetDescription extends WidgetDescription { @@ -42,7 +42,7 @@ public interface ReferenceWidgetDescription extends WidgetDescription { * * @return the value of the 'Reference Owner Expression' attribute. * @see #setReferenceOwnerExpression(String) - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescription_ReferenceOwnerExpression() + * @see ReferencePackage#getReferenceWidgetDescription_ReferenceOwnerExpression() * @model dataType="org.eclipse.sirius.components.view.InterpretedExpression" * @generated */ @@ -50,7 +50,7 @@ public interface ReferenceWidgetDescription extends WidgetDescription { /** * Sets the value of the - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getReferenceOwnerExpression + * '{@link ReferenceWidgetDescription#getReferenceOwnerExpression * Reference Owner Expression}' attribute. * * @param value @@ -66,7 +66,7 @@ public interface ReferenceWidgetDescription extends WidgetDescription { * * @return the value of the 'Reference Name Expression' attribute. * @see #setReferenceNameExpression(String) - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescription_ReferenceNameExpression() + * @see ReferencePackage#getReferenceWidgetDescription_ReferenceNameExpression() * @model dataType="org.eclipse.sirius.components.view.InterpretedExpression" required="true" * @generated */ @@ -74,7 +74,7 @@ public interface ReferenceWidgetDescription extends WidgetDescription { /** * Sets the value of the - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getReferenceNameExpression + * '{@link ReferenceWidgetDescription#getReferenceNameExpression * Reference Name Expression}' attribute. * * @param value @@ -89,7 +89,7 @@ public interface ReferenceWidgetDescription extends WidgetDescription { * {@link org.eclipse.sirius.components.view.Operation}. * * @return the value of the 'Body' containment reference list. - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescription_Body() + * @see ReferencePackage#getReferenceWidgetDescription_Body() * @model containment="true" * @generated */ @@ -103,12 +103,12 @@ public interface ReferenceWidgetDescription extends WidgetDescription { * @model containment="true" * @generated * @see #setStyle(ReferenceWidgetDescriptionStyle) - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescription_Style() + * @see ReferencePackage#getReferenceWidgetDescription_Style() */ ReferenceWidgetDescriptionStyle getStyle(); /** - * Sets the value of the '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getStyle + * Sets the value of the '{@link ReferenceWidgetDescription#getStyle * Style}' containment reference. * * @param value @@ -120,13 +120,13 @@ public interface ReferenceWidgetDescription extends WidgetDescription { /** * Returns the value of the 'Conditional Styles' containment reference list. The list contents are - * of type {@link org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle}. * * @return the value of the 'Conditional Styles' containment reference list. * @model containment="true" * @generated - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescription_ConditionalStyles() + * @see ReferencePackage#getReferenceWidgetDescription_ConditionalStyles() */ EList getConditionalStyles(); @@ -136,7 +136,7 @@ public interface ReferenceWidgetDescription extends WidgetDescription { * * @return the value of the 'Is Enabled Expression' attribute. * @see #setIsEnabledExpression(String) - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescription_IsEnabledExpression() + * @see ReferencePackage#getReferenceWidgetDescription_IsEnabledExpression() * @model dataType="org.eclipse.sirius.components.view.InterpretedExpression" * @generated */ @@ -144,7 +144,7 @@ public interface ReferenceWidgetDescription extends WidgetDescription { /** * Sets the value of the - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription#getIsEnabledExpression Is + * '{@link ReferenceWidgetDescription#getIsEnabledExpression Is * Enabled Expression}' attribute. * * @param value diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceWidgetDescriptionStyle.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceWidgetDescriptionStyle.java similarity index 76% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceWidgetDescriptionStyle.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceWidgetDescriptionStyle.java index f0175d46ca..20ec9af9f1 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/ReferenceWidgetDescriptionStyle.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/ReferenceWidgetDescriptionStyle.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference; +package org.eclipse.sirius.components.view.widget.reference; import org.eclipse.sirius.components.view.LabelStyle; import org.eclipse.sirius.components.view.UserColor; @@ -24,11 +24,11 @@ * The following features are supported: *

*
    - *
  • {@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle#getColor + *
  • {@link ReferenceWidgetDescriptionStyle#getColor * Color}
  • *
* - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescriptionStyle() + * @see ReferencePackage#getReferenceWidgetDescriptionStyle() * @model * @generated */ @@ -39,7 +39,7 @@ public interface ReferenceWidgetDescriptionStyle extends WidgetDescriptionStyle, * * @return the value of the 'Color' reference. * @see #setColor(UserColor) - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#getReferenceWidgetDescriptionStyle_Color() + * @see ReferencePackage#getReferenceWidgetDescriptionStyle_Color() * @model * @generated */ @@ -47,7 +47,7 @@ public interface ReferenceWidgetDescriptionStyle extends WidgetDescriptionStyle, /** * Sets the value of the - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle#getColor Color}' + * '{@link ReferenceWidgetDescriptionStyle#getColor Color}' * reference. * * @param value diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ConditionalReferenceWidgetDescriptionStyleImpl.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ConditionalReferenceWidgetDescriptionStyleImpl.java similarity index 94% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ConditionalReferenceWidgetDescriptionStyleImpl.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ConditionalReferenceWidgetDescriptionStyleImpl.java index fe0843bf72..e072bdd202 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ConditionalReferenceWidgetDescriptionStyleImpl.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ConditionalReferenceWidgetDescriptionStyleImpl.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference.impl; +package org.eclipse.sirius.components.view.widget.reference.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -21,9 +21,9 @@ import org.eclipse.sirius.components.view.ViewPackage; import org.eclipse.sirius.components.view.form.WidgetDescriptionStyle; import org.eclipse.sirius.components.view.impl.ConditionalImpl; -import org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; /** * An implementation of the model object 'Conditional Reference Widget Description @@ -32,17 +32,17 @@ * The following features are implemented: *

*
    - *
  • {@link org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#getFontSize + *
  • {@link org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#getFontSize * Font Size}
  • - *
  • {@link org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#isItalic + *
  • {@link org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#isItalic * Italic}
  • - *
  • {@link org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#isBold + *
  • {@link org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#isBold * Bold}
  • - *
  • {@link org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#isUnderline + *
  • {@link org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#isUnderline * Underline}
  • - *
  • {@link org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#isStrikeThrough + *
  • {@link org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#isStrikeThrough * Strike Through}
  • - *
  • {@link org.eclipse.sirius.components.widgets.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#getColor + *
  • {@link org.eclipse.sirius.components.view.widget.reference.impl.ConditionalReferenceWidgetDescriptionStyleImpl#getColor * Color}
  • *
* diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferenceFactoryImpl.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferenceFactoryImpl.java similarity index 89% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferenceFactoryImpl.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferenceFactoryImpl.java index 86747f3461..37dc0d208d 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferenceFactoryImpl.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferenceFactoryImpl.java @@ -10,18 +10,18 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference.impl; +package org.eclipse.sirius.components.view.widget.reference.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle; -import org.eclipse.sirius.components.widgets.reference.ReferenceFactory; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; /** * An implementation of the model Factory. diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferencePackageImpl.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferencePackageImpl.java similarity index 95% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferencePackageImpl.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferencePackageImpl.java index bd788c74c1..99a050617e 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferencePackageImpl.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferencePackageImpl.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference.impl; +package org.eclipse.sirius.components.view.widget.reference.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -19,11 +19,11 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.sirius.components.view.ViewPackage; import org.eclipse.sirius.components.view.form.FormPackage; -import org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle; -import org.eclipse.sirius.components.widgets.reference.ReferenceFactory; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; /** * An implementation of the model Package. @@ -84,7 +84,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka * * @generated * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage#eNS_URI + * @see ReferencePackage#eNS_URI * @see #init() */ private ReferencePackageImpl() { diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferenceWidgetDescriptionImpl.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferenceWidgetDescriptionImpl.java similarity index 96% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferenceWidgetDescriptionImpl.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferenceWidgetDescriptionImpl.java index 68bb5b7bc0..357a044314 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/impl/ReferenceWidgetDescriptionImpl.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/impl/ReferenceWidgetDescriptionImpl.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference.impl; +package org.eclipse.sirius.components.view.widget.reference.impl; import java.util.Collection; @@ -24,10 +24,10 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.sirius.components.view.Operation; import org.eclipse.sirius.components.view.form.impl.WidgetDescriptionImpl; -import org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; /** * An implementation of the model object 'Widget Description'. An implementation of the model object 'Widget Description Style'. The Adapter Factory for the model. It provides an adapter createXXX * method for each class of the model. * - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage + * @see ReferencePackage * @generated */ public class ReferenceAdapterFactory extends AdapterFactoryImpl { @@ -139,12 +139,12 @@ public Adapter createAdapter(Notifier target) { /** * Creates a new adapter for an object of class - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription Widget Description}'. + * '{@link ReferenceWidgetDescription Widget Description}'. * This default implementation returns null so that we can easily ignore cases; it's useful * to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription + * @see ReferenceWidgetDescription * @generated */ public Adapter createReferenceWidgetDescriptionAdapter() { @@ -153,12 +153,12 @@ public Adapter createReferenceWidgetDescriptionAdapter() { /** * Creates a new adapter for an object of class - * '{@link org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle Widget Description + * '{@link ReferenceWidgetDescriptionStyle Widget Description * Style}'. This default implementation returns null so that we can easily ignore * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle + * @see ReferenceWidgetDescriptionStyle * @generated */ public Adapter createReferenceWidgetDescriptionStyleAdapter() { @@ -167,13 +167,13 @@ public Adapter createReferenceWidgetDescriptionStyleAdapter() { /** * Creates a new adapter for an object of class - * '{@link org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle + * '{@link ConditionalReferenceWidgetDescriptionStyle * Conditional Reference Widget Description Style}'. This default implementation * returns null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the * cases anyway. * * @return the new adapter. - * @see org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle + * @see ConditionalReferenceWidgetDescriptionStyle * @generated */ public Adapter createConditionalReferenceWidgetDescriptionStyleAdapter() { diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/util/ReferenceSwitch.java b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/util/ReferenceSwitch.java similarity index 95% rename from packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/util/ReferenceSwitch.java rename to packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/util/ReferenceSwitch.java index 56b34c7a41..36ef5b53b5 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/widgets/reference/util/ReferenceSwitch.java +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/java/org/eclipse/sirius/components/view/widget/reference/util/ReferenceSwitch.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.components.widgets.reference.util; +package org.eclipse.sirius.components.view.widget.reference.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -20,10 +20,10 @@ import org.eclipse.sirius.components.view.form.FormElementDescription; import org.eclipse.sirius.components.view.form.WidgetDescription; import org.eclipse.sirius.components.view.form.WidgetDescriptionStyle; -import org.eclipse.sirius.components.widgets.reference.ConditionalReferenceWidgetDescriptionStyle; -import org.eclipse.sirius.components.widgets.reference.ReferencePackage; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescription; -import org.eclipse.sirius.components.widgets.reference.ReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferencePackage; +import org.eclipse.sirius.components.view.widget.reference.ConditionalReferenceWidgetDescriptionStyle; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription; +import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle; /** * The Switch for the model's inheritance hierarchy. It supports the call @@ -31,7 +31,7 @@ * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. * - * @see org.eclipse.sirius.components.widgets.reference.ReferencePackage + * @see ReferencePackage * @generated */ public class ReferenceSwitch extends Switch { diff --git a/packages/view/backend/sirius-components-widget-reference-view/src/main/resources/model/reference.genmodel b/packages/view/backend/sirius-components-widget-reference-view/src/main/resources/model/reference.genmodel index 6dc790a592..0b5fb5340b 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/src/main/resources/model/reference.genmodel +++ b/packages/view/backend/sirius-components-widget-reference-view/src/main/resources/model/reference.genmodel @@ -1,6 +1,6 @@ reference.ecore - diff --git a/scripts/check-coverage.jsh b/scripts/check-coverage.jsh index a880cfa130..e89697997c 100644 --- a/scripts/check-coverage.jsh +++ b/scripts/check-coverage.jsh @@ -85,7 +85,7 @@ var moduleCoverageData = List.of( new ModuleCoverage("sirius-components-view-diagram-edit", 3.0), new ModuleCoverage("sirius-components-view-form", 42.0), new ModuleCoverage("sirius-components-view-form-edit", 1.0), - new ModuleCoverage("sirius-components-widget-reference-view", 28.0), + new ModuleCoverage("sirius-components-widget-reference-view", 29.0), new ModuleCoverage("sirius-components-widget-reference-view-edit", 3.0), new ModuleCoverage("sirius-components-view-gantt", 40.0), new ModuleCoverage("sirius-components-view-gantt-edit", 7.0),