Revert 1.43.0-CVM2 branch to initial state

gitlab #691

Change-Id: If53f9c4b1dc9667cf5e8d89674b4fd59c3f74a0a

diff --git a/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/DiagramToSVG.java b/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/DiagramToSVG.java
index a8de56f612de2b283a05557ba00bfdd5b1fda7e9..9964592f95c6136eed0b38a426fc840db49e4ca3 100644 (file)
--- a/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/DiagramToSVG.java
+++ b/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/DiagramToSVG.java
@@ -236,7 +236,6 @@ public class DiagramToSVG {
                        });
 
                        ICanvasSceneGraphProvider provider = DiagramNodeUtil.loadSceneGraphProvider(ctx, modelAndRVI.first, exportPlan.diagram, modelAndRVI.second);
-                       Thread.sleep(1000);
                        sgProvider.set( provider );
 
                        final Semaphore done = new Semaphore(0);

diff --git a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/G2DSceneGraph.java b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/G2DSceneGraph.java
index df28d317f692adbe10c506353bc3ad73c5687caf..a013dc0419a74ab386d50f5c554fd6190b18e81b 100644 (file)
--- a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/G2DSceneGraph.java
+++ b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/G2DSceneGraph.java
@@ -335,7 +335,7 @@ public class G2DSceneGraph extends G2DParentNode implements ILookupService, INod
         }
     }
 
-    synchronized public boolean isPending() {
+    public boolean isPending() {
         return !pending.isEmpty();
     }