From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Tue, 5 May 2020 06:54:36 +0000 (+0000)
Subject: Merge "Inverse relation for hasReference"
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=f353e9892e001df6d7d19a125c8309de511b57ec;hp=7a35eb34c64998f265cdaa3b2e0ad85a31ad40ab;p=simantics%2Finterop.git

Merge "Inverse relation for hasReference"
---

diff --git a/org.simantics.xml.sax.ontology/graph.tg b/org.simantics.xml.sax.ontology/graph.tg
index 863c8e2..960dde6 100644
Binary files a/org.simantics.xml.sax.ontology/graph.tg and b/org.simantics.xml.sax.ontology/graph.tg differ
diff --git a/org.simantics.xml.sax.ontology/graph/XML.pgraph b/org.simantics.xml.sax.ontology/graph/XML.pgraph
index b0526a2..7b7143f 100644
--- a/org.simantics.xml.sax.ontology/graph/XML.pgraph
+++ b/org.simantics.xml.sax.ontology/graph/XML.pgraph
@@ -1,37 +1,38 @@
-L0 = <http://www.simantics.org/Layer0-1.1>
-
-XML = <http://www.simantics.org/XML-1.0> : L0.Ontology
-   @L0.new
-   L0.HasResourceClass "org.simantics.xml.sax.ontology.XMLResource"
-
-
-// Built-in types
-XML.Entity <T L0.Entity
-XML.hasAttribute <R L0.HasProperty
-XML.hasID <R XML.hasAttribute : L0.FunctionalRelation
-  --> L0.String
-XML.ComplexType <T XML.Entity
-XML.hasComplexType <R L0.IsComposedOf
-XML.AttributeGroup  <T XML.Entity
-XML.Element <T XML.Entity
-XML.hasElement <R L0.IsComposedOf
-XML.ElementList <T L0.List
-XML.hasElementList <R L0.IsComposedOf
-XML.hasOriginalElementList <R XML.hasElementList
-XML.hasReference <R L0.IsRelatedTo
-XML.hasExternalReference <R L0.IsRelatedTo
-   L0.InverseOf XML.externalReferenceOf <R L0.IsRelatedTo
-   
-   
-XML.DateTime <T L0.Literal
-    @L0.assert L0.HasValueType "(Integer,Byte,Byte,Byte,Byte,Byte,Integer)"
-    @L0.assert L0.HasDataType ${ year : Integer, month : Byte, date : Byte, hours : Byte, minutes : Byte, seconds : Byte, offset : Integer }
-    
-XML.Date <T L0.Literal
-    @L0.assert L0.HasValueType "(Integer,Byte,Byte,Integer)"
-    @L0.assert L0.HasDataType ${ year : Integer, month : Byte, date : Byte, offset : Integer }
-
-XML.Time <T L0.Literal
-    @L0.assert L0.HasValueType "(Byte,Byte,Byte,Integer,)"
-    @L0.assert L0.HasDataType ${ hours : Byte, minutes : Byte, seconds : Byte, offset : Integer }
-
+L0 = <http://www.simantics.org/Layer0-1.1>
+
+XML = <http://www.simantics.org/XML-1.0> : L0.Ontology
+   @L0.new
+   L0.HasResourceClass "org.simantics.xml.sax.ontology.XMLResource"
+
+
+// Built-in types
+XML.Entity <T L0.Entity
+XML.hasAttribute <R L0.HasProperty
+XML.hasID <R XML.hasAttribute : L0.FunctionalRelation
+  --> L0.String
+XML.ComplexType <T XML.Entity
+XML.hasComplexType <R L0.IsComposedOf
+XML.AttributeGroup  <T XML.Entity
+XML.Element <T XML.Entity
+XML.hasElement <R L0.IsComposedOf
+XML.ElementList <T L0.List
+XML.hasElementList <R L0.IsComposedOf
+XML.hasOriginalElementList <R XML.hasElementList
+XML.hasReference <R L0.IsRelatedTo
+ L0.InverseOf XML.referredBy <R L0.IsWeaklyRelatedTo
+XML.hasExternalReference <R L0.IsRelatedTo
+   L0.InverseOf XML.externalReferenceOf <R L0.IsRelatedTo
+   
+   
+XML.DateTime <T L0.Literal
+    @L0.assert L0.HasValueType "(Integer,Byte,Byte,Byte,Byte,Byte,Integer)"
+    @L0.assert L0.HasDataType ${ year : Integer, month : Byte, date : Byte, hours : Byte, minutes : Byte, seconds : Byte, offset : Integer }
+    
+XML.Date <T L0.Literal
+    @L0.assert L0.HasValueType "(Integer,Byte,Byte,Integer)"
+    @L0.assert L0.HasDataType ${ year : Integer, month : Byte, date : Byte, offset : Integer }
+
+XML.Time <T L0.Literal
+    @L0.assert L0.HasValueType "(Byte,Byte,Byte,Integer,)"
+    @L0.assert L0.HasDataType ${ hours : Byte, minutes : Byte, seconds : Byte, offset : Integer }
+
diff --git a/org.simantics.xml.sax.ontology/src/org/simantics/xml/sax/ontology/XMLResource.java b/org.simantics.xml.sax.ontology/src/org/simantics/xml/sax/ontology/XMLResource.java
index 1bb9dbb..f32417c 100644
--- a/org.simantics.xml.sax.ontology/src/org/simantics/xml/sax/ontology/XMLResource.java
+++ b/org.simantics.xml.sax.ontology/src/org/simantics/xml/sax/ontology/XMLResource.java
@@ -33,6 +33,7 @@ public class XMLResource {
     public final Resource hasOriginalElementList;
     public final Resource hasOriginalElementList_Inverse;
     public final Resource hasReference;
+    public final Resource referredBy;
         
     public static class URIs {
         public static final String AttributeGroup = "http://www.simantics.org/XML-1.0/AttributeGroup";
@@ -58,6 +59,7 @@ public class XMLResource {
         public static final String hasOriginalElementList = "http://www.simantics.org/XML-1.0/hasOriginalElementList";
         public static final String hasOriginalElementList_Inverse = "http://www.simantics.org/XML-1.0/hasOriginalElementList/Inverse";
         public static final String hasReference = "http://www.simantics.org/XML-1.0/hasReference";
+        public static final String referredBy = "http://www.simantics.org/XML-1.0/referredBy";
     }
     
     public static Resource getResourceOrNull(ReadGraph graph, String uri) {
@@ -93,6 +95,7 @@ public class XMLResource {
         hasOriginalElementList = getResourceOrNull(graph, URIs.hasOriginalElementList);
         hasOriginalElementList_Inverse = getResourceOrNull(graph, URIs.hasOriginalElementList_Inverse);
         hasReference = getResourceOrNull(graph, URIs.hasReference);
+        referredBy = getResourceOrNull(graph, URIs.referredBy);
     }
     
     public static XMLResource getInstance(ReadGraph graph) {