From: Jussi Koskela Date: Tue, 13 Apr 2021 06:24:57 +0000 (+0300) Subject: Revert 1.43.0-CVM2 branch to initial state X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=636ddc0d966151e334b01039c94ff3dee743db99;p=simantics%2Fplatform.git 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 a8de56f61..9964592f9 100644 --- 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 df28d317f..a013dc041 100644 --- 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(); }