From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Thu, 27 Aug 2020 10:04:48 +0000 (+0300)
Subject: Disable command based synchronization from RouteGraph Connections
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=f496d2407d0f78557e323986a04eb2b3020d4eff;hp=fd61dbe6f20acdc85604f83ae50b7a18c08ff5e3;p=simantics%2Fplatform.git

Disable command based synchronization from RouteGraph Connections

In cases, where command based synchronization is required, use
DIA.CommandBasedSynchronization tag in connection type or instance.

gitlab #591


Change-Id: I52450c64a68bd669e4ea9eed0baf5734098a8768
---

diff --git a/bundles/org.simantics.diagram.ontology/graph/DiagramRouteGraphConnection.pgraph b/bundles/org.simantics.diagram.ontology/graph/DiagramRouteGraphConnection.pgraph
index acdc27a8d..a38c67db7 100644
--- a/bundles/org.simantics.diagram.ontology/graph/DiagramRouteGraphConnection.pgraph
+++ b/bundles/org.simantics.diagram.ontology/graph/DiagramRouteGraphConnection.pgraph
@@ -8,6 +8,7 @@ DIA = <http://www.simantics.org/Diagram-2.2>
 // NOTE: we inherit the old connection to break as little old code as possible
 DIA.RouteGraphConnection <T DIA.Connection
     @L0.property DIA.HasInteriorRouteNode
+    @L0.property DIA.CommandBasedSynchronization
 
 DIA.HasInteriorRouteNode <R L0.IsComposedOf
     L0.HasDomain DIA.Connection
@@ -22,6 +23,9 @@ DIA.HasPosition <R L0.HasProperty : L0.FunctionalRelation
 DIA.IsHorizontal <R L0.HasProperty : L0.FunctionalRelation
     L0.HasRange L0.Boolean
 
+DIA.CommandBasedSynchronization
+    @L0.defTag
+
 DIA.RouteNode <T L0.Entity
     @L0.property DIA.AreConnected
 DIA.InteriorRouteNode <T DIA.RouteNode
diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/synchronization/graph/RouteGraphConnection.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/synchronization/graph/RouteGraphConnection.java
index 933e28ba4..d18aa5f8e 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/synchronization/graph/RouteGraphConnection.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/synchronization/graph/RouteGraphConnection.java
@@ -67,8 +67,7 @@ import org.simantics.utils.datastructures.Pair;
 public class RouteGraphConnection {
 
     private static final boolean DEBUG_SYNC = false;
-    private static final boolean USE_COMMAND_BASED_SYNCHRONIZATION = true;
-
+    
     public static Write synchronizer(final Resource connection, final RouteGraphChangeEvent event) {
         return new WriteRequest() {
             @Override
@@ -86,12 +85,14 @@ public class RouteGraphConnection {
     private DiagramResource DIA;
     private ConnectionUtil cu;
     private Resource connection;
+    private boolean commandBasedSynchronization;
 
-    public RouteGraphConnection(WriteGraph graph, Resource connection) {
+    public RouteGraphConnection(WriteGraph graph, Resource connection) throws DatabaseException {
         this.L0 = Layer0.getInstance(graph);
         this.DIA = DiagramResource.getInstance(graph);
         this.cu = new ConnectionUtil(graph);
         this.connection = connection;
+        this.commandBasedSynchronization = graph.hasStatement(connection, DIA.CommandBasedSynchronization);  
     }
     
     private static Function ConnectionPoint;
@@ -160,7 +161,7 @@ public class RouteGraphConnection {
         if (DEBUG_SYNC)
             delta.print();
         
-        if(USE_COMMAND_BASED_SYNCHRONIZATION) {
+        if(commandBasedSynchronization) {
             initialize(graph);        
         
                 Layer0 L0 = Layer0.getInstance(graph);