1 files changed, 7 insertions, 6 deletions

diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java
index 1ae3daa7..8a467066 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java
@@ -3,26 +3,27 @@ package tools.refinery.store.query.viatra.internal.update;
 import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
 import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
 import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
-import tools.refinery.store.model.Model;
+import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
 import tools.refinery.store.query.view.AnyRelationView;
 import tools.refinery.store.query.view.RelationView;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 public class ModelUpdateListener {
         private final Map<AnyRelationView, RelationViewUpdateListener<?>> relationViewUpdateListeners;
 
-        public ModelUpdateListener(Model model, Collection<AnyRelationView> relationViews) {
+        public ModelUpdateListener(ViatraModelQueryAdapterImpl adapter) {
+                var relationViews = adapter.getStoreAdapter().getInputKeys().keySet();
                 relationViewUpdateListeners = new HashMap<>(relationViews.size());
                 for (var relationView : relationViews) {
-                        registerView(model, (RelationView<?>) relationView);
+                        registerView(adapter, (RelationView<?>) relationView);
                 }
         }
 
-        private <T> void registerView(Model model, RelationView<T> relationView) {
-                var listener = RelationViewUpdateListener.of(relationView);
+        private <T> void registerView(ViatraModelQueryAdapterImpl adapter, RelationView<T> relationView) {
+                var listener = RelationViewUpdateListener.of(adapter, relationView);
+                var model = adapter.getModel();
                 var interpretation = model.getInterpretation(relationView.getSymbol());
                 interpretation.addListener(listener, true);
                 relationViewUpdateListeners.put(relationView, listener);