From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 14 Sep 2018 12:34:14 +0000 (+0000)
Subject: Merge "Added null check after getPossibleType(STR.Component)"
X-Git-Tag: v1.43.0~136^2~375
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=fa0b5e5d3c4561af251471c5a5e0511f3ca65a16;hp=3d16f15713bbd3cde5ad51ab225bba16fd6d68d1

Merge "Added null check after getPossibleType(STR.Component)"
---

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StructuredProperty.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StructuredProperty.java
new file mode 100644
index 000000000..fa6469c3f
--- /dev/null
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StructuredProperty.java
@@ -0,0 +1,10 @@
+package org.simantics.db.layer0.variable;
+
+/**
+ * Java interface for StructuredProperty SCL value type.
+ * 
+ * @author Tuukka Lehtonen
+ * @since 1.36.0
+ */
+public interface StructuredProperty {
+}
\ No newline at end of file
diff --git a/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF b/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
index a1f311a5a..030278955 100644
--- a/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
@@ -35,3 +35,4 @@ Require-Bundle: org.simantics.history;bundle-version="1.0.0",
  org.simantics;bundle-version="1.0.0",
  org.eclipse.jetty.servlets
 Bundle-ClassPath: .
+Export-Package: org.simantics.history.rest
diff --git a/bundles/org.simantics.layer0/graph/Layer0.pgraph b/bundles/org.simantics.layer0/graph/Layer0.pgraph
index 5fe74ec01..225a4f17e 100644
--- a/bundles/org.simantics.layer0/graph/Layer0.pgraph
+++ b/bundles/org.simantics.layer0/graph/Layer0.pgraph
@@ -22,6 +22,7 @@ L0.Entity : L0.Type
     >-- L0.identifier <R L0.HasProperty : L0.FunctionalRelation
         L0.HasLabel "Identifier"
         --> L0.GUID
+        ==> "GUID"
     >-- L0.typeURI <R L0.HasProperty : L0.FunctionalRelation
         L0.HasLabel "Type URI"
         --> L0.String
@@ -42,7 +43,7 @@ L0.Entity : L0.Type
     @L0.assert L0.Entity.methods
       _ : L0.Value
     
-L0.Entity.methods --> L0.Value <R L0.HasProperty : L0.FunctionalRelation
+L0.Entity.methods ==> "StructuredProperty" <R L0.HasProperty : L0.FunctionalRelation
   L0.domainProperties L0.Functions.methodsPropertyDomainProperties
   
 L0.Entity.method <R L0.HasProperty : L0.FunctionalRelation
diff --git a/bundles/org.simantics.layer0/graph/Layer0Literals.pgraph b/bundles/org.simantics.layer0/graph/Layer0Literals.pgraph
index 329cfa12d..08f6f27a8 100644
--- a/bundles/org.simantics.layer0/graph/Layer0Literals.pgraph
+++ b/bundles/org.simantics.layer0/graph/Layer0Literals.pgraph
@@ -103,7 +103,7 @@ L0.Literal.FloatValidator <T L0.Value
 L0.Literal.DoubleValidator <T L0.Value
 
 L0.GUID <T L0.Literal
-    @L0.assert L0.HasValueType "(Long,Long)"
+    @L0.assert L0.HasValueType "GUID"
     @L0.assert L0.HasDataType ${ mostSigBits : Long, leastSigBits : Long }
     
 L0.TypeWithIdentifier <T L0.Entity
diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLTypeUtils.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLTypeUtils.java
index 9632090e3..d0a777caa 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLTypeUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLTypeUtils.java
@@ -60,6 +60,9 @@ public class SCLTypeUtils {
         TYPE_MAP.put("ByteArray", Types.BYTE_ARRAY);
         
         add((TCon)Types.RESOURCE);
+        add(Types.con("Simantics/GUID", "GUID")); // L0.GUID
+        add(Types.con("Simantics/Variables", "StructuredProperty")); // L0.methods
+        add(Types.con("Simantics/Variables", "ValueAccessor")); // L0.ValueAccessor
         add(Types.con("Simantics/Variables", "VariableMap"));
     }
     
diff --git a/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl b/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl
index 12d06b76b..43be6defb 100644
--- a/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl
+++ b/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl
@@ -96,6 +96,9 @@ importJava "org.simantics.db.layer0.function.All" where
 importJava "org.simantics.db.layer0.variable.VariableMap" where
     data VariableMap
 
+importJava "org.simantics.db.layer0.variable.StructuredProperty" where
+    data StructuredProperty
+
 importJava "org.simantics.db.layer0.variable.ResourceCollectionVariableMap" where
     @JavaName "<init>"
     createVariableMap :: [Resource] -> VariableMap