X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FdiagramEditor%2FOpenDiagramFromIssue.java;h=9214082f24079d2ced9ffcbe8bf355172d47e9e0;hb=refs%2Fchanges%2F92%2F892%2F1;hp=7fd13bbdddcbb023573651eee62b30bb9eddaa14;hpb=334c763fd28b7d903fa5f38c2bd637a899137015;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/OpenDiagramFromIssue.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/OpenDiagramFromIssue.java
index 7fd13bbdd..9214082f2 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/OpenDiagramFromIssue.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/OpenDiagramFromIssue.java
@@ -51,8 +51,13 @@ public class OpenDiagramFromIssue extends AbstractResourceEditorAdapter {
         super("Open Diagram Containing Referenced Component", Activator.COMPOSITE_ICON);
     }
 
-    protected String getEditorId() {
-        return EDITOR_ID;
+    protected String getEditorId(ReadGraph g, Resource diagram) throws DatabaseException {
+        ModelingResources MOD = ModelingResources.getInstance(g);
+        String preferredEditorId = g.getPossibleRelatedValue(diagram, MOD.PreferredDiagramEditorID);
+        if(preferredEditorId != null)
+            return preferredEditorId;
+        else
+            return EDITOR_ID;
     }
 
     @Override
@@ -67,7 +72,7 @@ public class OpenDiagramFromIssue extends AbstractResourceEditorAdapter {
             public void run(ReadGraph g) throws DatabaseException {
                 Pair<Resource, Collection<Object>> data = extractContext(g, input);
                 if (data != null)
-                    OpenDiagramFromConfigurationAdapter.openEditor(g, data.first, getEditorId(), data.second);
+                    OpenDiagramFromConfigurationAdapter.openEditor(g, data.first, getEditorId(g, data.first), data.second);
             }
         });
     }