From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Mon, 1 Oct 2018 10:44:28 +0000 (+0000)
Subject: Merge "Fix to OrderedSetTemplate, preference for autocompletion"
X-Git-Tag: v1.43.0~136^2~350
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=d2eef7b7d919a2463438dd0f8106f55fa245a9f2;hp=8d9659a857fb83a9fdb5c9c8663302765fddd3e8

Merge "Fix to OrderedSetTemplate, preference for autocompletion"
---

diff --git a/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF b/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
index 400bdceea..b6f9a9442 100644
--- a/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Compiler
 Bundle-SymbolicName: org.simantics.graph.compiler;singleton:=true
-Bundle-Version: 1.1.16.qualifier
+Bundle-Version: 1.1.18.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.simantics.graph;bundle-version="1.1.15";visibility:=reexport,
  org.simantics.databoard;bundle-version="0.6.6",
diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/GraphCompilerPreferences.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/GraphCompilerPreferences.java
index 6487d8e91..ca81b6974 100644
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/GraphCompilerPreferences.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/GraphCompilerPreferences.java
@@ -4,6 +4,7 @@ public class GraphCompilerPreferences {
 	public boolean        validate = false;
 	public ValidationMode validateRelationRestrictions = ValidationMode.IGNORE;
 	public ValidationMode validateResourceHasType = ValidationMode.IGNORE;
+    public boolean autoCompletion;
 	
 	@Override
 	public String toString() {
@@ -11,6 +12,7 @@ public class GraphCompilerPreferences {
 	    b.append("validate = " + validate + "\n");
 	    b.append("validateRelationRestrictions = " + validateRelationRestrictions + "\n");
 	    b.append("validateResourceHasType = " + validateResourceHasType + "\n");
+	    b.append("autoCompletion = " + autoCompletion + "\n");
 	    return b.toString();
 	}
 }
diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/OrderedSetTemplate.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/OrderedSetTemplate.java
index 22679d626..b83d6a944 100644
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/OrderedSetTemplate.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/templates/OrderedSetTemplate.java
@@ -29,6 +29,7 @@ public enum OrderedSetTemplate implements ITemplate {
 		int inverse = store.identities.newResource();
 		store.statements.add(inverse, SubrelationOf, HasPrevious);
 		store.statements.add(relation, InverseOf, inverse);
+		store.identities.defineChild(relation, "Inverse", inverse);
 		
 		for(int i=1;i<parameters.length;++i)
 			store.statements.add(parameters[i-1], relation, parameters[i]);