import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.core.runtime.IProgressMonitor;
import org.simantics.db.exception.CancelTransactionException;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.layer0.genericrelation.Dependencies;
+import org.simantics.db.layer0.genericrelation.IndexQueries;
import org.simantics.db.layer0.request.PossibleModel;
import org.simantics.event.Activator;
import org.simantics.event.ontology.EventResource;
if (model == null)
throw new CancelTransactionException();
- indexFunction = graph.adapt(L0X.Dependencies, Function.class);
+ indexFunction = graph.adapt(L0X.DependencyResources, Function.class);
if (!initialEventsResolved) {
MapList<String, Resource> initialEventsBySource = new MapList<String,Resource>();
monitor.subTask("Resolve events with source " + sourceName);
if (DEBUG)
System.out.println(EventSourceResolver.this + ": resolving source name " + sourceName);
- List<Map<String, Object>> results = (List<Map<String, Object>>) indexFunction.apply(graph, model, "Name:" + sourceName);
- for (Map<String, Object> result : results) {
- Resource r = (Resource) result.get(Dependencies.FIELD_RESOURCE);
+ List<Resource> results = (List<Resource>) indexFunction.apply(graph, model,
+ IndexQueries.quoteTerm(Dependencies.FIELD_NAME, sourceName));
+ for (Resource r : results) {
if (eventSourceFilter != null && !eventSourceFilter.accept(graph, r))
continue;
Resource rModel = graph.sync(new PossibleModel(r));