From 60d679681cd7fbbcb14523e758026d68e7c270d5 Mon Sep 17 00:00:00 2001 From: Michael Charfadi Date: Tue, 30 May 2023 10:52:46 +0200 Subject: [PATCH] [2004] Add an optional icon to select widget options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://github.com/eclipse-sirius/sirius-components/issues/2004 Signed-off-by: Michaël Charfadi --- CHANGELOG.adoc | 3 + .../ShowIconOptionSelectWidget.jpg | Bin 0 -> 25398 bytes ...ainmentReferenceIfDescriptionProvider.java | 3 +- ...ainmentReferenceIfDescriptionProvider.java | 1 + .../forms/WidgetDescriptionConverter.java | 3 +- .../emf/services/ObjectService.java | 6 +- .../components/MultiSelectStyleProvider.java | 2 + .../components/SelectStyleProvider.java | 2 + ...wFormDescriptionEditorConverterSwitch.java | 2 + .../src/main/resources/schema/form.graphqls | 1 + .../sirius-components-forms-graphql/pom.xml | 5 ++ .../form/SelectOptionIconURLDataFetcher.java | 42 +++++++++ .../components/forms/MultiSelectStyle.java | 20 ++++- .../sirius/components/forms/SelectOption.java | 20 ++++- .../sirius/components/forms/SelectStyle.java | 20 ++++- .../components/MultiSelectComponent.java | 16 ++-- .../forms/components/SelectComponent.java | 16 ++-- .../description/MultiSelectDescription.java | 14 +++ .../forms/description/SelectDescription.java | 14 +++ .../src/form/FormEventFragments.ts | 2 + .../src/form/FormEventFragments.types.ts | 1 + .../MultiSelectPropertySection.tsx | 21 ++++- .../SelectPropertySection.tsx | 22 ++++- .../MultiSelectPropertySection.test.tsx.snap | 20 ++--- .../SelectPropertySection.test.tsx.snap | 20 ++--- ...nalMultiSelectDescriptionStyleBuilder.java | 9 ++ ...ditionalSelectDescriptionStyleBuilder.java | 9 ++ .../MultiSelectDescriptionStyleBuilder.java | 9 ++ .../SelectDescriptionStyleBuilder.java | 9 ++ ...ltiSelectDescriptionStyleItemProvider.java | 14 +++ ...nalSelectDescriptionStyleItemProvider.java | 14 +++ ...ltiSelectDescriptionStyleItemProvider.java | 14 +++ .../SelectDescriptionStyleItemProvider.java | 14 +++ .../src/main/resources/plugin.properties | 2 + .../NodeStylePropertiesConfigurer.java | 9 +- .../emf/form/MultiSelectStyleProvider.java | 2 + .../view/emf/form/SelectStyleProvider.java | 2 + .../ViewFormDescriptionConverterSwitch.java | 8 ++ .../view/MultiSelectDescriptionStyle.java | 23 +++++ .../view/SelectDescriptionStyle.java | 23 +++++ .../sirius/components/view/ViewPackage.java | 80 +++++++++++++++++- ...tionalMultiSelectDescriptionStyleImpl.java | 61 +++++++++++++ ...ConditionalSelectDescriptionStyleImpl.java | 61 +++++++++++++ .../impl/MultiSelectDescriptionStyleImpl.java | 57 +++++++++++++ .../view/impl/SelectDescriptionStyleImpl.java | 56 ++++++++++++ .../components/view/impl/ViewPackageImpl.java | 26 ++++++ .../src/main/resources/model/view.ecore | 2 + .../src/main/resources/model/view.genmodel | 2 + 48 files changed, 725 insertions(+), 57 deletions(-) create mode 100644 doc/screenshots/ShowIconOptionSelectWidget.jpg create mode 100644 packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/SelectOptionIconURLDataFetcher.java diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index d9909050a2..8c17ccd045 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -36,6 +36,9 @@ An absent/empty candidates expression now simply means the widget is empty. === New Features - https://github.com/eclipse-sirius/sirius-components/issues/2039[#2039] [project] A new "Blank Studio" project template is available to create a project with the "studio" nature but no initial content +- https://github.com/eclipse-sirius/sirius-components/issues/2004[#2004] [form] Add the possibility to show select options' icons. ++ +image:doc/screenshots/ShowIconOptionSelectWidget.jpg[Icons on select widget option,70%,30%] === Improvements diff --git a/doc/screenshots/ShowIconOptionSelectWidget.jpg b/doc/screenshots/ShowIconOptionSelectWidget.jpg new file mode 100644 index 0000000000000000000000000000000000000000..07038fec4156f44896612af9d921106c80653472 GIT binary patch literal 25398 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%0DO~rdJ~Dt zfbv`}saaW71k`7i)C#kFl*DK%%dU2yukCG@gomXAZ#nTMX*)c#`X(Iq`TaGY<81~| z@nG5XtUpiZH>1~?j!ozjY z%wvM6fPbs$>!Z1*IchS#{rMfzoVO#nyxc;6r_stmHK8xe{6XuzOC@1!2 zLTriVw~d^eumlGCl16e@tp)>O02h^%LBnVF50xAg)wy;`^fBlPg0M>PLSH=hV0+f` zVR+5tw;vM~&%?LSKZH2?UeKT5I5H%!#Mvv>N^0D5!InI2AfnWRK5P0#qtQcA+oz+I z(8UN2pBm=!jr&3Q-5j1~cV&6yONny_ym}H6kNfs5V>EAFY@}qR4~=| zjXOmx;3y9ZHeWxLi)~ZpZJh9t`JjOwk3n*b?LiRfP9>UGD@|9-&1B~FzpZ>K2irt+ zpNXOLFz_g!ZJX1H?ZHBG%XXUakAV5!`#;ie+h#9cWv#yMTL#cn`q)T<8ny{$>53OO z8k3?@qJ2Exq#{=BD2{d!T!?>Gw@>EIR~*1QUG>3D*Y?ZR4mtyWuLbqG3cSUbqO>2n zd)V7wsyYbd5g;VpKT3(uN7H@abMS0T*#G$cL#xuqhBs?O!}H}o#ui@|h$FgqEE`XW zyioyjy$j^<&Ov2K7i3R#_T2sgFdS=D13yhY)u#acH6YnoT8>@8N2pVGr<*I@@~cH1 zJ_t(m4h@Z3W{u*8KOJSlSIaH{DD^~GKQRQ@mT)S~#gw<nXL<~q?Qr}wvR zFTw$krRO-J6!smcQ@3x>3}qoOF(NNK^2`iu!h

qe17%q5_Gy$H1zP)`lSnOmX%M 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 variableManager.get(SelectComponent.CANDIDATE_VARIABLE, Object.class).map(this.objectService::getImagePath).orElse("")) .newValueHandler(this.getNewValueHandler()) .diagnosticsProvider(this.propertiesValidationProvider.getDiagnosticsProvider()) .kindProvider(this.propertiesValidationProvider.getKindProvider()) 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 index ea5e708667..532fc999bc 100644 --- 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 @@ -92,6 +92,7 @@ private MultiSelectDescription getMultiSelectDescription() { .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()) diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java index 01696bbe53..2e45c7f713 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo. + * 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 @@ -260,6 +260,7 @@ private SelectDescription convertSelect(org.eclipse.sirius.properties.SelectDesc .optionsProvider(optionsProvider) .optionIdProvider(optionIdProvider) .optionLabelProvider(optionLabelProvider) + .optionIconURLProvider(vm -> "") .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) .kindProvider(object -> "") diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/ObjectService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/ObjectService.java index bd9457dec9..4e53faacc1 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/ObjectService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/ObjectService.java @@ -26,7 +26,6 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.DynamicEObjectImpl; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.edit.domain.EditingDomain; @@ -34,6 +33,7 @@ import org.eclipse.emf.edit.provider.ComposedImage; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.ReflectiveItemProvider; import org.eclipse.sirius.components.core.api.IEditingContext; import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.emf.services.api.IEMFKindService; @@ -151,10 +151,10 @@ public String getFullLabel(Object object) { @Override public String getImagePath(Object object) { - if (object instanceof EObject eObject && !(object instanceof DynamicEObjectImpl)) { + if (object instanceof EObject eObject) { Adapter adapter = this.composedAdapterFactory.adapt(eObject, IItemLabelProvider.class); - if (adapter instanceof IItemLabelProvider labelProvider) { + if (adapter instanceof IItemLabelProvider labelProvider && !(adapter instanceof ReflectiveItemProvider)) { try { Object image = labelProvider.getImage(eObject); String imageFullPath = this.findImagePath(image); diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/MultiSelectStyleProvider.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/MultiSelectStyleProvider.java index 8e3b100621..2193bc5d6d 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/MultiSelectStyleProvider.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/MultiSelectStyleProvider.java @@ -55,6 +55,7 @@ public MultiSelectStyle build() { boolean bold = this.viewStyle.isBold(); boolean underline = this.viewStyle.isUnderline(); boolean strikeThrough = this.viewStyle.isStrikeThrough(); + boolean isShowIcon = this.viewStyle.isShowIcon(); // @formatter:off return multiSelectStyleBuilder @@ -63,6 +64,7 @@ public MultiSelectStyle build() { .bold(bold) .underline(underline) .strikeThrough(strikeThrough) + .showIcon(isShowIcon) .build(); // @formatter:on } diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/SelectStyleProvider.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/SelectStyleProvider.java index a59cc81424..71013f4ba3 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/SelectStyleProvider.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/SelectStyleProvider.java @@ -55,6 +55,7 @@ public SelectStyle build() { boolean bold = this.viewStyle.isBold(); boolean underline = this.viewStyle.isUnderline(); boolean strikeThrough = this.viewStyle.isStrikeThrough(); + boolean isShowIcon = this.viewStyle.isShowIcon(); // @formatter:off return selectStyleBuilder @@ -63,6 +64,7 @@ public SelectStyle build() { .bold(bold) .underline(underline) .strikeThrough(strikeThrough) + .showIcon(isShowIcon) .build(); // @formatter:on } diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitch.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitch.java index 94a81d009c..c00c84b113 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitch.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitch.java @@ -167,6 +167,7 @@ public AbstractWidgetDescription caseSelectDescription(org.eclipse.sirius.compon .valueProvider(vm -> "") .optionIdProvider(vm -> "") .optionLabelProvider(vm -> "") + .optionIconURLProvider(vm -> "") .optionsProvider(vm -> List.of()) .newValueHandler((vm, value) -> new Success()) .diagnosticsProvider(vm -> List.of()) @@ -228,6 +229,7 @@ public AbstractWidgetDescription caseMultiSelectDescription(org.eclipse.sirius.c .valuesProvider(vm -> List.of()) .optionIdProvider(vm -> "") .optionLabelProvider(vm -> "") + .optionIconURLProvider(vm -> "") .optionsProvider(vm -> List.of()) .newValuesHandler((vm, values) -> new Success()) .diagnosticsProvider(vm -> List.of()) diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/resources/schema/form.graphqls b/packages/forms/backend/sirius-components-collaborative-forms/src/main/resources/schema/form.graphqls index 81ed474a55..b7818d6711 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/resources/schema/form.graphqls +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/resources/schema/form.graphqls @@ -180,6 +180,7 @@ type Select implements Widget { type SelectOption { id: ID! label: String! + iconURL: String } type SelectStyle { diff --git a/packages/forms/backend/sirius-components-forms-graphql/pom.xml b/packages/forms/backend/sirius-components-forms-graphql/pom.xml index 51bdeec9c6..5f62ccae6c 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/pom.xml +++ b/packages/forms/backend/sirius-components-forms-graphql/pom.xml @@ -58,6 +58,11 @@ sirius-components-annotations-spring 2023.6.1 + + org.eclipse.sirius + sirius-components-forms + 2023.6.1 + org.eclipse.sirius sirius-components-collaborative-forms diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/SelectOptionIconURLDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/SelectOptionIconURLDataFetcher.java new file mode 100644 index 0000000000..abb05b51f0 --- /dev/null +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/SelectOptionIconURLDataFetcher.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.forms.graphql.datafetchers.form; + +import org.eclipse.sirius.components.annotations.spring.graphql.QueryDataFetcher; +import org.eclipse.sirius.components.forms.SelectOption; +import org.eclipse.sirius.components.graphql.api.IDataFetcherWithFieldCoordinates; +import org.eclipse.sirius.components.graphql.api.URLConstants; + +import graphql.schema.DataFetchingEnvironment; + +/** + * Data fetcher for SelectOption.iconURL, to rewrite the relative path of the image into an absolute path on the server. + *

+ * If the SelectOption.iconURL is of the form path/to/image.svg, the rewritten value which will + * be seen by the frontend will be /api/images/path/to/image.svg. + * + * @author mcharfadi + */ +@QueryDataFetcher(type = "SelectOption", field = "iconURL") +public class SelectOptionIconURLDataFetcher implements IDataFetcherWithFieldCoordinates { + + @Override + public String get(DataFetchingEnvironment environment) throws Exception { + SelectOption option = environment.getSource(); + String result = option.getIconURL(); + if (result != null && !result.isBlank()) { + result = URLConstants.IMAGE_BASE_PATH + result; + } + return result; + } +} diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelectStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelectStyle.java index e338a7ad88..afbec6cd1c 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelectStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelectStyle.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Obeo. + * Copyright (c) 2022, 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 @@ -29,6 +29,8 @@ public final class MultiSelectStyle extends AbstractFontStyle { private String foregroundColor; + private boolean showIcon; + private MultiSelectStyle() { // Prevent instantiation } @@ -41,14 +43,18 @@ public String getForegroundColor() { return this.foregroundColor; } + public boolean isShowIcon() { + return this.showIcon; + } + public static Builder newMultiSelectStyle() { return new Builder(); } @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; - return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); + String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7}, isShowIcon: {8'}'}'"; + return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough, this.showIcon); } /** @@ -72,6 +78,8 @@ public static final class Builder { private boolean strikeThrough; + private boolean showIcon; + private Builder() { } @@ -100,6 +108,11 @@ public Builder bold(boolean bold) { return this; } + public Builder showIcon(boolean showIcon) { + this.showIcon = showIcon; + return this; + } + public Builder underline(boolean underline) { this.underline = underline; return this; @@ -119,6 +132,7 @@ public MultiSelectStyle build() { multiSelectStyle.bold = this.bold; multiSelectStyle.underline = this.underline; multiSelectStyle.strikeThrough = this.strikeThrough; + multiSelectStyle.showIcon = this.showIcon; return multiSelectStyle; } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectOption.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectOption.java index 2125549c4c..744ca8cebe 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectOption.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectOption.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo. + * 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 @@ -28,6 +28,8 @@ public final class SelectOption { private String label; + private String iconURL; + private SelectOption() { // Prevent instantiation } @@ -40,14 +42,18 @@ public String getLabel() { return this.label; } + public String getIconURL() { + return this.iconURL; + } + public static Builder newSelectOption(String id) { return new Builder(id); } @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; - return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); + String pattern = "{0} '{'id: {1}, label: {2}', iconUrl: {3}'"; + return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.iconURL); } /** @@ -61,6 +67,8 @@ public static final class Builder { private String label; + private String iconURL; + private Builder(String id) { this.id = Objects.requireNonNull(id); } @@ -70,10 +78,16 @@ public Builder label(String label) { return this; } + public Builder iconURL(String iconURL) { + this.iconURL = iconURL; + return this; + } + public SelectOption build() { SelectOption selectOption = new SelectOption(); selectOption.id = Objects.requireNonNull(this.id); selectOption.label = Objects.requireNonNull(this.label); + selectOption.iconURL = this.iconURL; return selectOption; } } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectStyle.java index 7f48760884..ea90c41583 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectStyle.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Obeo. + * Copyright (c) 2022, 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 @@ -28,6 +28,8 @@ public final class SelectStyle extends AbstractFontStyle { private String foregroundColor; + private boolean showIcon; + private SelectStyle() { // Prevent instantiation } @@ -40,14 +42,18 @@ public String getForegroundColor() { return this.foregroundColor; } + public boolean isShowIcon() { + return this.showIcon; + } + public static Builder newSelectStyle() { return new Builder(); } @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; - return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); + String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7}, isShowIcon: {8'}'"; + return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough, this.showIcon); } /** @@ -71,6 +77,8 @@ public static final class Builder { private boolean strikeThrough; + private boolean showIcon; + private Builder() { } @@ -99,6 +107,11 @@ public Builder bold(boolean bold) { return this; } + public Builder showIcon(boolean showIcon) { + this.showIcon = showIcon; + return this; + } + public Builder underline(boolean underline) { this.underline = underline; return this; @@ -118,6 +131,7 @@ public SelectStyle build() { selectStyle.bold = this.bold; selectStyle.underline = this.underline; selectStyle.strikeThrough = this.strikeThrough; + selectStyle.showIcon = this.showIcon; return selectStyle; } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/MultiSelectComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/MultiSelectComponent.java index cdea78500c..b5e8b4dcb4 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/MultiSelectComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/MultiSelectComponent.java @@ -54,6 +54,7 @@ public Element render() { String iconURL = multiSelectDescription.getIconURLProvider().apply(variableManager); List optionCandidates = multiSelectDescription.getOptionsProvider().apply(variableManager); List values = multiSelectDescription.getValuesProvider().apply(variableManager); + var multiSelectStyle = multiSelectDescription.getStyleProvider().apply(variableManager); List children = List.of(new Element(DiagnosticComponent.class, new DiagnosticComponentProps(multiSelectDescription, variableManager))); @@ -65,18 +66,21 @@ public Element render() { String optionId = multiSelectDescription.getOptionIdProvider().apply(optionVariableManager); String optionLabel = multiSelectDescription.getOptionLabelProvider().apply(optionVariableManager); - // @formatter:off - SelectOption option = SelectOption.newSelectOption(optionId) - .label(optionLabel) - .build(); - // @formatter:on + var selectOptionBuilder = SelectOption.newSelectOption(optionId) + .label(optionLabel); + if (multiSelectStyle != null && multiSelectStyle.isShowIcon()) { + String optionIconUrl = multiSelectDescription.getOptionIconURLProvider().apply(optionVariableManager); + if (optionIconUrl != null && !optionIconUrl.isBlank()) { + selectOptionBuilder.iconURL(optionIconUrl); + } + } + SelectOption option = selectOptionBuilder.build(); options.add(option); } Function, IStatus> newValuesHandler = newValues -> { return multiSelectDescription.getNewValuesHandler().apply(variableManager, newValues); }; - var multiSelectStyle = multiSelectDescription.getStyleProvider().apply(variableManager); // @formatter:off Builder multiSelectElementPropsBuilder = MultiSelectElementProps.newMultiSelectElementProps(id) diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/SelectComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/SelectComponent.java index f9265902fe..ab8a34df75 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/SelectComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/SelectComponent.java @@ -53,6 +53,7 @@ public Element render() { String iconURL = selectDescription.getIconURLProvider().apply(variableManager); List optionCandidates = selectDescription.getOptionsProvider().apply(variableManager); String value = selectDescription.getValueProvider().apply(variableManager); + var selectStyle = selectDescription.getStyleProvider().apply(variableManager); List children = List.of(new Element(DiagnosticComponent.class, new DiagnosticComponentProps(selectDescription, variableManager))); @@ -64,18 +65,21 @@ public Element render() { String optionId = selectDescription.getOptionIdProvider().apply(optionVariableManager); String optionLabel = selectDescription.getOptionLabelProvider().apply(optionVariableManager); - // @formatter:off - SelectOption option = SelectOption.newSelectOption(optionId) - .label(optionLabel) - .build(); - // @formatter:on + var selectOptionBuilder = SelectOption.newSelectOption(optionId) + .label(optionLabel); + if (selectStyle != null && selectStyle.isShowIcon()) { + String optionIconUrl = selectDescription.getOptionIconURLProvider().apply(optionVariableManager); + if (optionIconUrl != null && !optionIconUrl.isBlank()) { + selectOptionBuilder.iconURL(optionIconUrl); + } + } + SelectOption option = selectOptionBuilder.build(); options.add(option); } Function specializedHandler = newValue -> { return selectDescription.getNewValueHandler().apply(variableManager, newValue); }; - var selectStyle = selectDescription.getStyleProvider().apply(variableManager); // @formatter:off Builder selectElementPropsBuilder = SelectElementProps.newSelectElementProps(id) diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/MultiSelectDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/MultiSelectDescription.java index d7e943fd6a..ebf9a7f914 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/MultiSelectDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/MultiSelectDescription.java @@ -44,6 +44,8 @@ public final class MultiSelectDescription extends AbstractWidgetDescription { private Function optionLabelProvider; + private Function optionIconURLProvider; + private Function> valuesProvider; private BiFunction, IStatus> newValuesHandler; @@ -78,6 +80,10 @@ public Function getOptionLabelProvider() { return this.optionLabelProvider; } + public Function getOptionIconURLProvider() { + return this.optionIconURLProvider; + } + public Function> getValuesProvider() { return this.valuesProvider; } @@ -122,6 +128,8 @@ public static final class Builder { private Function optionLabelProvider; + private Function optionIconURLProvider = variableManager -> null; + private Function> valuesProvider; private BiFunction, IStatus> newValuesHandler; @@ -170,6 +178,11 @@ public Builder optionLabelProvider(Function optionLabel return this; } + public Builder optionIconURLProvider(Function optionIconURLProvider) { + this.optionIconURLProvider = Objects.requireNonNull(optionIconURLProvider); + return this; + } + public Builder valuesProvider(Function> valuesProvider) { this.valuesProvider = Objects.requireNonNull(valuesProvider); return this; @@ -214,6 +227,7 @@ public MultiSelectDescription build() { multiSelectDescription.optionsProvider = Objects.requireNonNull(this.optionsProvider); multiSelectDescription.optionIdProvider = Objects.requireNonNull(this.optionIdProvider); multiSelectDescription.optionLabelProvider = Objects.requireNonNull(this.optionLabelProvider); + multiSelectDescription.optionIconURLProvider = Objects.requireNonNull(this.optionIconURLProvider); multiSelectDescription.valuesProvider = Objects.requireNonNull(this.valuesProvider); multiSelectDescription.newValuesHandler = Objects.requireNonNull(this.newValuesHandler); multiSelectDescription.diagnosticsProvider = Objects.requireNonNull(this.diagnosticsProvider); diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/SelectDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/SelectDescription.java index 34f1c59347..c23710ba2a 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/SelectDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/SelectDescription.java @@ -43,6 +43,8 @@ public final class SelectDescription extends AbstractWidgetDescription { private Function optionLabelProvider; + private Function optionIconURLProvider; + private Function valueProvider; private BiFunction newValueHandler; @@ -77,6 +79,10 @@ public Function getOptionLabelProvider() { return this.optionLabelProvider; } + public Function getOptionIconURLProvider() { + return this.optionIconURLProvider; + } + public Function getValueProvider() { return this.valueProvider; } @@ -120,6 +126,8 @@ public static final class Builder { private Function optionLabelProvider; + private Function optionIconURLProvider = variableManager -> null; + private Function valueProvider; private BiFunction newValueHandler; @@ -168,6 +176,11 @@ public Builder optionLabelProvider(Function optionLabel return this; } + public Builder optionIconURLProvider(Function optionIconURLProvider) { + this.optionIconURLProvider = Objects.requireNonNull(optionIconURLProvider); + return this; + } + public Builder valueProvider(Function valueProvider) { this.valueProvider = Objects.requireNonNull(valueProvider); return this; @@ -212,6 +225,7 @@ public SelectDescription build() { selectDescription.optionsProvider = Objects.requireNonNull(this.optionsProvider); selectDescription.optionIdProvider = Objects.requireNonNull(this.optionIdProvider); selectDescription.optionLabelProvider = Objects.requireNonNull(this.optionLabelProvider); + selectDescription.optionIconURLProvider = Objects.requireNonNull(this.optionIconURLProvider); selectDescription.valueProvider = Objects.requireNonNull(this.valueProvider); selectDescription.newValueHandler = Objects.requireNonNull(this.newValueHandler); selectDescription.diagnosticsProvider = Objects.requireNonNull(this.diagnosticsProvider); diff --git a/packages/forms/frontend/sirius-components-forms/src/form/FormEventFragments.ts b/packages/forms/frontend/sirius-components-forms/src/form/FormEventFragments.ts index 21c0daeec4..c51385af58 100644 --- a/packages/forms/frontend/sirius-components-forms/src/form/FormEventFragments.ts +++ b/packages/forms/frontend/sirius-components-forms/src/form/FormEventFragments.ts @@ -98,6 +98,7 @@ export const widgetFields = (contributions: Array) => ` options { id label + iconURL } style { backgroundColor @@ -117,6 +118,7 @@ export const widgetFields = (contributions: Array) => ` options { id label + iconURL } style { backgroundColor diff --git a/packages/forms/frontend/sirius-components-forms/src/form/FormEventFragments.types.ts b/packages/forms/frontend/sirius-components-forms/src/form/FormEventFragments.types.ts index 779b484d82..f3cfbb41f2 100644 --- a/packages/forms/frontend/sirius-components-forms/src/form/FormEventFragments.types.ts +++ b/packages/forms/frontend/sirius-components-forms/src/form/FormEventFragments.types.ts @@ -207,6 +207,7 @@ export interface GQLMultiSelectStyle { export interface GQLSelectOption { id: string; label: string; + iconURL: string; } export interface GQLRadio extends GQLWidget { diff --git a/packages/forms/frontend/sirius-components-forms/src/propertysections/MultiSelectPropertySection.tsx b/packages/forms/frontend/sirius-components-forms/src/propertysections/MultiSelectPropertySection.tsx index 71f5eb4737..d86fa03ced 100644 --- a/packages/forms/frontend/sirius-components-forms/src/propertysections/MultiSelectPropertySection.tsx +++ b/packages/forms/frontend/sirius-components-forms/src/propertysections/MultiSelectPropertySection.tsx @@ -11,15 +11,16 @@ * Obeo - initial API and implementation *******************************************************************************/ import { gql, useMutation } from '@apollo/client'; -import { useMultiToast } from '@eclipse-sirius/sirius-components-core'; +import { ServerContext, useMultiToast } from '@eclipse-sirius/sirius-components-core'; import Checkbox from '@material-ui/core/Checkbox'; import FormControl from '@material-ui/core/FormControl'; import FormHelperText from '@material-ui/core/FormHelperText'; +import ListItemIcon from '@material-ui/core/ListItemIcon'; import ListItemText from '@material-ui/core/ListItemText'; import MenuItem from '@material-ui/core/MenuItem'; import Select from '@material-ui/core/Select'; import { Theme, makeStyles } from '@material-ui/core/styles'; -import { useEffect, useState } from 'react'; +import { useContext, useEffect, useState } from 'react'; import { GQLEditMultiSelectMutationData, GQLEditMultiSelectPayload, @@ -33,7 +34,7 @@ import { import { PropertySectionLabel } from './PropertySectionLabel'; import { getTextDecorationLineValue } from './getTextDecorationLineValue'; -const useStyle = makeStyles(() => ({ +const useStyle = makeStyles((theme) => ({ style: { backgroundColor: ({ backgroundColor }) => (backgroundColor ? backgroundColor : 'inherit'), color: ({ foregroundColor }) => (foregroundColor ? foregroundColor : 'inherit'), @@ -42,6 +43,13 @@ const useStyle = makeStyles(() => ({ fontWeight: ({ bold }) => (bold ? 'bold' : 'inherit'), textDecorationLine: ({ underline, strikeThrough }) => getTextDecorationLineValue(underline, strikeThrough), }, + icon: { + width: '16px', + height: '16px', + }, + iconRoot: { + minWidth: theme.spacing(3), + }, })); export const editMultiSelectMutation = gql` @@ -102,6 +110,8 @@ export const MultiSelectPropertySection = ({ }; const classes = useStyle(props); + const { httpOrigin } = useContext(ServerContext); + const [isFocused, setFocus] = useState(false); const [editMultiSelect, { loading, error, data }] = @@ -214,6 +224,11 @@ export const MultiSelectPropertySection = ({ {widget.options.map((option) => ( -1} /> + {option.iconURL && ( + + {option.label} + + )} (() => ({ +const useStyle = makeStyles((theme) => ({ style: { backgroundColor: ({ backgroundColor }) => (backgroundColor ? backgroundColor : 'inherit'), color: ({ foregroundColor }) => (foregroundColor ? foregroundColor : 'inherit'), @@ -39,6 +40,13 @@ const useStyle = makeStyles(() => ({ fontWeight: ({ bold }) => (bold ? 'bold' : 'inherit'), textDecorationLine: ({ underline, strikeThrough }) => getTextDecorationLineValue(underline, strikeThrough), }, + icon: { + width: '16px', + height: '16px', + }, + iconRoot: { + minWidth: theme.spacing(3), + }, })); export const editSelectMutation = gql` @@ -98,6 +106,8 @@ export const SelectPropertySection = ({ }; const classes = useStyle(props); + const { httpOrigin } = useContext(ServerContext); + const [isFocused, setFocus] = useState(false); const [editSelect, { loading, error, data }] = useMutation(editSelectMutation); @@ -219,6 +229,12 @@ export const SelectPropertySection = ({ } : {} }> + {option.iconURL && ( + + {option.label} + + )} + {option.label} ))} diff --git a/packages/forms/frontend/sirius-components-forms/src/propertysections/__tests__/__snapshots__/MultiSelectPropertySection.test.tsx.snap b/packages/forms/frontend/sirius-components-forms/src/propertysections/__tests__/__snapshots__/MultiSelectPropertySection.test.tsx.snap index 27d18ccf8c..fa88bd023b 100644 --- a/packages/forms/frontend/sirius-components-forms/src/propertysections/__tests__/__snapshots__/MultiSelectPropertySection.test.tsx.snap +++ b/packages/forms/frontend/sirius-components-forms/src/propertysections/__tests__/__snapshots__/MultiSelectPropertySection.test.tsx.snap @@ -7,7 +7,7 @@ exports[`should render the multiSelect help hint 1`] = ` class="MuiFormControl-root" >

@@ -133,7 +133,7 @@ exports[`should render the multiSelect with style 1`] = ` class="MuiFormControl-root" >
@@ -190,7 +190,7 @@ exports[`should render the multiSelect without style 1`] = ` class="MuiFormControl-root" >
@@ -64,7 +64,7 @@ exports[`should render the select with help hint 1`] = ` class="MuiFormControl-root" >
@@ -190,7 +190,7 @@ exports[`should render the select without style 1`] = ` class="MuiFormControl-root" >
getPropertyDescriptors(Object object) { this.addStrikeThroughPropertyDescriptor(object); this.addBackgroundColorPropertyDescriptor(object); this.addForegroundColorPropertyDescriptor(object); + this.addShowIconPropertyDescriptor(object); } return this.itemPropertyDescriptors; } @@ -141,6 +142,18 @@ protected void addForegroundColorPropertyDescriptor(Object object) { ViewPackage.Literals.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, null, null, null)); } + /** + * This adds a property descriptor for the Show Icon feature. + * + * @generated + */ + protected void addShowIconPropertyDescriptor(Object object) { + this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), + this.getString("_UI_MultiSelectDescriptionStyle_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_showIcon_feature", "_UI_MultiSelectDescriptionStyle_type"), + ViewPackage.Literals.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + /** * This returns ConditionalMultiSelectDescriptionStyle.gif. * @@ -192,6 +205,7 @@ public void notifyChanged(Notification notification) { case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__STRIKE_THROUGH: case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR: case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: + case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalSelectDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalSelectDescriptionStyleItemProvider.java index 6f32478678..6a555b5dab 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalSelectDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalSelectDescriptionStyleItemProvider.java @@ -57,6 +57,7 @@ public List getPropertyDescriptors(Object object) { this.addStrikeThroughPropertyDescriptor(object); this.addBackgroundColorPropertyDescriptor(object); this.addForegroundColorPropertyDescriptor(object); + this.addShowIconPropertyDescriptor(object); } return this.itemPropertyDescriptors; } @@ -140,6 +141,18 @@ protected void addForegroundColorPropertyDescriptor(Object object) { ViewPackage.Literals.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, null, null, null)); } + /** + * This adds a property descriptor for the Show Icon feature. + * + * @generated + */ + protected void addShowIconPropertyDescriptor(Object object) { + this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), + this.getString("_UI_SelectDescriptionStyle_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_showIcon_feature", "_UI_SelectDescriptionStyle_type"), + ViewPackage.Literals.SELECT_DESCRIPTION_STYLE__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + /** * This returns ConditionalSelectDescriptionStyle.gif. * @@ -190,6 +203,7 @@ public void notifyChanged(Notification notification) { case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__STRIKE_THROUGH: case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR: case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: + case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON: this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionStyleItemProvider.java index 49dc122ff4..0541ffb85a 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionStyleItemProvider.java @@ -57,6 +57,7 @@ public List getPropertyDescriptors(Object object) { this.addStrikeThroughPropertyDescriptor(object); this.addBackgroundColorPropertyDescriptor(object); this.addForegroundColorPropertyDescriptor(object); + this.addShowIconPropertyDescriptor(object); } return this.itemPropertyDescriptors; } @@ -140,6 +141,18 @@ protected void addForegroundColorPropertyDescriptor(Object object) { ViewPackage.Literals.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, null, null, null)); } + /** + * This adds a property descriptor for the Show Icon feature. + * + * @generated + */ + protected void addShowIconPropertyDescriptor(Object object) { + this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), + this.getString("_UI_MultiSelectDescriptionStyle_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_showIcon_feature", "_UI_MultiSelectDescriptionStyle_type"), + ViewPackage.Literals.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + /** * This returns MultiSelectDescriptionStyle.gif. * @@ -190,6 +203,7 @@ public void notifyChanged(Notification notification) { case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__STRIKE_THROUGH: case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR: case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: + case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionStyleItemProvider.java index 44fd510545..071773e564 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionStyleItemProvider.java @@ -57,6 +57,7 @@ public List getPropertyDescriptors(Object object) { this.addStrikeThroughPropertyDescriptor(object); this.addBackgroundColorPropertyDescriptor(object); this.addForegroundColorPropertyDescriptor(object); + this.addShowIconPropertyDescriptor(object); } return this.itemPropertyDescriptors; } @@ -140,6 +141,18 @@ protected void addForegroundColorPropertyDescriptor(Object object) { ViewPackage.Literals.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, null, null, null)); } + /** + * This adds a property descriptor for the Show Icon feature. + * + * @generated + */ + protected void addShowIconPropertyDescriptor(Object object) { + this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), + this.getString("_UI_SelectDescriptionStyle_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_showIcon_feature", "_UI_SelectDescriptionStyle_type"), + ViewPackage.Literals.SELECT_DESCRIPTION_STYLE__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); + } + /** * This returns SelectDescriptionStyle.gif. * @@ -190,6 +203,7 @@ public void notifyChanged(Notification notification) { case ViewPackage.SELECT_DESCRIPTION_STYLE__STRIKE_THROUGH: case ViewPackage.SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR: case ViewPackage.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: + case ViewPackage.SELECT_DESCRIPTION_STYLE__SHOW_ICON: this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } diff --git a/packages/view/backend/sirius-components-view-edit/src/main/resources/plugin.properties b/packages/view/backend/sirius-components-view-edit/src/main/resources/plugin.properties index 568567f29b..b44382dadd 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/resources/plugin.properties +++ b/packages/view/backend/sirius-components-view-edit/src/main/resources/plugin.properties @@ -280,8 +280,10 @@ _UI_TextfieldDescriptionStyle_foregroundColor_feature = Foreground Color _UI_CheckboxDescriptionStyle_color_feature = Color _UI_SelectDescriptionStyle_backgroundColor_feature = Background Color _UI_SelectDescriptionStyle_foregroundColor_feature = Foreground Color +_UI_SelectDescriptionStyle_showIcon_feature = Show Icon _UI_MultiSelectDescriptionStyle_backgroundColor_feature = Background Color _UI_MultiSelectDescriptionStyle_foregroundColor_feature = Foreground Color +_UI_MultiSelectDescriptionStyle_showIcon_feature = Show Icon _UI_TextareaDescriptionStyle_backgroundColor_feature = Background Color _UI_TextareaDescriptionStyle_foregroundColor_feature = Foreground Color _UI_RadioDescriptionStyle_color_feature = Color 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 8d6aba55e7..3e22257f2c 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 @@ -35,6 +35,7 @@ import org.eclipse.sirius.components.collaborative.forms.services.api.IPropertiesDescriptionRegistryConfigurer; import org.eclipse.sirius.components.collaborative.validation.api.IValidationService; import org.eclipse.sirius.components.core.api.IEditingContext; +import org.eclipse.sirius.components.core.api.IObjectService; import org.eclipse.sirius.components.emf.services.EditingContext; import org.eclipse.sirius.components.forms.components.SelectComponent; import org.eclipse.sirius.components.forms.description.AbstractControlDescription; @@ -85,12 +86,15 @@ public class NodeStylePropertiesConfigurer implements IPropertiesDescriptionRegi private final AQLTextfieldCustomizer aqlTextfieldCustomizer; + private final IObjectService objectService; + public NodeStylePropertiesConfigurer(ICustomImageMetadataSearchService customImageSearchService, IValidationService validationService, - List parametricSVGImageRegistries, AQLTextfieldCustomizer aqlTextfieldCustomizer) { + List parametricSVGImageRegistries, AQLTextfieldCustomizer aqlTextfieldCustomizer, IObjectService objectService) { this.validationService = Objects.requireNonNull(validationService); this.customImageSearchService = Objects.requireNonNull(customImageSearchService); this.parametricSVGImageRegistries = parametricSVGImageRegistries; this.aqlTextfieldCustomizer = Objects.requireNonNull(aqlTextfieldCustomizer); + this.objectService = Objects.requireNonNull(objectService); } @Override @@ -337,6 +341,7 @@ private SelectDescription createBorderLineStyleSelectionField(String id, Object .optionsProvider(variableManager -> LineStyle.VALUES.stream().toList()) .optionIdProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, LineStyle.class).map(LineStyle::getLiteral).orElse(EMPTY)) .optionLabelProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, LineStyle.class).map(LineStyle::getName).orElse(EMPTY)) + .optionIconURLProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, Object.class).map(this.objectService::getImagePath).orElse("")) .newValueHandler((variableManager, newValue) -> { var optionalBorderStyle = variableManager.get(VariableManager.SELF, BorderStyle.class); if (optionalBorderStyle.isPresent()) { @@ -372,6 +377,7 @@ private SelectDescription createUserColorSelectionField(String id, String la .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) -> { @@ -435,6 +441,7 @@ private SelectDescription createShapeSelectionField(Object feature) { .optionLabelProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, CustomImageMetadata.class) .map(CustomImageMetadata::getLabel) .orElse(EMPTY)) + .optionIconURLProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, Object.class).map(this.objectService::getImagePath).orElse("")) .newValueHandler(this.getNewShapeValueHandler()) .diagnosticsProvider(this.getDiagnosticsProvider(feature)) .kindProvider(this::kindProvider) diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/MultiSelectStyleProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/MultiSelectStyleProvider.java index 7ade691052..116d30bfbe 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/MultiSelectStyleProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/MultiSelectStyleProvider.java @@ -57,6 +57,7 @@ public MultiSelectStyle apply(VariableManager variableManager) { boolean bold = this.viewStyle.isBold(); boolean underline = this.viewStyle.isUnderline(); boolean strikeThrough = this.viewStyle.isStrikeThrough(); + boolean isShowIcon = this.viewStyle.isShowIcon(); // @formatter:off return multiSelectStyleBuilder @@ -65,6 +66,7 @@ public MultiSelectStyle apply(VariableManager variableManager) { .bold(bold) .underline(underline) .strikeThrough(strikeThrough) + .showIcon(isShowIcon) .build(); // @formatter:on } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/SelectStyleProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/SelectStyleProvider.java index 433efdd35d..849037631c 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/SelectStyleProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/SelectStyleProvider.java @@ -57,6 +57,7 @@ public SelectStyle apply(VariableManager variableManager) { boolean bold = this.viewStyle.isBold(); boolean underline = this.viewStyle.isUnderline(); boolean strikeThrough = this.viewStyle.isStrikeThrough(); + boolean isShowIcon = this.viewStyle.isShowIcon(); // @formatter:off return selectStyleBuilder @@ -65,6 +66,7 @@ public SelectStyle apply(VariableManager variableManager) { .bold(bold) .underline(underline) .strikeThrough(strikeThrough) + .showIcon(isShowIcon) .build(); // @formatter:on } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java index 597db0c0b4..1241478f68 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java @@ -190,6 +190,7 @@ public AbstractWidgetDescription caseSelectDescription(org.eclipse.sirius.compon String descriptionId = this.getDescriptionId(viewSelectDescription); WidgetIdProvider idProvider = new WidgetIdProvider(); StringValueProvider labelProvider = this.getStringValueProvider(viewSelectDescription.getLabelExpression()); + Function optionIconURLProvider = this.getOptionIconURLProvider(); Function valueProvider = this.getSelectValueProvider(viewSelectDescription.getValueExpression()); Function optionIdProvider = this.getOptionIdProvider(); StringValueProvider optionLabelProvider = this.getStringValueProvider(viewSelectDescription.getCandidateLabelExpression()); @@ -215,6 +216,7 @@ public AbstractWidgetDescription caseSelectDescription(org.eclipse.sirius.compon .optionIdProvider(optionIdProvider) .optionLabelProvider(optionLabelProvider) .optionsProvider(optionsProvider) + .optionIconURLProvider(optionIconURLProvider) .newValueHandler(selectNewValueHandler) .diagnosticsProvider(variableManager -> List.of()) .kindProvider(diagnostic -> "") @@ -287,6 +289,7 @@ public AbstractWidgetDescription caseMultiSelectDescription(org.eclipse.sirius.c String descriptionId = this.getDescriptionId(multiSelectDescription); WidgetIdProvider idProvider = new WidgetIdProvider(); StringValueProvider labelProvider = this.getStringValueProvider(multiSelectDescription.getLabelExpression()); + Function optionIconURLProvider = this.getOptionIconURLProvider(); Function> valuesProvider = this.getMultiSelectValuesProvider(multiSelectDescription.getValueExpression()); Function optionIdProvider = this.getOptionIdProvider(); StringValueProvider optionLabelProvider = this.getStringValueProvider(multiSelectDescription.getCandidateLabelExpression()); @@ -311,6 +314,7 @@ public AbstractWidgetDescription caseMultiSelectDescription(org.eclipse.sirius.c .valuesProvider(valuesProvider) .optionIdProvider(optionIdProvider) .optionLabelProvider(optionLabelProvider) + .optionIconURLProvider(optionIconURLProvider) .optionsProvider(optionsProvider) .newValuesHandler(multiSelectNewValueHandler) .diagnosticsProvider(variableManager -> List.of()) @@ -783,6 +787,10 @@ private BiFunction getSelectNewValueHandler(Li }; } + private Function getOptionIconURLProvider() { + return variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, Object.class).map(this.objectService::getImagePath).orElse(""); + } + private String getDescriptionId(EObject description) { String descriptionURI = EcoreUtil.getURI(description).toString(); return UUID.nameUUIDFromBytes(descriptionURI.getBytes()).toString(); diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/MultiSelectDescriptionStyle.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/MultiSelectDescriptionStyle.java index abdc33a112..8e2b10d278 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/MultiSelectDescriptionStyle.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/MultiSelectDescriptionStyle.java @@ -24,6 +24,7 @@ * Color} *
  • {@link org.eclipse.sirius.components.view.MultiSelectDescriptionStyle#getForegroundColor Foreground * Color}
    • + *
  • {@link org.eclipse.sirius.components.view.MultiSelectDescriptionStyle#isShowIcon Show Icon}
    • * * * @see org.eclipse.sirius.components.view.ViewPackage#getMultiSelectDescriptionStyle() @@ -77,4 +78,26 @@ public interface MultiSelectDescriptionStyle extends WidgetDescriptionStyle, Lab */ void setForegroundColor(UserColor value); + /** + * Returns the value of the 'Show Icon' attribute. + * + * @return the value of the 'Show Icon' attribute. + * @see #setShowIcon(boolean) + * @see org.eclipse.sirius.components.view.ViewPackage#getMultiSelectDescriptionStyle_ShowIcon() + * @model + * @generated + */ + boolean isShowIcon(); + + /** + * Sets the value of the '{@link org.eclipse.sirius.components.view.MultiSelectDescriptionStyle#isShowIcon Show + * Icon}' attribute. + * + * @param value + * the new value of the 'Show Icon' attribute. + * @see #isShowIcon() + * @generated + */ + void setShowIcon(boolean value); + } // MultiSelectDescriptionStyle diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/SelectDescriptionStyle.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/SelectDescriptionStyle.java index 348957a23d..32f10183c5 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/SelectDescriptionStyle.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/SelectDescriptionStyle.java @@ -24,6 +24,7 @@ * Color} *
  • {@link org.eclipse.sirius.components.view.SelectDescriptionStyle#getForegroundColor Foreground * Color}
    • + *
  • {@link org.eclipse.sirius.components.view.SelectDescriptionStyle#isShowIcon Show Icon}
    • * * * @see org.eclipse.sirius.components.view.ViewPackage#getSelectDescriptionStyle() @@ -77,4 +78,26 @@ public interface SelectDescriptionStyle extends WidgetDescriptionStyle, LabelSty */ void setForegroundColor(UserColor value); + /** + * Returns the value of the 'Show Icon' attribute. + * + * @return the value of the 'Show Icon' attribute. + * @see #setShowIcon(boolean) + * @see org.eclipse.sirius.components.view.ViewPackage#getSelectDescriptionStyle_ShowIcon() + * @model + * @generated + */ + boolean isShowIcon(); + + /** + * Sets the value of the '{@link org.eclipse.sirius.components.view.SelectDescriptionStyle#isShowIcon Show + * Icon}' attribute. + * + * @param value + * the new value of the 'Show Icon' attribute. + * @see #isShowIcon() + * @generated + */ + void setShowIcon(boolean value); + } // SelectDescriptionStyle diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ViewPackage.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ViewPackage.java index 676c80b4f4..30e520a6f2 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ViewPackage.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ViewPackage.java @@ -4535,6 +4535,14 @@ public interface ViewPackage extends EPackage { */ int SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR = WIDGET_DESCRIPTION_STYLE_FEATURE_COUNT + 6; + /** + * The feature id for the 'Show Icon' attribute. + * + * @generated + * @ordered + */ + int SELECT_DESCRIPTION_STYLE__SHOW_ICON = WIDGET_DESCRIPTION_STYLE_FEATURE_COUNT + 7; + /** * The number of structural features of the 'Select Description Style' class. @@ -4542,7 +4550,7 @@ public interface ViewPackage extends EPackage { * @generated * @ordered */ - int SELECT_DESCRIPTION_STYLE_FEATURE_COUNT = WIDGET_DESCRIPTION_STYLE_FEATURE_COUNT + 7; + int SELECT_DESCRIPTION_STYLE_FEATURE_COUNT = WIDGET_DESCRIPTION_STYLE_FEATURE_COUNT + 8; /** * The number of operations of the 'Select Description Style' class. + * + * @generated + * @ordered + */ + int CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON = CONDITIONAL_FEATURE_COUNT + 7; + /** * The number of structural features of the 'Conditional Select Description Style' class. @@ -4636,7 +4652,7 @@ public interface ViewPackage extends EPackage { * @generated * @ordered */ - int CONDITIONAL_SELECT_DESCRIPTION_STYLE_FEATURE_COUNT = CONDITIONAL_FEATURE_COUNT + 7; + int CONDITIONAL_SELECT_DESCRIPTION_STYLE_FEATURE_COUNT = CONDITIONAL_FEATURE_COUNT + 8; /** * The number of operations of the 'Conditional Select Description Style' class. @@ -4715,6 +4731,14 @@ public interface ViewPackage extends EPackage { */ int MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR = WIDGET_DESCRIPTION_STYLE_FEATURE_COUNT + 6; + /** + * The feature id for the 'Show Icon' attribute. + * + * @generated + * @ordered + */ + int MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON = WIDGET_DESCRIPTION_STYLE_FEATURE_COUNT + 7; + /** * The number of structural features of the 'Multi Select Description Style' class. * @@ -4722,7 +4746,7 @@ public interface ViewPackage extends EPackage { * @generated * @ordered */ - int MULTI_SELECT_DESCRIPTION_STYLE_FEATURE_COUNT = WIDGET_DESCRIPTION_STYLE_FEATURE_COUNT + 7; + int MULTI_SELECT_DESCRIPTION_STYLE_FEATURE_COUNT = WIDGET_DESCRIPTION_STYLE_FEATURE_COUNT + 8; /** * The number of operations of the 'Multi Select Description Style' class. + * + * @generated + * @ordered + */ + int CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON = CONDITIONAL_FEATURE_COUNT + 7; + /** * The number of structural features of the 'Conditional Multi Select Description Style' class. @@ -4817,7 +4849,7 @@ public interface ViewPackage extends EPackage { * @generated * @ordered */ - int CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE_FEATURE_COUNT = CONDITIONAL_FEATURE_COUNT + 7; + int CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE_FEATURE_COUNT = CONDITIONAL_FEATURE_COUNT + 8; /** * The number of operations of the 'Conditional Multi Select Description Style' class. + * + * @return the meta object for the attribute 'Show Icon'. + * @see org.eclipse.sirius.components.view.SelectDescriptionStyle#isShowIcon() + * @see #getSelectDescriptionStyle() + * @generated + */ + EAttribute getSelectDescriptionStyle_ShowIcon(); + /** * Returns the meta object for class '{@link org.eclipse.sirius.components.view.ConditionalSelectDescriptionStyle * Conditional Select Description Style}'. @@ -9317,6 +9361,18 @@ public interface ViewPackage extends EPackage { */ EReference getMultiSelectDescriptionStyle_ForegroundColor(); + /** + * Returns the meta object for the attribute + * '{@link org.eclipse.sirius.components.view.MultiSelectDescriptionStyle#isShowIcon Show Icon}'. + * + * @return the meta object for the attribute 'Show Icon'. + * @see org.eclipse.sirius.components.view.MultiSelectDescriptionStyle#isShowIcon() + * @see #getMultiSelectDescriptionStyle() + * @generated + */ + EAttribute getMultiSelectDescriptionStyle_ShowIcon(); + /** * Returns the meta object for class * '{@link org.eclipse.sirius.components.view.ConditionalMultiSelectDescriptionStyle Conditional Multi Select @@ -12044,6 +12100,14 @@ interface Literals { */ EReference SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR = eINSTANCE.getSelectDescriptionStyle_ForegroundColor(); + /** + * The meta object literal for the 'Show Icon' attribute feature. + * + * @generated + */ + EAttribute SELECT_DESCRIPTION_STYLE__SHOW_ICON = eINSTANCE.getSelectDescriptionStyle_ShowIcon(); + /** * The meta object literal for the * '{@link org.eclipse.sirius.components.view.impl.ConditionalSelectDescriptionStyleImpl Conditional Select @@ -12082,6 +12146,14 @@ interface Literals { */ EReference MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR = eINSTANCE.getMultiSelectDescriptionStyle_ForegroundColor(); + /** + * The meta object literal for the 'Show Icon' attribute feature. + * + * @generated + */ + EAttribute MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON = eINSTANCE.getMultiSelectDescriptionStyle_ShowIcon(); + /** * The meta object literal for the * '{@link org.eclipse.sirius.components.view.impl.ConditionalMultiSelectDescriptionStyleImpl Conditional diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ConditionalMultiSelectDescriptionStyleImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ConditionalMultiSelectDescriptionStyleImpl.java index d5d2cebe76..1eb6167816 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ConditionalMultiSelectDescriptionStyleImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ConditionalMultiSelectDescriptionStyleImpl.java @@ -44,6 +44,8 @@ * Background Color} *
  • {@link org.eclipse.sirius.components.view.impl.ConditionalMultiSelectDescriptionStyleImpl#getForegroundColor * Foreground Color}
    • + *
  • {@link org.eclipse.sirius.components.view.impl.ConditionalMultiSelectDescriptionStyleImpl#isShowIcon Show + * Icon}
    • * * * @generated @@ -169,6 +171,26 @@ public class ConditionalMultiSelectDescriptionStyleImpl extends ConditionalImpl */ protected UserColor foregroundColor; + /** + * The default value of the '{@link #isShowIcon() Show Icon}' attribute. + * + * @see #isShowIcon() + * @generated + * @ordered + */ + protected static final boolean SHOW_ICON_EDEFAULT = false; + + /** + * The cached value of the '{@link #isShowIcon() Show Icon}' attribute. + * + * @see #isShowIcon() + * @generated + * @ordered + */ + protected boolean showIcon = SHOW_ICON_EDEFAULT; + /** * * @@ -383,6 +405,29 @@ public void setForegroundColor(UserColor newForegroundColor) { this.eNotify(new ENotificationImpl(this, Notification.SET, ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, oldForegroundColor, this.foregroundColor)); } + /** + * + * + * @generated + */ + @Override + public boolean isShowIcon() { + return this.showIcon; + } + + /** + * + * + * @generated + */ + @Override + public void setShowIcon(boolean newShowIcon) { + boolean oldShowIcon = this.showIcon; + this.showIcon = newShowIcon; + if (this.eNotificationRequired()) + this.eNotify(new ENotificationImpl(this, Notification.SET, ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON, oldShowIcon, this.showIcon)); + } + /** * * @@ -409,6 +454,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { if (resolve) return this.getForegroundColor(); return this.basicGetForegroundColor(); + case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return this.isShowIcon(); } return super.eGet(featureID, resolve, coreType); } @@ -442,6 +489,9 @@ public void eSet(int featureID, Object newValue) { case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: this.setForegroundColor((UserColor) newValue); return; + case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + this.setShowIcon((Boolean) newValue); + return; } super.eSet(featureID, newValue); } @@ -475,6 +525,9 @@ public void eUnset(int featureID) { case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: this.setForegroundColor((UserColor) null); return; + case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + this.setShowIcon(SHOW_ICON_EDEFAULT); + return; } super.eUnset(featureID); } @@ -501,6 +554,8 @@ public boolean eIsSet(int featureID) { return this.backgroundColor != null; case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: return this.foregroundColor != null; + case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return this.showIcon != SHOW_ICON_EDEFAULT; } return super.eIsSet(featureID); } @@ -540,6 +595,8 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { return ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR; case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: return ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR; + case ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON; default: return -1; } @@ -582,6 +639,8 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { return ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR; case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: return ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR; + case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return ViewPackage.CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON; default: return -1; } @@ -610,6 +669,8 @@ public String toString() { result.append(this.underline); result.append(", strikeThrough: "); result.append(this.strikeThrough); + result.append(", showIcon: "); + result.append(this.showIcon); result.append(')'); return result.toString(); } diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ConditionalSelectDescriptionStyleImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ConditionalSelectDescriptionStyleImpl.java index 54dcdec16b..74db5ea72b 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ConditionalSelectDescriptionStyleImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ConditionalSelectDescriptionStyleImpl.java @@ -43,6 +43,8 @@ * Background Color} *
  • {@link org.eclipse.sirius.components.view.impl.ConditionalSelectDescriptionStyleImpl#getForegroundColor * Foreground Color}
    • + *
  • {@link org.eclipse.sirius.components.view.impl.ConditionalSelectDescriptionStyleImpl#isShowIcon Show + * Icon}
    • * * * @generated @@ -168,6 +170,26 @@ public class ConditionalSelectDescriptionStyleImpl extends ConditionalImpl imple */ protected UserColor foregroundColor; + /** + * The default value of the '{@link #isShowIcon() Show Icon}' attribute. + * + * @see #isShowIcon() + * @generated + * @ordered + */ + protected static final boolean SHOW_ICON_EDEFAULT = false; + + /** + * The cached value of the '{@link #isShowIcon() Show Icon}' attribute. + * + * @see #isShowIcon() + * @generated + * @ordered + */ + protected boolean showIcon = SHOW_ICON_EDEFAULT; + /** * * @@ -382,6 +404,29 @@ public void setForegroundColor(UserColor newForegroundColor) { this.eNotify(new ENotificationImpl(this, Notification.SET, ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, oldForegroundColor, this.foregroundColor)); } + /** + * + * + * @generated + */ + @Override + public boolean isShowIcon() { + return this.showIcon; + } + + /** + * + * + * @generated + */ + @Override + public void setShowIcon(boolean newShowIcon) { + boolean oldShowIcon = this.showIcon; + this.showIcon = newShowIcon; + if (this.eNotificationRequired()) + this.eNotify(new ENotificationImpl(this, Notification.SET, ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON, oldShowIcon, this.showIcon)); + } + /** * * @@ -408,6 +453,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { if (resolve) return this.getForegroundColor(); return this.basicGetForegroundColor(); + case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return this.isShowIcon(); } return super.eGet(featureID, resolve, coreType); } @@ -441,6 +488,9 @@ public void eSet(int featureID, Object newValue) { case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: this.setForegroundColor((UserColor) newValue); return; + case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + this.setShowIcon((Boolean) newValue); + return; } super.eSet(featureID, newValue); } @@ -474,6 +524,9 @@ public void eUnset(int featureID) { case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: this.setForegroundColor((UserColor) null); return; + case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + this.setShowIcon(SHOW_ICON_EDEFAULT); + return; } super.eUnset(featureID); } @@ -500,6 +553,8 @@ public boolean eIsSet(int featureID) { return this.backgroundColor != null; case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: return this.foregroundColor != null; + case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return this.showIcon != SHOW_ICON_EDEFAULT; } return super.eIsSet(featureID); } @@ -539,6 +594,8 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { return ViewPackage.SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR; case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: return ViewPackage.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR; + case ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return ViewPackage.SELECT_DESCRIPTION_STYLE__SHOW_ICON; default: return -1; } @@ -581,6 +638,8 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { return ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR; case ViewPackage.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: return ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR; + case ViewPackage.SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return ViewPackage.CONDITIONAL_SELECT_DESCRIPTION_STYLE__SHOW_ICON; default: return -1; } @@ -609,6 +668,8 @@ public String toString() { result.append(this.underline); result.append(", strikeThrough: "); result.append(this.strikeThrough); + result.append(", showIcon: "); + result.append(this.showIcon); result.append(')'); return result.toString(); } diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/MultiSelectDescriptionStyleImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/MultiSelectDescriptionStyleImpl.java index 2e9202ee03..b26544fe10 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/MultiSelectDescriptionStyleImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/MultiSelectDescriptionStyleImpl.java @@ -40,6 +40,8 @@ * Color    } *
  • {@link org.eclipse.sirius.components.view.impl.MultiSelectDescriptionStyleImpl#getForegroundColor Foreground * Color}
    • + *
  • {@link org.eclipse.sirius.components.view.impl.MultiSelectDescriptionStyleImpl#isShowIcon Show + * Icon}
    • * * * @generated @@ -165,6 +167,26 @@ public class MultiSelectDescriptionStyleImpl extends WidgetDescriptionStyleImpl */ protected UserColor foregroundColor; + /** + * The default value of the '{@link #isShowIcon() Show Icon}' attribute. + * + * @see #isShowIcon() + * @generated + * @ordered + */ + protected static final boolean SHOW_ICON_EDEFAULT = false; + + /** + * The cached value of the '{@link #isShowIcon() Show Icon}' attribute. + * + * @see #isShowIcon() + * @generated + * @ordered + */ + protected boolean showIcon = SHOW_ICON_EDEFAULT; + /** * * @@ -379,6 +401,29 @@ public void setForegroundColor(UserColor newForegroundColor) { this.eNotify(new ENotificationImpl(this, Notification.SET, ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, oldForegroundColor, this.foregroundColor)); } + /** + * + * + * @generated + */ + @Override + public boolean isShowIcon() { + return this.showIcon; + } + + /** + * + * + * @generated + */ + @Override + public void setShowIcon(boolean newShowIcon) { + boolean oldShowIcon = this.showIcon; + this.showIcon = newShowIcon; + if (this.eNotificationRequired()) + this.eNotify(new ENotificationImpl(this, Notification.SET, ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON, oldShowIcon, this.showIcon)); + } + /** * * @@ -405,6 +450,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { if (resolve) return this.getForegroundColor(); return this.basicGetForegroundColor(); + case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return this.isShowIcon(); } return super.eGet(featureID, resolve, coreType); } @@ -438,6 +485,9 @@ public void eSet(int featureID, Object newValue) { case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: this.setForegroundColor((UserColor) newValue); return; + case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + this.setShowIcon((Boolean) newValue); + return; } super.eSet(featureID, newValue); } @@ -471,6 +521,9 @@ public void eUnset(int featureID) { case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: this.setForegroundColor((UserColor) null); return; + case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + this.setShowIcon(SHOW_ICON_EDEFAULT); + return; } super.eUnset(featureID); } @@ -497,6 +550,8 @@ public boolean eIsSet(int featureID) { return this.backgroundColor != null; case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: return this.foregroundColor != null; + case ViewPackage.MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return this.showIcon != SHOW_ICON_EDEFAULT; } return super.eIsSet(featureID); } @@ -574,6 +629,8 @@ public String toString() { result.append(this.underline); result.append(", strikeThrough: "); result.append(this.strikeThrough); + result.append(", showIcon: "); + result.append(this.showIcon); result.append(')'); return result.toString(); } diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/SelectDescriptionStyleImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/SelectDescriptionStyleImpl.java index a221f283fe..1d7e28b4c3 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/SelectDescriptionStyleImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/SelectDescriptionStyleImpl.java @@ -38,6 +38,7 @@ * Color    } *
  • {@link org.eclipse.sirius.components.view.impl.SelectDescriptionStyleImpl#getForegroundColor Foreground * Color}
    • + *
  • {@link org.eclipse.sirius.components.view.impl.SelectDescriptionStyleImpl#isShowIcon Show Icon}
    • * * * @generated @@ -163,6 +164,26 @@ public class SelectDescriptionStyleImpl extends WidgetDescriptionStyleImpl imple */ protected UserColor foregroundColor; + /** + * The default value of the '{@link #isShowIcon() Show Icon}' attribute. + * + * @see #isShowIcon() + * @generated + * @ordered + */ + protected static final boolean SHOW_ICON_EDEFAULT = false; + + /** + * The cached value of the '{@link #isShowIcon() Show Icon}' attribute. + * + * @see #isShowIcon() + * @generated + * @ordered + */ + protected boolean showIcon = SHOW_ICON_EDEFAULT; + /** * * @@ -377,6 +398,29 @@ public void setForegroundColor(UserColor newForegroundColor) { this.eNotify(new ENotificationImpl(this, Notification.SET, ViewPackage.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, oldForegroundColor, this.foregroundColor)); } + /** + * + * + * @generated + */ + @Override + public boolean isShowIcon() { + return this.showIcon; + } + + /** + * + * + * @generated + */ + @Override + public void setShowIcon(boolean newShowIcon) { + boolean oldShowIcon = this.showIcon; + this.showIcon = newShowIcon; + if (this.eNotificationRequired()) + this.eNotify(new ENotificationImpl(this, Notification.SET, ViewPackage.SELECT_DESCRIPTION_STYLE__SHOW_ICON, oldShowIcon, this.showIcon)); + } + /** * * @@ -403,6 +447,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { if (resolve) return this.getForegroundColor(); return this.basicGetForegroundColor(); + case ViewPackage.SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return this.isShowIcon(); } return super.eGet(featureID, resolve, coreType); } @@ -436,6 +482,9 @@ public void eSet(int featureID, Object newValue) { case ViewPackage.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: this.setForegroundColor((UserColor) newValue); return; + case ViewPackage.SELECT_DESCRIPTION_STYLE__SHOW_ICON: + this.setShowIcon((Boolean) newValue); + return; } super.eSet(featureID, newValue); } @@ -469,6 +518,9 @@ public void eUnset(int featureID) { case ViewPackage.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: this.setForegroundColor((UserColor) null); return; + case ViewPackage.SELECT_DESCRIPTION_STYLE__SHOW_ICON: + this.setShowIcon(SHOW_ICON_EDEFAULT); + return; } super.eUnset(featureID); } @@ -495,6 +547,8 @@ public boolean eIsSet(int featureID) { return this.backgroundColor != null; case ViewPackage.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR: return this.foregroundColor != null; + case ViewPackage.SELECT_DESCRIPTION_STYLE__SHOW_ICON: + return this.showIcon != SHOW_ICON_EDEFAULT; } return super.eIsSet(featureID); } @@ -572,6 +626,8 @@ public String toString() { result.append(this.underline); result.append(", strikeThrough: "); result.append(this.strikeThrough); + result.append(", showIcon: "); + result.append(this.showIcon); result.append(')'); return result.toString(); } diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ViewPackageImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ViewPackageImpl.java index c4785d5861..775d7f32c5 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ViewPackageImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ViewPackageImpl.java @@ -3074,6 +3074,16 @@ public EReference getSelectDescriptionStyle_ForegroundColor() { return (EReference) this.selectDescriptionStyleEClass.getEStructuralFeatures().get(1); } + /** + * + * + * @generated + */ + @Override + public EAttribute getSelectDescriptionStyle_ShowIcon() { + return (EAttribute) this.selectDescriptionStyleEClass.getEStructuralFeatures().get(2); + } + /** * * @@ -3114,6 +3124,16 @@ public EReference getMultiSelectDescriptionStyle_ForegroundColor() { return (EReference) this.multiSelectDescriptionStyleEClass.getEStructuralFeatures().get(1); } + /** + * + * + * @generated + */ + @Override + public EAttribute getMultiSelectDescriptionStyle_ShowIcon() { + return (EAttribute) this.multiSelectDescriptionStyleEClass.getEStructuralFeatures().get(2); + } + /** * * @@ -4163,12 +4183,14 @@ public void createPackageContents() { this.selectDescriptionStyleEClass = this.createEClass(SELECT_DESCRIPTION_STYLE); this.createEReference(this.selectDescriptionStyleEClass, SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR); this.createEReference(this.selectDescriptionStyleEClass, SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR); + this.createEAttribute(this.selectDescriptionStyleEClass, SELECT_DESCRIPTION_STYLE__SHOW_ICON); this.conditionalSelectDescriptionStyleEClass = this.createEClass(CONDITIONAL_SELECT_DESCRIPTION_STYLE); this.multiSelectDescriptionStyleEClass = this.createEClass(MULTI_SELECT_DESCRIPTION_STYLE); this.createEReference(this.multiSelectDescriptionStyleEClass, MULTI_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR); this.createEReference(this.multiSelectDescriptionStyleEClass, MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR); + this.createEAttribute(this.multiSelectDescriptionStyleEClass, MULTI_SELECT_DESCRIPTION_STYLE__SHOW_ICON); this.conditionalMultiSelectDescriptionStyleEClass = this.createEClass(CONDITIONAL_MULTI_SELECT_DESCRIPTION_STYLE); @@ -4838,6 +4860,8 @@ public void initializePackageContents() { IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEReference(this.getSelectDescriptionStyle_ForegroundColor(), this.getUserColor(), null, "foregroundColor", null, 0, 1, SelectDescriptionStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEAttribute(this.getSelectDescriptionStyle_ShowIcon(), this.ecorePackage.getEBoolean(), "showIcon", null, 0, 1, SelectDescriptionStyle.class, !IS_TRANSIENT, !IS_VOLATILE, + IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEClass(this.conditionalSelectDescriptionStyleEClass, ConditionalSelectDescriptionStyle.class, "ConditionalSelectDescriptionStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -4847,6 +4871,8 @@ public void initializePackageContents() { !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEReference(this.getMultiSelectDescriptionStyle_ForegroundColor(), this.getUserColor(), null, "foregroundColor", null, 0, 1, MultiSelectDescriptionStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEAttribute(this.getMultiSelectDescriptionStyle_ShowIcon(), this.ecorePackage.getEBoolean(), "showIcon", null, 0, 1, MultiSelectDescriptionStyle.class, !IS_TRANSIENT, !IS_VOLATILE, + IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEClass(this.conditionalMultiSelectDescriptionStyleEClass, ConditionalMultiSelectDescriptionStyle.class, "ConditionalMultiSelectDescriptionStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/packages/view/backend/sirius-components-view/src/main/resources/model/view.ecore b/packages/view/backend/sirius-components-view/src/main/resources/model/view.ecore index 5c69f22720..e2f22b7fd6 100644 --- a/packages/view/backend/sirius-components-view/src/main/resources/model/view.ecore +++ b/packages/view/backend/sirius-components-view/src/main/resources/model/view.ecore @@ -433,11 +433,13 @@ + + diff --git a/packages/view/backend/sirius-components-view/src/main/resources/model/view.genmodel b/packages/view/backend/sirius-components-view/src/main/resources/model/view.genmodel index 22a7ac6e27..1b20ec52b5 100644 --- a/packages/view/backend/sirius-components-view/src/main/resources/model/view.genmodel +++ b/packages/view/backend/sirius-components-view/src/main/resources/model/view.genmodel @@ -327,11 +327,13 @@ + +