X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.diagram%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fdiagram%2FDiagram.java;h=15174e65378d43565cd7692dda0a58adba966486;hb=f46f7fca458ebc63f7a280b9088904710f6149f1;hp=5695798e65946d0ffaa59918053f81dbfa933eb7;hpb=3e6e743ffe75f5724406e1dd01589386efe04782;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.diagram/src/org/simantics/interop/diagram/Diagram.java b/org.simantics.interop.diagram/src/org/simantics/interop/diagram/Diagram.java
index 5695798..15174e6 100644
--- a/org.simantics.interop.diagram/src/org/simantics/interop/diagram/Diagram.java
+++ b/org.simantics.interop.diagram/src/org/simantics/interop/diagram/Diagram.java
@@ -123,6 +123,8 @@ public abstract class Diagram<T extends Symbol> {
 		Resource model = DiagramUtils.getModel(graph, res);
 		Resource configuration = DiagramUtils.getConfiguration(graph, model);
 		Set<String> names = new HashSet<String>();
+		if (configuration == null)
+			return names;
 		Collection<Resource> composites = getAllComposites(graph, configuration);
 		for (Resource composite : composites) {
 			names.addAll(getAllModuleNamesForComposite(graph, composite));
@@ -282,7 +284,7 @@ public abstract class Diagram<T extends Symbol> {
 	 * @throws ManyObjectsForFunctionalRelationException
 	 * @throws ServiceException
 	 */
-	private static Resource getDiagramFromComposite(ReadGraph g, Resource compositeType) throws DatabaseException {
+	public Resource getDiagramFromComposite(ReadGraph g, Resource compositeType) throws DatabaseException {
 		ModelingResources m  = ModelingResources.getInstance(g);
 		Collection<Resource> diagramTemplates = g.getAssertedObjects(compositeType, m.HasModelingTemplate);
 		for (Resource diagramTemplate : diagramTemplates) {