From: Antti Villberg <antti.villberg@semantum.fi>
Date: Tue, 22 Nov 2016 11:47:55 +0000 (+0200)
Subject: Initial version of SCL tab contributions
X-Git-Tag: v1.25.0~38
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=8d7b4615b1e0c7dec59c39e5e5f312a261fd1baf;p=simantics%2Fplatform.git

Initial version of SCL tab contributions

refs #6824

Change-Id: I677f82bc7a0cd5ec03937384d9a130c00ddefa9b
---

diff --git a/bundles/org.simantics.selectionview.ontology/graph.tg b/bundles/org.simantics.selectionview.ontology/graph.tg
index 49a3f113f..724deb153 100644
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 8905c6252..58eba8471 100644
--- a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
+++ b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
@@ -32,6 +32,9 @@ SEL.AbstractTypedVariableTabContribution <T SEL.AbstractVariableTabContribution
 SEL.AbstractTypedResourceTabContribution <T SEL.AbstractResourceTabContribution
   >-- SEL.AbstractTypedResourceTabContribution.HasType --> L0.Type <R L0.DependsOn
 
+SEL.SCLTabContribution <T SEL.TabContribution
+  >-- SEL.SCLTabContribution.instantiate ==> "() -> <Proc> TabContribution" <R L0.HasProperty
+
 SEL.VariableTabContribution <T SEL.TabContribution
   >-- SEL.VariableTabContribution.HasTest <R L0.DependsOn
   >-- SEL.VariableTabContribution.transformation ==> "Variable -> <ReadGraph> Variable" <R L0.HasProperty
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 c497214d7..0e6e2beca 100644
--- a/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java
+++ b/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java
@@ -69,6 +69,9 @@ public class SelectionViewResources {
     public final Resource HasStandardPropertyInfo;
     public final Resource HasStandardPropertyInfo_Inverse;
     public final Resource IsShownUnder;
+    public final Resource SCLTabContribution;
+    public final Resource SCLTabContribution_instantiate;
+    public final Resource SCLTabContribution_instantiate_Inverse;
     public final Resource SelectionTransformation;
     public final Resource SortingName;
     public final Resource SortingName_Inverse;
@@ -160,6 +163,9 @@ 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 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";
         public static final String SelectionTransformation = "http://www.simantics.org/SelectionView-1.2/SelectionTransformation";
         public static final String SortingName = "http://www.simantics.org/SelectionView-1.2/SortingName";
         public static final String SortingName_Inverse = "http://www.simantics.org/SelectionView-1.2/SortingName/Inverse";
@@ -261,6 +267,9 @@ public class SelectionViewResources {
         HasStandardPropertyInfo = getResourceOrNull(graph, URIs.HasStandardPropertyInfo);
         HasStandardPropertyInfo_Inverse = getResourceOrNull(graph, URIs.HasStandardPropertyInfo_Inverse);
         IsShownUnder = getResourceOrNull(graph, URIs.IsShownUnder);
+        SCLTabContribution = getResourceOrNull(graph, URIs.SCLTabContribution);
+        SCLTabContribution_instantiate = getResourceOrNull(graph, URIs.SCLTabContribution_instantiate);
+        SCLTabContribution_instantiate_Inverse = getResourceOrNull(graph, URIs.SCLTabContribution_instantiate_Inverse);
         SelectionTransformation = getResourceOrNull(graph, URIs.SelectionTransformation);
         SortingName = getResourceOrNull(graph, URIs.SortingName);
         SortingName_Inverse = getResourceOrNull(graph, URIs.SortingName_Inverse);
diff --git a/bundles/org.simantics.selectionview/scl/Simantics/SelectionView.scl b/bundles/org.simantics.selectionview/scl/Simantics/SelectionView.scl
index 9d9cfd6b3..7aa9dd831 100644
--- a/bundles/org.simantics.selectionview/scl/Simantics/SelectionView.scl
+++ b/bundles/org.simantics.selectionview/scl/Simantics/SelectionView.scl
@@ -7,3 +7,7 @@ importJava "org.simantics.selectionview.DisplayValueVariableAdapter" where
     standardSetDisplayValue2 :: Variable -> a -> <WriteGraph> ()
     standardSetDisplayValue3 :: Variable -> a -> Binding a -> <WriteGraph> ()
     standardGetDisplayValueDatatype :: Variable -> <ReadGraph> Datatype
+
+importJava "org.simantics.selectionview.TabContribution" where
+    data TabContribution
+    
\ No newline at end of file
diff --git a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/SCLTabContribution.java b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/SCLTabContribution.java
new file mode 100644
index 000000000..61921dd27
--- /dev/null
+++ b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/SCLTabContribution.java
@@ -0,0 +1,34 @@
+package org.simantics.selectionview;
+
+import java.util.Collection;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.variable.Variable;
+import org.simantics.db.layer0.variable.Variables;
+import org.simantics.scl.runtime.function.Function1;
+import org.simantics.scl.runtime.tuple.Tuple0;
+
+public class SCLTabContribution implements TabContribution<Object> {
+
+	final private TabContribution<Object> contribution;
+	
+	public SCLTabContribution(ReadGraph graph, Resource configuration) throws DatabaseException {
+		Variable var = Variables.getVariable(graph, configuration);
+		Function1<Object, TabContribution<Object>> function = var.getPropertyValue(graph, "instantiate");
+		contribution = function.apply(Tuple0.INSTANCE);
+	}
+
+	@Override
+	public boolean accept(ReadGraph graph, Object input) throws DatabaseException {
+		return contribution.accept(graph, input);
+	}
+
+	@Override
+	public void contribute(ReadGraph graph, Object selection, Collection<ComparableTabContributor> result)
+			throws DatabaseException {
+		contribution.contribute(graph, selection, result);
+	}
+
+}