Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2017-11-06 11:15:06 -0500
committerRemi Schnekenburger2017-12-06 04:13:07 -0500
commitbdcde67beabd4960b5edd0a1a9ab9fc604ed88e4 (patch)
treee5d3425cbd3fd142a5c919fec613bc296fae1a47 /plugins/facet
parentb298622a72f2dd309aaa55774d4d1b35ece1ad46 (diff)
downloadorg.eclipse.papyrus-bdcde67beabd4960b5edd0a1a9ab9fc604ed88e4.tar.gz
org.eclipse.papyrus-bdcde67beabd4960b5edd0a1a9ab9fc604ed88e4.tar.xz
org.eclipse.papyrus-bdcde67beabd4960b5edd0a1a9ab9fc604ed88e4.zip
Bug 526899: [Facet] (Some?) multi-valued OCL Queries do not work
https://bugs.eclipse.org/bugs/show_bug.cgi?id=526899 Change-Id: I9bd040267ca100bd67dfd65eaf276d651b93796c Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com> (cherry picked from commit 4bdf0da4f79b36416f6432be242a4e5fd199d089)
Diffstat (limited to 'plugins/facet')
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/DerivedTypedElementManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/DerivedTypedElementManager.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/DerivedTypedElementManager.java
index fa6fc7deae9..059d44217ca 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/DerivedTypedElementManager.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/DerivedTypedElementManager.java
@@ -865,6 +865,10 @@ public class DerivedTypedElementManager implements IDerivedTypedElementManager {
// casting a List to a List<Object>
final List<Object> tmpList = (List<Object>) element;
newList = tmpList;
+ } else if (element instanceof Collection) {
+ //Bug 526899
+ Collection<?> result = (Collection<?>)element;
+ newList.addAll(result);
} else {
newList.add(element);
}

Back to the top