From 0cf894be3bd64a393d8883b7500822275c2a15fe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hannu=20Niemist=C3=B6?= <hannu.niemisto@semantum.fi>
Date: Sun, 27 Aug 2017 12:03:37 +0300
Subject: [PATCH] (refs #7452) Added PreferredDiagramEditorID to Modeling.graph

Change-Id: I8e3ea28f814ecc7b28182bc47f5f4fde18fb7b3e
---
 .../graph/Modeling.pgraph                             |  6 +++++-
 .../ui/diagramEditor/OpenDiagramFromIssue.java        | 11 ++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph b/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
index fe566684d..f337ab602 100644
--- a/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
@@ -517,4 +517,8 @@ MOD.SVGTabContribution : SEL.SCLTabContribution
 
 MOD.SymbolCodeStyle : DIA.Style
 
-MOD.IssueDecorationStyle : DIA.Style
\ No newline at end of file
+MOD.IssueDecorationStyle : DIA.Style
+
+MOD.PreferredDiagramEditorID <R L0.HasProperty : L0.FunctionalRelation
+    L0.HasDomain STR.Composite
+    L0.HasRange  L0.String
\ No newline at end of file
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);
             }
         });
     }
-- 
2.47.1