Robustness fixes for inline SVG text editing on diagrams

[simantics/platform.git] / bundles / org.simantics.diagram / src / org / simantics / diagram / elements / DiagramNodeUtil.java

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/DiagramNodeUtil.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/DiagramNodeUtil.java
index 859154d0b6be2e3003e1637e7c643526d2c6fe81..893573d0f057841e769e73f7216b22e48b2ba923 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/DiagramNodeUtil.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/DiagramNodeUtil.java
@@ -43,7 +43,7 @@ import org.simantics.simulation.ontology.SimulationResource;
 public class DiagramNodeUtil {
 
     public static ICanvasContext getCanvasContext(IG2DNode node) {
-        G2DSceneGraph sg = NodeUtil.getPossibleRootNode(node);
+        G2DSceneGraph sg = node.getRootNode2D();
         if (sg == null)
             return null;
         Component rootPane = sg.getRootPane();
@@ -55,7 +55,7 @@ public class DiagramNodeUtil {
     }
 
     public static ICanvasContext getPossibleCanvasContext(IG2DNode node) {
-        G2DSceneGraph sg = NodeUtil.getPossibleRootNode(node);
+        G2DSceneGraph sg = node.getRootNode2D();
         if (sg == null)
             return null;
         Component rootPane = sg.getRootPane();
@@ -236,7 +236,7 @@ public class DiagramNodeUtil {
     }
     
     public static final Set<String> getTexts(Set<TextNode> nodes) {
-        Set<String> result = new HashSet<String>();
+        Set<String> result = new HashSet<String>(nodes.size());
         for(TextNode n : nodes) result.add(n.getText());
         return result;
     }