From: luukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 26 Sep 2013 14:42:28 +0000 (+0000)
Subject: Search functions are contributed with ontologies.
X-Git-Tag: 1.8.1~242
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=4d53afccd4752480e4a6eda21538d3535e5ff9a7;p=simantics%2Fsysdyn.git

Search functions are contributed with ontologies.

refs #4447

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27893 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
index f4ca250c..dfa33be9 100644
--- a/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.simantics.layer0,
  org.simantics.color.ontology;bundle-version="1.0.0",
  org.simantics.simulation.ontology;bundle-version="1.0.0",
  org.simantics.silk.ontology;bundle-version="1.0.0",
- org.simantics.spreadsheet.ontology;bundle-version="1.1.0"
+ org.simantics.spreadsheet.ontology;bundle-version="1.1.0",
+ org.simantics.workbench.ontology;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.simantics.sysdyn
 Bundle-Vendor: VTT Technical Reserarch Centre of Finland
diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index 93d42bb8..0ee27c2d 100644
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ
diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 12cf9621..f180d4f1 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -8,6 +8,7 @@ MOD = <http://www.simantics.org/Modeling-1.2>
 PROJ = <http://www.simantics.org/Project-1.2>
 JFREE = <http://www.simantics.org/JFreeChart-1.0>
 SHEET = <http://www.simantics.org/Spreadsheet-1.2>
+WORKBENCH = <http://www.simantics.org/Workbench-1.2>
  
 //#####################################################################
 // Defines ontology and attaches it to SimanticsDomain
@@ -87,6 +88,9 @@ SYSDYN.DefaultRealization <T L0X.Realization
 
 SYSDYN.ModulesSearchFunction : L0.Function
 
+SYSDYN.SearchContribution : WORKBENCH.SearchContribution
+  WORKBENCH.hasSearchFunction SYSDYN.ModulesSearchFunction
+
 //#####################################################################
 // Variables
 //#####################################################################
diff --git a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
index 62b9513d..3d6ec0d0 100644
--- a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
+++ b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
@@ -553,6 +553,7 @@ public class SysdynResource {
     public final Resource Result_time;
     public final Resource Result_time_Inverse;
     public final Resource Right;
+    public final Resource SearchContribution;
     public final Resource SelectedSharedFunctionLibraries;
     public final Resource SensitivityAnalysisExperiment;
     public final Resource SensitivityAnalysisExperiment_Parameter;
@@ -1290,6 +1291,7 @@ public class SysdynResource {
         public static final String Result_time = "http://www.simantics.org/Sysdyn-1.1/Result/time";
         public static final String Result_time_Inverse = "http://www.simantics.org/Sysdyn-1.1/Result/time/Inverse";
         public static final String Right = "http://www.simantics.org/Sysdyn-1.1/Right";
+        public static final String SearchContribution = "http://www.simantics.org/Sysdyn-1.1/SearchContribution";
         public static final String SelectedSharedFunctionLibraries = "http://www.simantics.org/Sysdyn-1.1/SelectedSharedFunctionLibraries";
         public static final String SensitivityAnalysisExperiment = "http://www.simantics.org/Sysdyn-1.1/SensitivityAnalysisExperiment";
         public static final String SensitivityAnalysisExperiment_Parameter = "http://www.simantics.org/Sysdyn-1.1/SensitivityAnalysisExperiment/Parameter";
@@ -2037,6 +2039,7 @@ public class SysdynResource {
         Result_time = getResourceOrNull(graph, URIs.Result_time);
         Result_time_Inverse = getResourceOrNull(graph, URIs.Result_time_Inverse);
         Right = getResourceOrNull(graph, URIs.Right);
+        SearchContribution = getResourceOrNull(graph, URIs.SearchContribution);
         SelectedSharedFunctionLibraries = getResourceOrNull(graph, URIs.SelectedSharedFunctionLibraries);
         SensitivityAnalysisExperiment = getResourceOrNull(graph, URIs.SensitivityAnalysisExperiment);
         SensitivityAnalysisExperiment_Parameter = getResourceOrNull(graph, URIs.SensitivityAnalysisExperiment_Parameter);
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
index 5f00db8b..9b55cbe9 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
@@ -123,29 +123,7 @@ public class SysdynProject extends AbstractProjectFeature {
             //final Set<Resource> requiredActivations = new HashSet<Resource>();
             //requiredActivations.add(APROS.IndexActivation);
 			
-        	session.syncRequest(new WriteRequest(support.getWorkspacePersistent("activations")) {
-			    @Override
-			    public void perform(WriteGraph graph) throws DatabaseException {
-
-			    	final SysdynResource SR = SysdynResource.getInstance(graph);
-			    	
-                    //for (Resource activation : graph.getObjects(project.get(), L0X.HasActivation))
-                   //     requiredActivations.remove(activation);
-                    //for (Resource requiredActivation : requiredActivations)
-                    //    if (requiredActivation != null)
-                    //        graph.claim(project.get(), L0X.HasActivation, null, requiredActivation);
-			    	
-					// Initialize Modules function as workbench search function.
-			        graph.syncRequest(new WriteRequest(support.getWorkspacePersistent("preferences")) {
-			            @Override
-			            public void perform(WriteGraph graph) throws DatabaseException {
-			                WorkbenchResource WB = WorkbenchResource.getInstance(graph);
-			                graph.deny(project.get(), WB.HasWorkbenchSearchFunction);
-			                graph.claim(project.get(), WB.HasWorkbenchSearchFunction, SR.ModulesSearchFunction);
-			            }
-			        });
-			    }
-			});
+        	
 
 		} catch (DatabaseException e) {