From 79ae88ba544e77d7cc1504b7e83b181d83369813 Mon Sep 17 00:00:00 2001 From: Philippe DUL Date: Tue, 19 Mar 2024 15:34:49 +0100 Subject: [PATCH 1/2] [releng] Switch to Sirius 7.4.1-S20240319-042018 --- .../kitalpha.targetplatform | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform b/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform index 167e9d2cb..2218a9cab 100644 --- a/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform +++ b/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform @@ -11,7 +11,7 @@ *******************************************************************************/ target "kitalpha" with source, requirements -include "https://download.eclipse.org/sirius/updates/stable/7.3.0-S20230929-065140/2023-03/targets/modules/gmf-runtime-1.16.tpd" +include "https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240319-042018/2023-03/targets/modules/gmf-runtime-1.16.tpd" location Eclipse-2021-12 "https://download.eclipse.org/releases/2021-12/" { org.eclipse.cvs.feature.group lazy @@ -96,7 +96,7 @@ location acceleo "https://download.eclipse.org/acceleo/updates/releases/3.7/" { org.eclipse.acceleo.doc [3.7.11,3.7.12) } -location sirius "https://download.eclipse.org/sirius/updates/stable/7.3.0-S20230929-065140/2023-03" { +location sirius "https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240319-042018/2023-03" { org.eclipse.sirius.doc.feature.feature.group lazy org.eclipse.sirius.runtime.source.feature.group lazy org.eclipse.sirius.runtime.acceleo.feature.group lazy From ec728541cec23fc7a357de9c2c1319fb5115c079 Mon Sep 17 00:00:00 2001 From: Faycal ABKA Date: Tue, 5 Mar 2024 17:23:58 +0000 Subject: [PATCH 2/2] #795 Handle edition attribute's value typed with datatype objects Signed-off-by: Faycal ABKA --- .../core/helper/DisplayConverterHelper.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/massactions/plugins/org.polarsys.kitalpha.massactions.core/src/org/polarsys/kitalpha/massactions/core/helper/DisplayConverterHelper.java b/massactions/plugins/org.polarsys.kitalpha.massactions.core/src/org/polarsys/kitalpha/massactions/core/helper/DisplayConverterHelper.java index c33e49a2b..922c9bad5 100644 --- a/massactions/plugins/org.polarsys.kitalpha.massactions.core/src/org/polarsys/kitalpha/massactions/core/helper/DisplayConverterHelper.java +++ b/massactions/plugins/org.polarsys.kitalpha.massactions.core/src/org/polarsys/kitalpha/massactions/core/helper/DisplayConverterHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Thales Global Services S.A.S. + * Copyright (c) 2018, 2024 Thales Global Services S.A.S. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0 @@ -47,17 +47,25 @@ private static void initDisplayConverterCache() { displayConverterCache = new HashMap<>(); displayConverterCache.put(Literals.EBOOLEAN.getName(), new DefaultBooleanDisplayConverter()); + displayConverterCache.put(Literals.EBOOLEAN_OBJECT.getName(), new DefaultBooleanDisplayConverter()); displayConverterCache.put(Literals.ECHAR.getName(), new DefaultCharacterDisplayConverter()); + displayConverterCache.put(Literals.ECHARACTER_OBJECT.getName(), new DefaultCharacterDisplayConverter()); displayConverterCache.put(Literals.EDATE.getName(), new DefaultDateDisplayConverter()); displayConverterCache.put(Literals.ESTRING.getName(), new DefaultDisplayConverter()); displayConverterCache.put(Literals.EBIG_DECIMAL.getName(), new DefaultBigDecimalDisplayConverter()); displayConverterCache.put(Literals.EDOUBLE.getName(), new DefaultDoubleDisplayConverter()); + displayConverterCache.put(Literals.EDOUBLE_OBJECT.getName(), new DefaultDoubleDisplayConverter()); displayConverterCache.put(Literals.EFLOAT.getName(), new DefaultFloatDisplayConverter()); + displayConverterCache.put(Literals.EFLOAT_OBJECT.getName(), new DefaultFloatDisplayConverter()); displayConverterCache.put(Literals.EBYTE.getName(), new DefaultByteDisplayConverter()); + displayConverterCache.put(Literals.EBYTE_OBJECT.getName(), new DefaultByteDisplayConverter()); displayConverterCache.put(Literals.EINT.getName(), new DefaultIntegerDisplayConverter()); + displayConverterCache.put(Literals.EINTEGER_OBJECT.getName(), new DefaultIntegerDisplayConverter()); displayConverterCache.put(Literals.ELONG.getName(), new DefaultLongDisplayConverter()); + displayConverterCache.put(Literals.ELONG_OBJECT.getName(), new DefaultLongDisplayConverter()); displayConverterCache.put(Literals.EBIG_INTEGER.getName(), new DefaultBigIntegerDisplayConverter()); displayConverterCache.put(Literals.ESHORT.getName(), new DefaultShortDisplayConverter()); + displayConverterCache.put(Literals.ESHORT_OBJECT.getName(), new DefaultShortDisplayConverter()); } // method sends Null if no display is found