1 files changed, 14 insertions, 2 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
index 2b12d5a6..d11e431b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
@@ -13,23 +13,26 @@ import tools.refinery.store.model.*;
 import tools.refinery.store.representation.AnySymbol;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
+import tools.refinery.store.util.CancellationToken;
 
 import java.util.*;
 
 public class ModelImpl implements Model {
-        private final ModelStore store;
+        private final ModelStoreImpl store;
         private Version state;
         private LinkedHashMap<? extends AnySymbol, ? extends VersionedInterpretation<?>> interpretations;
         private final List<ModelAdapter> adapters;
         private final List<ModelListener> listeners = new ArrayList<>();
+        private final CancellationToken cancellationToken;
         private boolean uncommittedChanges;
         private ModelAction pendingAction = ModelAction.NONE;
         private Version restoringToState = null;
 
-        ModelImpl(ModelStore store, Version state, int adapterCount) {
+        ModelImpl(ModelStoreImpl store, Version state, int adapterCount) {
                 this.store = store;
                 this.state = state;
                 adapters = new ArrayList<>(adapterCount);
+                cancellationToken = store.getCancellationToken();
         }
 
         void setInterpretations(LinkedHashMap<? extends AnySymbol, ? extends VersionedInterpretation<?>> interpretations) {
@@ -88,6 +91,7 @@ public class ModelImpl implements Model {
 
         @Override
         public Version commit() {
+                checkCancelled();
                 if (hasPendingAction()) {
                         throw pendingActionError("commit");
                 }
@@ -106,6 +110,7 @@ public class ModelImpl implements Model {
                         Version[] interpretationVersions = new Version[interpretations.size()];
                         int j = 0;
                         for (var interpretationEntry : interpretations.entrySet()) {
+                                checkCancelled();
                                 interpretationVersions[j++] = interpretationEntry.getValue().commit();
                         }
                         ModelVersion modelVersion = new ModelVersion(interpretationVersions);
@@ -125,6 +130,7 @@ public class ModelImpl implements Model {
 
         @Override
         public void restore(Version version) {
+                checkCancelled();
                 if (hasPendingAction()) {
                         throw pendingActionError("restore to %s".formatted(version));
                 }
@@ -140,6 +146,7 @@ public class ModelImpl implements Model {
                         }
                         int j = 0;
                         for (var interpretation : interpretations.values()) {
+                                checkCancelled();
                                 interpretation.restore(ModelVersion.getInternalVersion(version, j++));
                         }
 
@@ -187,4 +194,9 @@ public class ModelImpl implements Model {
         public void removeListener(ModelListener listener) {
                 listeners.remove(listener);
         }
+
+        @Override
+        public void checkCancelled() {
+                cancellationToken.checkCancelled();
+        }
 }