Fixed bug in sysdyn ontology that prevented sysdyn project from launching.

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

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index e05fd8b9c7a3de7d57978a764940a7dcb547f37c..6ae5d27e16849e3057f552732af8af516bc021ff 100644 (file)
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ

diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 7458896535178ce845092b7c586424315d958b2d..27b43d07dd55c673af5010c8d204a3d8567035aa 100644 (file)
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -15,7 +15,7 @@ SYSDYN = <http://www.simantics.org/Sysdyn-1.0> : L0.Ontology
     @L0.new
     L0.HasResourceClass "org.simantics.sysdyn.SysdynResource"
 
-ImportedOntologies : PROJ.NamespaceRequirement
+SYSDYN.ImportedOntologies : PROJ.NamespaceRequirement
     L0.HasDescription "Specifies the ontologies required by a Sysdyn project."
     PROJ.RequiresNamespace
         "http://www.simantics.org/Sysdyn-1.0" : L0.URI

diff --git a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
index be523fe4d9bf91ec2935a7344b14b674584a558e..038af8d4bed88f4d3c994fb045a1c8730dd58440 100644 (file)
--- a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph
@@ -13,12 +13,12 @@ PROJ = <http://www.simantics.org/Project-1.0>
 \r
 /*\r
 WM = <http://www.simantics.org/Sysdyn-1.0/WorkModel> : PROJ.Project\r
-    PROJ.HasFeature "org.simantics.sysdyn.feature/1.1.0"\r
+    PROJ.HasFeature "org.simantics.sysdyn.feature.group"\r
     L0.PartOf <http://Projects>\r
 */\r
 \r
 WM = <http://www.simantics.org/Sysdyn-1.0/DevelopmentProject> : PROJ.Project\r
-    PROJ.HasFeature "org.simantics.sysdyn.feature/1.1.0"\r
+    PROJ.HasFeature "org.simantics.sysdyn.feature.group"\r
     L0.PartOf <http://Projects>\r
 \r
 TAGS = WM.Tags : L0.Library\r

diff --git a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
index 2055e85506c505cfb0d9608c0b6c0fd665ee4fb7..6bda59851b02bf997377f1d4c12bfe0fbff74aab 100644 (file)
--- a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
+++ b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
@@ -195,6 +195,7 @@ public class SysdynResource {
     public final Resource HasY;\r
     public final Resource HasY_Inverse;\r
     public final Resource HistoryRealization;\r
+    public final Resource ImportedOntologies;\r
     public final Resource IndependentVariable;\r
     public final Resource Input;\r
     public final Resource InputSymbol;\r
@@ -405,6 +406,7 @@ public class SysdynResource {
         public static final String HasY = "http://www.simantics.org/Sysdyn-1.0/HasY";\r
         public static final String HasY_Inverse = "http://www.simantics.org/Sysdyn-1.0/HasY/Inverse";\r
         public static final String HistoryRealization = "http://www.simantics.org/Sysdyn-1.0/HistoryRealization";\r
+        public static final String ImportedOntologies = "http://www.simantics.org/Sysdyn-1.0/ImportedOntologies";\r
         public static final String IndependentVariable = "http://www.simantics.org/Sysdyn-1.0/IndependentVariable";\r
         public static final String Input = "http://www.simantics.org/Sysdyn-1.0/Input";\r
         public static final String InputSymbol = "http://www.simantics.org/Sysdyn-1.0/InputSymbol";\r
@@ -625,6 +627,7 @@ public class SysdynResource {
         HasY = getResourceOrNull(graph, URIs.HasY);\r
         HasY_Inverse = getResourceOrNull(graph, URIs.HasY_Inverse);\r
         HistoryRealization = getResourceOrNull(graph, URIs.HistoryRealization);\r
+        ImportedOntologies = getResourceOrNull(graph, URIs.ImportedOntologies);\r
         IndependentVariable = getResourceOrNull(graph, URIs.IndependentVariable);\r
         Input = getResourceOrNull(graph, URIs.Input);\r
         InputSymbol = getResourceOrNull(graph, URIs.InputSymbol);\r