Merge branch 'feature/MAGICDRAW-1101' into release/3.6.3

* feature/MAGICDRAW-1101: MAGICDRAW-1101 Ensure diagram is loaded when calling getElementsOnDiagram.
Open-MBEE · May 20, 2019 · 6a2eb31 · 6a2eb31
2 parents 3e0a219 + b465476
commit 6a2eb31
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Utils.java b/src/main/java/gov/nasa/jpl/mbee/mdk/util/Utils.java
@@ -111,7 +111,12 @@ public static <T> List<T> removeDuplicates(Collection<T> elements) {
      * @return
      */
     public static Collection<Element> getElementsOnDiagram(Diagram diagram) {
-        return Project.getProject(diagram).getDiagram(diagram).getUsedModelElements(true);
+        DiagramPresentationElement diagramPresentationElement = Project.getProject(diagram).getDiagram(diagram);
+        if (diagramPresentationElement == null) {
+            return Collections.emptyList();
+        }
+        diagramPresentationElement.ensureLoaded();
+        return diagramPresentationElement.getUsedModelElements();
     }
 
     /**