From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 8 Sep 2011 04:41:47 +0000 (+0000)
Subject: Organized diagram relations according to domain. Also fixed persistency of active... 
X-Git-Tag: simantics-1.5~43
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1777457b57538ff379857a27b387b1f9e11915f1;p=simantics%2Fsysdyn.git

Organized diagram relations according to domain. Also fixed persistency of active profiles.
#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 3e0614a0..353d640b 100644
--- 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 {
             Resource runtime = diagram.getHint((DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE));
             DiagramResource dr = DiagramResource.getInstance(graph);
-            String variable = (String)graph.getPossibleRelatedValue(runtime, dr.HasVariable);
+            String variable = (String)graph.getPossibleRelatedValue(runtime, dr.RuntimeDiagram_HasVariable);
             if(variable == null)
             	return;
             
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 27220788..5a35e538 100644
--- 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 {
 
                 DiagramResource dr = DiagramResource.getInstance(graph);
 				Resource runtime = viewer.getRuntime();
-				String uri = graph.getPossibleRelatedValue(runtime, dr.HasVariable, Bindings.STRING);
+				String uri = graph.getPossibleRelatedValue(runtime, dr.RuntimeDiagram_HasVariable, Bindings.STRING);
 				Variable parent = Variables.getVariable(graph, uri);
 				Resource model = Variables.getModel(graph, parent);
 				final String modelURI = graph.getURI(model);
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 eebc355f..23aee37e 100644
--- 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;
 		Resource resource = ModelingUtils.getPossibleElementCorrespondendence(g, element);
 		if(resource == null || !g.isInstanceOf(resource, sr.Variable)) return null;
-		String variableURI = g.getPossibleRelatedValue(runtime, dr.HasVariable);
+		String variableURI = g.getPossibleRelatedValue(runtime, dr.RuntimeDiagram_HasVariable);
 		try {
 			Variable compositeVariable = Variables.getVariable(g, variableURI);
 			return compositeVariable.browsePossible(g, resource);