Improved Routes view functionality

[simantics/district.git] / org.simantics.district.region / src / org / simantics / district / region / DiagramRegions.java

diff --git a/org.simantics.district.region/src/org/simantics/district/region/DiagramRegions.java b/org.simantics.district.region/src/org/simantics/district/region/DiagramRegions.java
index 57f31ae4a5f70d2b004930b63b9760e11c9a3d79..175d49c242c088b9c660081c486cda66e2afa0e0 100644 (file)
--- a/org.simantics.district.region/src/org/simantics/district/region/DiagramRegions.java
+++ b/org.simantics.district.region/src/org/simantics/district/region/DiagramRegions.java
@@ -7,6 +7,7 @@ import java.awt.geom.PathIterator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -87,6 +88,9 @@ public final class DiagramRegions {
     }
     
     public static Collection<DiagramRegion> findRegions(ReadGraph graph, Resource model) throws DatabaseException {
+        if (model == null)
+            return Collections.emptyList();
+
         List<Resource> diagrams = QueryIndexUtils.searchByType(graph, model, DiagramResource.getInstance(graph).Diagram);
         Set<DiagramRegion> regions = new HashSet<>();
         
@@ -149,7 +153,7 @@ public final class DiagramRegions {
                 points[0] = moveX;
                 points[1] = moveY;
                 // Fall into....
-
+                break;
             case PathIterator.SEG_LINETO:
                 thisX = points[0];
                 thisY = points[1];