From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 16 Sep 2010 23:08:26 +0000 (+0000)
Subject: Fixed bug in sysdyn ontology that prevented sysdyn project from launching.
X-Git-Tag: simantics-1.2.0~38
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b38a04b563f1da36e1f2d4c4ddc4003f92987ef0;p=simantics%2Fsysdyn.git

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 e05fd8b9..6ae5d27e 100644
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 74588965..27b43d07 100644
--- 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 be523fe4..038af8d4 100644
--- 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>
 
 /*
 WM = <http://www.simantics.org/Sysdyn-1.0/WorkModel> : PROJ.Project
-    PROJ.HasFeature "org.simantics.sysdyn.feature/1.1.0"
+    PROJ.HasFeature "org.simantics.sysdyn.feature.group"
     L0.PartOf <http://Projects>
 */
 
 WM = <http://www.simantics.org/Sysdyn-1.0/DevelopmentProject> : PROJ.Project
-    PROJ.HasFeature "org.simantics.sysdyn.feature/1.1.0"
+    PROJ.HasFeature "org.simantics.sysdyn.feature.group"
     L0.PartOf <http://Projects>
 
 TAGS = WM.Tags : L0.Library
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 2055e855..6bda5985 100644
--- 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;
     public final Resource HasY_Inverse;
     public final Resource HistoryRealization;
+    public final Resource ImportedOntologies;
     public final Resource IndependentVariable;
     public final Resource Input;
     public final Resource InputSymbol;
@@ -405,6 +406,7 @@ public class SysdynResource {
         public static final String HasY = "http://www.simantics.org/Sysdyn-1.0/HasY";
         public static final String HasY_Inverse = "http://www.simantics.org/Sysdyn-1.0/HasY/Inverse";
         public static final String HistoryRealization = "http://www.simantics.org/Sysdyn-1.0/HistoryRealization";
+        public static final String ImportedOntologies = "http://www.simantics.org/Sysdyn-1.0/ImportedOntologies";
         public static final String IndependentVariable = "http://www.simantics.org/Sysdyn-1.0/IndependentVariable";
         public static final String Input = "http://www.simantics.org/Sysdyn-1.0/Input";
         public static final String InputSymbol = "http://www.simantics.org/Sysdyn-1.0/InputSymbol";
@@ -625,6 +627,7 @@ public class SysdynResource {
         HasY = getResourceOrNull(graph, URIs.HasY);
         HasY_Inverse = getResourceOrNull(graph, URIs.HasY_Inverse);
         HistoryRealization = getResourceOrNull(graph, URIs.HistoryRealization);
+        ImportedOntologies = getResourceOrNull(graph, URIs.ImportedOntologies);
         IndependentVariable = getResourceOrNull(graph, URIs.IndependentVariable);
         Input = getResourceOrNull(graph, URIs.Input);
         InputSymbol = getResourceOrNull(graph, URIs.InputSymbol);