Document viewer displays the document of active document editor. (refs #3511)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@25200 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 8638585b2c44e81aabeb7877e42580ea6cc05dfd..910c8d86209e7de5e9265449eb8fa89a24598933 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -1236,7 +1236,7 @@
                         property="org.simantics.sysdyn.ui.nodeClass">\r
                   </test>\r
                   <test\r
-                        args="org.simantics.document.workbench.browser_old.DocumentationFolder"\r
+                        args="org.simantics.document.workbench.browser_old.DocumentationNode"\r
                         property="org.simantics.sysdyn.ui.nodeClass">\r
                   </test>\r
                </or>\r
@@ -1274,6 +1274,10 @@
                         args="org.simantics.sysdyn.ui.browser.nodes.FunctionLibraryNode"\r
                         property="org.simantics.sysdyn.ui.nodeClass">\r
                   </test>\r
+                  <test\r
+                        args="org.simantics.document.workbench.browser_old.DocumentationNode"\r
+                        property="org.simantics.sysdyn.ui.nodeClass">\r
+                  </test>\r
                </or>\r
             </with>\r
          </activeWhen>\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynEditorNamingService.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynEditorNamingService.java
index f47c890cb3bdc339577f0edc705f127e9739fbc6..eba820ac43e1e890e1d9ade8195fa07a7e18f931 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynEditorNamingService.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynEditorNamingService.java
@@ -22,6 +22,7 @@ import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;\r
 import org.simantics.modeling.ui.features.EditorNamingService2;\r
 import org.simantics.simulation.ontology.SimulationResource;\r
+import org.simantics.sysdyn.SysdynResource;\r
 import org.simantics.ui.workbench.IResourceEditorInput2;\r
 \r
 /**\r
@@ -57,11 +58,13 @@ public class SysdynEditorNamingService extends EditorNamingService2 {
                                }\r
                        } else {\r
                                ModelingResources mr = ModelingResources.getInstance(g);\r
-                               Resource conf = g.getPossibleObject(input.getResource(), mr.DiagramToComposite);\r
-                               if(conf != null) {\r
-                                       Resource module = g.getPossibleObject(conf, Layer0.getInstance(g).PartOf);\r
-                                       if(module != null) \r
-                                               return NameUtils.getSafeName(g, module);\r
+                               SysdynResource sr = SysdynResource.getInstance(g);\r
+                               Resource composite = g.getPossibleObject(input.getResource(), mr.DiagramToComposite);\r
+                               if(composite != null) {\r
+                                       if(g.isInstanceOf(composite, sr.Configuration))\r
+                                               composite = g.getPossibleObject(composite, Layer0.getInstance(g).PartOf);\r
+                                       if(composite != null) \r
+                                               return NameUtils.getSafeName(g, composite);\r
                                }\r
                        }\r
                }\r