From 4be9f92b4dada378bb75f97e13d36e677f71e1f9 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Mon, 15 Oct 2018 09:53:34 +0200
Subject: [PATCH] EClasses cannot be equal()ity compared to Class<?>es
Issue-Ref: 3223
Issue-Url: https://af3-developer.fortiss.org/issues/3223
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../base/ui/javafx/control/contentprovider/.ratings | 2 +-
.../control/contentprovider/SameTypeContentProvider.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/contentprovider/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/contentprovider/.ratings
index eee9e0237..590f15c99 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/contentprovider/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/contentprovider/.ratings
@@ -1,2 +1,2 @@
ChildrenContentProvider.java d5aa8d8d16f453be39d97a7ba2e1955e3e1582a0 GREEN
-SameTypeContentProvider.java dc923f33aaf70b1f833d388837536e9e303d55c1 GREEN
+SameTypeContentProvider.java 67d62fa5cb568e396062025baab7bf34c2c35a45 YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/contentprovider/SameTypeContentProvider.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/contentprovider/SameTypeContentProvider.java
index dc923f33a..67d62fa5c 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/contentprovider/SameTypeContentProvider.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/contentprovider/SameTypeContentProvider.java
@@ -36,11 +36,11 @@ public class SameTypeContentProvider<T extends IHierarchicElement & INamedElemen
extends DynamicTreeContentProviderBase<T> {
/** EObject type to check against. */
- EClass type;
+ private EClass eClass;
/** Constructor. */
- public SameTypeContentProvider(EClass type) {
- this.type = type;
+ public SameTypeContentProvider(EClass eClass) {
+ this.eClass = eClass;
}
/** {@inheritDoc} */
@@ -51,7 +51,7 @@ public class SameTypeContentProvider<T extends IHierarchicElement & INamedElemen
// @CodeFormatterOff
Collection<? extends T> children = (Collection<? extends T>)
filterStream(current.getContainedElements(), e -> e instanceof INamedElement)
- .filter(e -> (e.getClass().equals(type)) || (type.isInstance(e)))
+ .filter(e -> eClass.isInstance(e))
.collect(Collectors.toList());
// @CodeFormatterOn
return children;
--
GitLab