Adding missing HasTypes for background compatibility

Change-Id: If1903c1fca4f14ecbc99797001f9d752c24c7787

diff --git a/bundles/org.simantics.selectionview.ontology/graph.tg b/bundles/org.simantics.selectionview.ontology/graph.tg
index 724deb153af635e054d7f73ad28e8991e96f162b..62f5bc7921cb706b62d10cbbe0cce38d6ca1abb4 100644 (file)
Binary files a/bundles/org.simantics.selectionview.ontology/graph.tg and b/bundles/org.simantics.selectionview.ontology/graph.tg differ

diff --git a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
index f4770b7efd6278e571bf9a3d046f87c608bc58ed..962de11c5f31bc5b385a92ec4508f26298e08f06 100644 (file)
--- a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
+++ b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
@@ -32,6 +32,7 @@ SEL.AbstractVariableTabContribution <T SEL.TabContribution
 SEL.AbstractResourceTabContribution <T SEL.TabContribution
 
 SEL.AbstractTypedVariableTabContribution <T SEL.AbstractVariableTabContribution
+  >-- SEL.AbstractTypedVariableTabContribution.HasType --> L0.Type <R L0.DependsOn
 
 SEL.AbstractTypedResourceTabContribution <T SEL.AbstractResourceTabContribution
 
@@ -46,6 +47,7 @@ SEL.MultiTypedVariableTabContribution <T SEL.TypedVariableTabContribution
   @L0.assert SEL.TabContribution.Multi true
 
 SEL.TypedVariableTabContribution <T SEL.VariableTabContribution
+  >-- SEL.TypedVariableTabContribution.HasType --> L0.Type <R L0.DependsOn
 
 SEL.HasDisplayColumn <R L0.HasProperty : L0.FunctionalRelation
 

diff --git a/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java b/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java
index 9b822d9fb2c32be894939d960238c19c50cbbb11..4da11b3b67b5fc46ad2402f7525f61d0eb8b0ca2 100644 (file)
--- a/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java
+++ b/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java
@@ -11,21 +11,11 @@ import org.simantics.db.service.QueryControl;
 public class SelectionViewResources {
     
     public final Resource AbstractResourceTabContribution;
-    public final Resource AbstractResourceTabContribution_HasPriority;
-    public final Resource AbstractResourceTabContribution_HasPriority_Inverse;
-    public final Resource AbstractResourceTabContribution_HasTest;
-    public final Resource AbstractResourceTabContribution_HasTest_Inverse;
     public final Resource AbstractTypedResourceTabContribution;
-    public final Resource AbstractTypedResourceTabContribution_HasType;
-    public final Resource AbstractTypedResourceTabContribution_HasType_Inverse;
     public final Resource AbstractTypedVariableTabContribution;
     public final Resource AbstractTypedVariableTabContribution_HasType;
     public final Resource AbstractTypedVariableTabContribution_HasType_Inverse;
     public final Resource AbstractVariableTabContribution;
-    public final Resource AbstractVariableTabContribution_HasPriority;
-    public final Resource AbstractVariableTabContribution_HasPriority_Inverse;
-    public final Resource AbstractVariableTabContribution_HasTest;
-    public final Resource AbstractVariableTabContribution_HasTest_Inverse;
     public final Resource AbstractVariableTabContribution_testFunction;
     public final Resource AbstractVariableTabContribution_testFunction_Inverse;
     public final Resource CategoryHidden;
@@ -69,6 +59,7 @@ public class SelectionViewResources {
     public final Resource HasStandardPropertyInfo;
     public final Resource HasStandardPropertyInfo_Inverse;
     public final Resource IsShownUnder;
+    public final Resource MultiTypedVariableTabContribution;
     public final Resource SCLTabContribution;
     public final Resource SCLTabContribution_instantiate;
     public final Resource SCLTabContribution_instantiate_Inverse;
@@ -83,15 +74,20 @@ public class SelectionViewResources {
     public final Resource StandardPropertyInfo_IsHidden;
     public final Resource StandardPropertyInfo_IsHidden_Inverse;
     public final Resource TabContribution;
+    public final Resource TabContribution_HasPriority;
+    public final Resource TabContribution_HasPriority_Inverse;
+    public final Resource TabContribution_HasTest;
+    public final Resource TabContribution_HasTest_Inverse;
+    public final Resource TabContribution_Multi;
+    public final Resource TabContribution_Multi_Inverse;
+    public final Resource TypedTabContribution;
+    public final Resource TypedTabContribution_HasType;
+    public final Resource TypedTabContribution_HasType_Inverse;
     public final Resource TypedVariableTabContribution;
     public final Resource TypedVariableTabContribution_HasType;
     public final Resource TypedVariableTabContribution_HasType_Inverse;
     public final Resource UnderOf;
     public final Resource VariableTabContribution;
-    public final Resource VariableTabContribution_HasPriority;
-    public final Resource VariableTabContribution_HasPriority_Inverse;
-    public final Resource VariableTabContribution_HasTest;
-    public final Resource VariableTabContribution_HasTest_Inverse;
     public final Resource VariableTabContribution_HasView;
     public final Resource VariableTabContribution_HasView_Inverse;
     public final Resource VariableTabContribution_transformation;
@@ -105,21 +101,11 @@ public class SelectionViewResources {
         
     public static class URIs {
         public static final String AbstractResourceTabContribution = "http://www.simantics.org/SelectionView-1.2/AbstractResourceTabContribution";
-        public static final String AbstractResourceTabContribution_HasPriority = "http://www.simantics.org/SelectionView-1.2/AbstractResourceTabContribution/HasPriority";
-        public static final String AbstractResourceTabContribution_HasPriority_Inverse = "http://www.simantics.org/SelectionView-1.2/AbstractResourceTabContribution/HasPriority/Inverse";
-        public static final String AbstractResourceTabContribution_HasTest = "http://www.simantics.org/SelectionView-1.2/AbstractResourceTabContribution/HasTest";
-        public static final String AbstractResourceTabContribution_HasTest_Inverse = "http://www.simantics.org/SelectionView-1.2/AbstractResourceTabContribution/HasTest/Inverse";
         public static final String AbstractTypedResourceTabContribution = "http://www.simantics.org/SelectionView-1.2/AbstractTypedResourceTabContribution";
-        public static final String AbstractTypedResourceTabContribution_HasType = "http://www.simantics.org/SelectionView-1.2/AbstractTypedResourceTabContribution/HasType";
-        public static final String AbstractTypedResourceTabContribution_HasType_Inverse = "http://www.simantics.org/SelectionView-1.2/AbstractTypedResourceTabContribution/HasType/Inverse";
         public static final String AbstractTypedVariableTabContribution = "http://www.simantics.org/SelectionView-1.2/AbstractTypedVariableTabContribution";
         public static final String AbstractTypedVariableTabContribution_HasType = "http://www.simantics.org/SelectionView-1.2/AbstractTypedVariableTabContribution/HasType";
         public static final String AbstractTypedVariableTabContribution_HasType_Inverse = "http://www.simantics.org/SelectionView-1.2/AbstractTypedVariableTabContribution/HasType/Inverse";
         public static final String AbstractVariableTabContribution = "http://www.simantics.org/SelectionView-1.2/AbstractVariableTabContribution";
-        public static final String AbstractVariableTabContribution_HasPriority = "http://www.simantics.org/SelectionView-1.2/AbstractVariableTabContribution/HasPriority";
-        public static final String AbstractVariableTabContribution_HasPriority_Inverse = "http://www.simantics.org/SelectionView-1.2/AbstractVariableTabContribution/HasPriority/Inverse";
-        public static final String AbstractVariableTabContribution_HasTest = "http://www.simantics.org/SelectionView-1.2/AbstractVariableTabContribution/HasTest";
-        public static final String AbstractVariableTabContribution_HasTest_Inverse = "http://www.simantics.org/SelectionView-1.2/AbstractVariableTabContribution/HasTest/Inverse";
         public static final String AbstractVariableTabContribution_testFunction = "http://www.simantics.org/SelectionView-1.2/AbstractVariableTabContribution/testFunction";
         public static final String AbstractVariableTabContribution_testFunction_Inverse = "http://www.simantics.org/SelectionView-1.2/AbstractVariableTabContribution/testFunction/Inverse";
         public static final String CategoryHidden = "http://www.simantics.org/SelectionView-1.2/CategoryHidden";
@@ -163,6 +149,7 @@ public class SelectionViewResources {
         public static final String HasStandardPropertyInfo = "http://www.simantics.org/SelectionView-1.2/HasStandardPropertyInfo";
         public static final String HasStandardPropertyInfo_Inverse = "http://www.simantics.org/SelectionView-1.2/HasStandardPropertyInfo/Inverse";
         public static final String IsShownUnder = "http://www.simantics.org/SelectionView-1.2/IsShownUnder";
+        public static final String MultiTypedVariableTabContribution = "http://www.simantics.org/SelectionView-1.2/MultiTypedVariableTabContribution";
         public static final String SCLTabContribution = "http://www.simantics.org/SelectionView-1.2/SCLTabContribution";
         public static final String SCLTabContribution_instantiate = "http://www.simantics.org/SelectionView-1.2/SCLTabContribution/instantiate";
         public static final String SCLTabContribution_instantiate_Inverse = "http://www.simantics.org/SelectionView-1.2/SCLTabContribution/instantiate/Inverse";
@@ -177,15 +164,20 @@ public class SelectionViewResources {
         public static final String StandardPropertyInfo_IsHidden = "http://www.simantics.org/SelectionView-1.2/StandardPropertyInfo/IsHidden";
         public static final String StandardPropertyInfo_IsHidden_Inverse = "http://www.simantics.org/SelectionView-1.2/StandardPropertyInfo/IsHidden/Inverse";
         public static final String TabContribution = "http://www.simantics.org/SelectionView-1.2/TabContribution";
+        public static final String TabContribution_HasPriority = "http://www.simantics.org/SelectionView-1.2/TabContribution/HasPriority";
+        public static final String TabContribution_HasPriority_Inverse = "http://www.simantics.org/SelectionView-1.2/TabContribution/HasPriority/Inverse";
+        public static final String TabContribution_HasTest = "http://www.simantics.org/SelectionView-1.2/TabContribution/HasTest";
+        public static final String TabContribution_HasTest_Inverse = "http://www.simantics.org/SelectionView-1.2/TabContribution/HasTest/Inverse";
+        public static final String TabContribution_Multi = "http://www.simantics.org/SelectionView-1.2/TabContribution/Multi";
+        public static final String TabContribution_Multi_Inverse = "http://www.simantics.org/SelectionView-1.2/TabContribution/Multi/Inverse";
+        public static final String TypedTabContribution = "http://www.simantics.org/SelectionView-1.2/TypedTabContribution";
+        public static final String TypedTabContribution_HasType = "http://www.simantics.org/SelectionView-1.2/TypedTabContribution/HasType";
+        public static final String TypedTabContribution_HasType_Inverse = "http://www.simantics.org/SelectionView-1.2/TypedTabContribution/HasType/Inverse";
         public static final String TypedVariableTabContribution = "http://www.simantics.org/SelectionView-1.2/TypedVariableTabContribution";
         public static final String TypedVariableTabContribution_HasType = "http://www.simantics.org/SelectionView-1.2/TypedVariableTabContribution/HasType";
         public static final String TypedVariableTabContribution_HasType_Inverse = "http://www.simantics.org/SelectionView-1.2/TypedVariableTabContribution/HasType/Inverse";
         public static final String UnderOf = "http://www.simantics.org/SelectionView-1.2/UnderOf";
         public static final String VariableTabContribution = "http://www.simantics.org/SelectionView-1.2/VariableTabContribution";
-        public static final String VariableTabContribution_HasPriority = "http://www.simantics.org/SelectionView-1.2/VariableTabContribution/HasPriority";
-        public static final String VariableTabContribution_HasPriority_Inverse = "http://www.simantics.org/SelectionView-1.2/VariableTabContribution/HasPriority/Inverse";
-        public static final String VariableTabContribution_HasTest = "http://www.simantics.org/SelectionView-1.2/VariableTabContribution/HasTest";
-        public static final String VariableTabContribution_HasTest_Inverse = "http://www.simantics.org/SelectionView-1.2/VariableTabContribution/HasTest/Inverse";
         public static final String VariableTabContribution_HasView = "http://www.simantics.org/SelectionView-1.2/VariableTabContribution/HasView";
         public static final String VariableTabContribution_HasView_Inverse = "http://www.simantics.org/SelectionView-1.2/VariableTabContribution/HasView/Inverse";
         public static final String VariableTabContribution_transformation = "http://www.simantics.org/SelectionView-1.2/VariableTabContribution/transformation";
@@ -209,21 +201,11 @@ public class SelectionViewResources {
     
     public SelectionViewResources(ReadGraph graph) {
         AbstractResourceTabContribution = getResourceOrNull(graph, URIs.AbstractResourceTabContribution);
-        AbstractResourceTabContribution_HasPriority = getResourceOrNull(graph, URIs.AbstractResourceTabContribution_HasPriority);
-        AbstractResourceTabContribution_HasPriority_Inverse = getResourceOrNull(graph, URIs.AbstractResourceTabContribution_HasPriority_Inverse);
-        AbstractResourceTabContribution_HasTest = getResourceOrNull(graph, URIs.AbstractResourceTabContribution_HasTest);
-        AbstractResourceTabContribution_HasTest_Inverse = getResourceOrNull(graph, URIs.AbstractResourceTabContribution_HasTest_Inverse);
         AbstractTypedResourceTabContribution = getResourceOrNull(graph, URIs.AbstractTypedResourceTabContribution);
-        AbstractTypedResourceTabContribution_HasType = getResourceOrNull(graph, URIs.AbstractTypedResourceTabContribution_HasType);
-        AbstractTypedResourceTabContribution_HasType_Inverse = getResourceOrNull(graph, URIs.AbstractTypedResourceTabContribution_HasType_Inverse);
         AbstractTypedVariableTabContribution = getResourceOrNull(graph, URIs.AbstractTypedVariableTabContribution);
         AbstractTypedVariableTabContribution_HasType = getResourceOrNull(graph, URIs.AbstractTypedVariableTabContribution_HasType);
         AbstractTypedVariableTabContribution_HasType_Inverse = getResourceOrNull(graph, URIs.AbstractTypedVariableTabContribution_HasType_Inverse);
         AbstractVariableTabContribution = getResourceOrNull(graph, URIs.AbstractVariableTabContribution);
-        AbstractVariableTabContribution_HasPriority = getResourceOrNull(graph, URIs.AbstractVariableTabContribution_HasPriority);
-        AbstractVariableTabContribution_HasPriority_Inverse = getResourceOrNull(graph, URIs.AbstractVariableTabContribution_HasPriority_Inverse);
-        AbstractVariableTabContribution_HasTest = getResourceOrNull(graph, URIs.AbstractVariableTabContribution_HasTest);
-        AbstractVariableTabContribution_HasTest_Inverse = getResourceOrNull(graph, URIs.AbstractVariableTabContribution_HasTest_Inverse);
         AbstractVariableTabContribution_testFunction = getResourceOrNull(graph, URIs.AbstractVariableTabContribution_testFunction);
         AbstractVariableTabContribution_testFunction_Inverse = getResourceOrNull(graph, URIs.AbstractVariableTabContribution_testFunction_Inverse);
         CategoryHidden = getResourceOrNull(graph, URIs.CategoryHidden);
@@ -267,6 +249,7 @@ public class SelectionViewResources {
         HasStandardPropertyInfo = getResourceOrNull(graph, URIs.HasStandardPropertyInfo);
         HasStandardPropertyInfo_Inverse = getResourceOrNull(graph, URIs.HasStandardPropertyInfo_Inverse);
         IsShownUnder = getResourceOrNull(graph, URIs.IsShownUnder);
+        MultiTypedVariableTabContribution = getResourceOrNull(graph, URIs.MultiTypedVariableTabContribution);
         SCLTabContribution = getResourceOrNull(graph, URIs.SCLTabContribution);
         SCLTabContribution_instantiate = getResourceOrNull(graph, URIs.SCLTabContribution_instantiate);
         SCLTabContribution_instantiate_Inverse = getResourceOrNull(graph, URIs.SCLTabContribution_instantiate_Inverse);
@@ -281,15 +264,20 @@ public class SelectionViewResources {
         StandardPropertyInfo_IsHidden = getResourceOrNull(graph, URIs.StandardPropertyInfo_IsHidden);
         StandardPropertyInfo_IsHidden_Inverse = getResourceOrNull(graph, URIs.StandardPropertyInfo_IsHidden_Inverse);
         TabContribution = getResourceOrNull(graph, URIs.TabContribution);
+        TabContribution_HasPriority = getResourceOrNull(graph, URIs.TabContribution_HasPriority);
+        TabContribution_HasPriority_Inverse = getResourceOrNull(graph, URIs.TabContribution_HasPriority_Inverse);
+        TabContribution_HasTest = getResourceOrNull(graph, URIs.TabContribution_HasTest);
+        TabContribution_HasTest_Inverse = getResourceOrNull(graph, URIs.TabContribution_HasTest_Inverse);
+        TabContribution_Multi = getResourceOrNull(graph, URIs.TabContribution_Multi);
+        TabContribution_Multi_Inverse = getResourceOrNull(graph, URIs.TabContribution_Multi_Inverse);
+        TypedTabContribution = getResourceOrNull(graph, URIs.TypedTabContribution);
+        TypedTabContribution_HasType = getResourceOrNull(graph, URIs.TypedTabContribution_HasType);
+        TypedTabContribution_HasType_Inverse = getResourceOrNull(graph, URIs.TypedTabContribution_HasType_Inverse);
         TypedVariableTabContribution = getResourceOrNull(graph, URIs.TypedVariableTabContribution);
         TypedVariableTabContribution_HasType = getResourceOrNull(graph, URIs.TypedVariableTabContribution_HasType);
         TypedVariableTabContribution_HasType_Inverse = getResourceOrNull(graph, URIs.TypedVariableTabContribution_HasType_Inverse);
         UnderOf = getResourceOrNull(graph, URIs.UnderOf);
         VariableTabContribution = getResourceOrNull(graph, URIs.VariableTabContribution);
-        VariableTabContribution_HasPriority = getResourceOrNull(graph, URIs.VariableTabContribution_HasPriority);
-        VariableTabContribution_HasPriority_Inverse = getResourceOrNull(graph, URIs.VariableTabContribution_HasPriority_Inverse);
-        VariableTabContribution_HasTest = getResourceOrNull(graph, URIs.VariableTabContribution_HasTest);
-        VariableTabContribution_HasTest_Inverse = getResourceOrNull(graph, URIs.VariableTabContribution_HasTest_Inverse);
         VariableTabContribution_HasView = getResourceOrNull(graph, URIs.VariableTabContribution_HasView);
         VariableTabContribution_HasView_Inverse = getResourceOrNull(graph, URIs.VariableTabContribution_HasView_Inverse);
         VariableTabContribution_transformation = getResourceOrNull(graph, URIs.VariableTabContribution_transformation);