From 99fde2d98f5eda43f77c3fad4c07a2f4f234380c Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 21 Aug 2019 15:32:52 +0300
Subject: [PATCH] Small changes to synchronization base impl to allow extending
 it

gitlab #356

Change-Id: I66327777c16645c582573df0f485d2c5452e088e
---
 .../synchronization/base/ModuleUpdateContext.java    | 11 ++++++++++-
 .../base/SynchronizationEventHandlerBase.java        | 10 ++++++++--
 .../synchronization/utils/MappingBase.java           | 12 ++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base/ModuleUpdateContext.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base/ModuleUpdateContext.java
index a4dea1ab2..246b69360 100644
--- a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base/ModuleUpdateContext.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base/ModuleUpdateContext.java
@@ -66,11 +66,20 @@ public class ModuleUpdateContext<T extends ComponentBase<T>> {
     public int getModuleId() {
         return component.getModuleId();
     }
-    
+
+    public ModuleUpdaterBase<T> getUpdater() {
+        return updater;
+    }
+
     public SynchronizationEventHandlerBase<T> getHandler() {
         return handler;
     }
 
+    @SuppressWarnings("unchecked")
+    public <E extends SynchronizationEventHandlerBase<?>> E getConcreteHandler() {
+        return (E) handler;
+    }
+
     public void setModuleId(int moduleId) {
         component.setModuleId(moduleId);
     }
diff --git a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base/SynchronizationEventHandlerBase.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base/SynchronizationEventHandlerBase.java
index a6efeefb2..67b120b64 100644
--- a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base/SynchronizationEventHandlerBase.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/base/SynchronizationEventHandlerBase.java
@@ -248,7 +248,7 @@ public abstract class SynchronizationEventHandlerBase<T extends ComponentBase<T>
                     if(oldChildMap != null)
                         for(T component : oldChildMap.values()) {
                             component.clearParent();
-                            mapping.addPendingRemoval(component);
+                            addPendingRemoval(component);
                         }
                 }
                 // Alternative implementation when uids are not available.
@@ -275,7 +275,7 @@ public abstract class SynchronizationEventHandlerBase<T extends ComponentBase<T>
                     if(oldChildMap != null)
                         for(T component : oldChildMap.values()) {
                             component.clearParent();
-                            mapping.addPendingRemoval(component);
+                            addPendingRemoval(component);
                         }
                 }
 
@@ -334,6 +334,12 @@ public abstract class SynchronizationEventHandlerBase<T extends ComponentBase<T>
         }
     }
 
+    protected void addPendingRemoval(T component) {
+        if (TRACE_EVENTS)
+            System.out.println("addPendingRemoval(" + component.componentId + " : " + component.solverComponentName + ")");
+        mapping.addPendingRemoval(component);
+    }
+
     private String getSubprocessName(String name,
             Collection<SerializedVariable> properties) {
         for(SerializedVariable property : properties)
diff --git a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/MappingBase.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/MappingBase.java
index 3c96a3fef..423e5a125 100644
--- a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/MappingBase.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/MappingBase.java
@@ -1,12 +1,13 @@
 package org.simantics.structural.synchronization.utils;
 
-import java.io.PrintWriter;
-
 import gnu.trove.map.hash.THashMap;
 import gnu.trove.procedure.TObjectObjectProcedure;
 import gnu.trove.procedure.TObjectProcedure;
 import gnu.trove.set.hash.THashSet;
 
+import java.io.PrintWriter;
+import java.util.function.Consumer;
+
 /**
  * The entry point to the mapping structure between Simantics database and a
  * designated solver. It is used to synchronize changes from Simantics to the
@@ -219,4 +220,11 @@ abstract public class MappingBase<T extends ComponentBase<T>> {
         return !pendingRemoval.isEmpty();
     }
 
+    public void forEachPendingRemoval(Consumer<T> consumer) {
+        pendingRemoval.forEach(c -> {
+            consumer.accept(c);
+            return true;
+        });
+    }
+
 }
-- 
2.47.1