Organized diagram relations according to domain. Also fixed persistency of active...

#refs 3285

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

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/InputFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/InputFactory.java
index 3e0614a07b0a9cd5b5f84f43f5aa70fa22d86fd9..353d640b5ef57530a621c2152daab46f2623b712 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/InputFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/InputFactory.java
@@ -125,7 +125,7 @@ public class InputFactory extends SysdynElementFactory {
         } else {\r
             Resource runtime = diagram.getHint((DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE));\r
             DiagramResource dr = DiagramResource.getInstance(graph);\r
-            String variable = (String)graph.getPossibleRelatedValue(runtime, dr.HasVariable);\r
+            String variable = (String)graph.getPossibleRelatedValue(runtime, dr.RuntimeDiagram_HasVariable);\r
             if(variable == null)\r
                return;\r
             \r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ShowModuleHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ShowModuleHandler.java
index 27220788ae743ff9ad99c88d2541888af58ac603..5a35e5385de562564c281dbc46a40296cbadee32 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ShowModuleHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ShowModuleHandler.java
@@ -56,7 +56,7 @@ public class ShowModuleHandler extends AbstractHandler {
 \r
                 DiagramResource dr = DiagramResource.getInstance(graph);\r
                                Resource runtime = viewer.getRuntime();\r
-                               String uri = graph.getPossibleRelatedValue(runtime, dr.HasVariable, Bindings.STRING);\r
+                               String uri = graph.getPossibleRelatedValue(runtime, dr.RuntimeDiagram_HasVariable, Bindings.STRING);\r
                                Variable parent = Variables.getVariable(graph, uri);\r
                                Resource model = Variables.getModel(graph, parent);\r
                                final String modelURI = graph.getURI(model);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/viewUtils/SysdynDatasetSelectionListener.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/viewUtils/SysdynDatasetSelectionListener.java
index eebc355fb76bf56b68a095990b2acd9f45cff0de..23aee37ec2c2173f0b36d6ee65f9fbd9402c601b 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/viewUtils/SysdynDatasetSelectionListener.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/viewUtils/SysdynDatasetSelectionListener.java
@@ -258,7 +258,7 @@ public abstract class SysdynDatasetSelectionListener implements ISelectionListen
                if(runtime == null) return null;\r
                Resource resource = ModelingUtils.getPossibleElementCorrespondendence(g, element);\r
                if(resource == null || !g.isInstanceOf(resource, sr.Variable)) return null;\r
-               String variableURI = g.getPossibleRelatedValue(runtime, dr.HasVariable);\r
+               String variableURI = g.getPossibleRelatedValue(runtime, dr.RuntimeDiagram_HasVariable);\r
                try {\r
                        Variable compositeVariable = Variables.getVariable(g, variableURI);\r
                        return compositeVariable.browsePossible(g, resource);\r