1 files changed, 32 insertions, 28 deletions

diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java
index 56fd12c9..ca97147a 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java
@@ -5,11 +5,7 @@
  */
 package tools.refinery.language.web.xtext.server.push;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.collect.ImmutableList;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.web.server.IServiceResult;
 import org.eclipse.xtext.web.server.model.AbstractCachedService;
@@ -17,60 +13,59 @@ import org.eclipse.xtext.web.server.model.DocumentSynchronizer;
 import org.eclipse.xtext.web.server.model.XtextWebDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-
+import tools.refinery.language.web.generator.ModelGenerationManager;
 import tools.refinery.language.web.xtext.server.ResponseHandlerException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PushWebDocument extends XtextWebDocument {
         private static final Logger LOG = LoggerFactory.getLogger(PushWebDocument.class);
 
         private final List<PrecomputationListener> precomputationListeners = new ArrayList<>();
 
-        private final Map<Class<?>, IServiceResult> precomputedServices = new HashMap<>();
+        private final ModelGenerationManager modelGenerationManager = new ModelGenerationManager();
+
+        private final DocumentSynchronizer synchronizer;
 
         public PushWebDocument(String resourceId, DocumentSynchronizer synchronizer) {
                 super(resourceId, synchronizer);
-                if (resourceId == null) {
-                        throw new IllegalArgumentException("resourceId must not be null");
-                }
+                this.synchronizer = synchronizer;
         }
 
-        public boolean addPrecomputationListener(PrecomputationListener listener) {
+        public ModelGenerationManager getModelGenerationManager() {
+                return modelGenerationManager;
+        }
+
+        public void addPrecomputationListener(PrecomputationListener listener) {
                 synchronized (precomputationListeners) {
                         if (precomputationListeners.contains(listener)) {
-                                return false;
+                                return;
                         }
                         precomputationListeners.add(listener);
                         listener.onSubscribeToPrecomputationEvents(getResourceId(), this);
-                        return true;
                 }
         }
 
-        public boolean removePrecomputationListener(PrecomputationListener listener) {
+        public void removePrecomputationListener(PrecomputationListener listener) {
                 synchronized (precomputationListeners) {
-                        return precomputationListeners.remove(listener);
+                        precomputationListeners.remove(listener);
                 }
         }
 
         public <T extends IServiceResult> void precomputeServiceResult(AbstractCachedService<T> service, String serviceName,
                         CancelIndicator cancelIndicator, boolean logCacheMiss) {
                 var result = getCachedServiceResult(service, cancelIndicator, logCacheMiss);
-                if (result == null) {
-                        LOG.error("{} service returned null result", serviceName);
-                        return;
+                if (result != null) {
+                        notifyPrecomputationListeners(serviceName, result);
                 }
-                var serviceClass = service.getClass();
-                var previousResult = precomputedServices.get(serviceClass);
-                if (previousResult != null && previousResult.equals(result)) {
-                        return;
-                }
-                precomputedServices.put(serviceClass, result);
-                notifyPrecomputationListeners(serviceName, result);
         }
 
-        private <T extends IServiceResult> void notifyPrecomputationListeners(String serviceName, T result) {
+        public <T extends IServiceResult> void notifyPrecomputationListeners(String serviceName, T result) {
                 var resourceId = getResourceId();
+                if (resourceId == null) {
+                        return;
+                }
                 var stateId = getStateId();
                 List<PrecomputationListener> copyOfListeners;
                 synchronized (precomputationListeners) {
@@ -91,4 +86,13 @@ public class PushWebDocument extends XtextWebDocument {
                         }
                 }
         }
+
+        public void cancelModelGeneration() {
+                modelGenerationManager.cancel();
+        }
+
+        public void dispose() {
+                synchronizer.setCanceled(true);
+                modelGenerationManager.dispose();
+        }
 }