[573897] Simplifies fix in search operation
Change-Id: Ib8337dbb89a7a7afda4a8133db0b3af035f3df28
Signed-off-by: Zoltan Ujhelyi <zoltan.ujhelyi@incquerylabs.com>
diff --git a/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/operations/extend/nobase/IterateOverEClassInstances.java b/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/operations/extend/nobase/IterateOverEClassInstances.java
index 81b1856..e8f07ed 100644
--- a/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/operations/extend/nobase/IterateOverEClassInstances.java
+++ b/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/operations/extend/nobase/IterateOverEClassInstances.java
@@ -12,7 +12,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.function.Function;
-import java.util.function.Predicate;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.EClass;
@@ -34,17 +33,13 @@
private class Executor extends AbstractIteratingExtendOperationExecutor<Notifier> {
- final Predicate<Object> instanceFilterPredicate;
-
public Executor(int position, EMFScope scope) {
super(position, scope);
- final Class<?> ic = clazz.getInstanceClass();
- instanceFilterPredicate = (ic == null) ? clazz::isInstance : ic::isInstance;
}
@Override
public Iterator<? extends Notifier> getIterator(MatchingFrame frame, ISearchContext context) {
- return getModelContents().filter(instanceFilterPredicate).iterator();
+ return getModelContents().filter(clazz::isInstance).iterator();
}
@Override
