From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 5 Jul 2013 10:53:32 +0000 (+0000)
Subject: Initial search feature for Sysdyn (refs #3966).
X-Git-Tag: 1.8.1~269
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=2d7cf153eabce6fe344305ac238d4826b6e1e39f;p=simantics%2Fsysdyn.git

Initial search feature for Sysdyn (refs #3966).

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

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index d242b0ba..c032924c 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 a4b4fdc6..6b4860ab 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -85,6 +85,8 @@ SYSDYN.Configuration <T STR.Composite <T L0X.Realization <T L0.RVIContext
 SYSDYN.HistoryRealization <T L0X.Realization
 SYSDYN.DefaultRealization <T L0X.Realization
 
+SYSDYN.ModulesSearchFunction : L0.Function
+
 //#####################################################################
 // 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 47e988f5..ad3b3f54 100644
--- a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
+++ b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
@@ -515,6 +515,7 @@ public class SysdynResource {
     public final Resource Module_parameterOverride_Inverse;
     public final Resource Module_redeclaration;
     public final Resource Module_redeclaration_Inverse;
+    public final Resource ModulesSearchFunction;
     public final Resource NormalDistribution;
     public final Resource NormalDistribution_maxValue;
     public final Resource NormalDistribution_maxValue_Inverse;
@@ -1248,6 +1249,7 @@ public class SysdynResource {
         public static final String Module_parameterOverride_Inverse = "http://www.simantics.org/Sysdyn-1.1/Module/parameterOverride/Inverse";
         public static final String Module_redeclaration = "http://www.simantics.org/Sysdyn-1.1/Module/redeclaration";
         public static final String Module_redeclaration_Inverse = "http://www.simantics.org/Sysdyn-1.1/Module/redeclaration/Inverse";
+        public static final String ModulesSearchFunction = "http://www.simantics.org/Sysdyn-1.1/ModulesSearchFunction";
         public static final String NormalDistribution = "http://www.simantics.org/Sysdyn-1.1/NormalDistribution";
         public static final String NormalDistribution_maxValue = "http://www.simantics.org/Sysdyn-1.1/NormalDistribution/maxValue";
         public static final String NormalDistribution_maxValue_Inverse = "http://www.simantics.org/Sysdyn-1.1/NormalDistribution/maxValue/Inverse";
@@ -1991,6 +1993,7 @@ public class SysdynResource {
         Module_parameterOverride_Inverse = getResourceOrNull(graph, URIs.Module_parameterOverride_Inverse);
         Module_redeclaration = getResourceOrNull(graph, URIs.Module_redeclaration);
         Module_redeclaration_Inverse = getResourceOrNull(graph, URIs.Module_redeclaration_Inverse);
+        ModulesSearchFunction = getResourceOrNull(graph, URIs.ModulesSearchFunction);
         NormalDistribution = getResourceOrNull(graph, URIs.NormalDistribution);
         NormalDistribution_maxValue = getResourceOrNull(graph, URIs.NormalDistribution_maxValue);
         NormalDistribution_maxValue_Inverse = getResourceOrNull(graph, URIs.NormalDistribution_maxValue_Inverse);
diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index e4d2ebbc..25222644 100644
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -62,3 +62,7 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.sysdyn.ui.browser.nodes
 Bundle-Vendor: VTT Technical Reserarch Centre of Finland
 Bundle-Localization: plugin
+Import-Package: freemarker.template,
+ org.simantics.workbench,
+ org.simantics.workbench.ontology,
+ org.simantics.workbench.search
diff --git a/org.simantics.sysdyn.ui/adapters.xml b/org.simantics.sysdyn.ui/adapters.xml
index 68f7b5c4..f89f2e41 100644
--- a/org.simantics.sysdyn.ui/adapters.xml
+++ b/org.simantics.sysdyn.ui/adapters.xml
@@ -10,5 +10,5 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->
 
-<adapters>

	<target interface="org.simantics.db.layer0.adapter.Realization">
		<type uri="http://www.simantics.org/Sysdyn-0.0/Module"
			class="org.simantics.structural2.realization.StructuralRealization">
			<this />
		</type>
	</target>

	<target interface="org.simantics.layer0.utils.triggers.ITrigger">
	<type uri = "http://www.simantics.org/Sysdyn-0.0/DiagramToCompositeMapping"
	      class = "org.simantics.sysdyn.ui.editor.DiagramToCompositeMapping3">
	    <graph/>
		<this />
	</type>
	</target>
	
	<target interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
		<type uri="http://www.simantics.org/Sysdyn-0.0/SysdynModel"
			class="org.simantics.structural.ui.modelBrowser.nodes.ModelNode">
			<this />
		</type>
	</target>		
		

	<target
		interface="org.simantics.browsing.ui.common.node.AbstractNode">
		<type
			uri="http://www.simantics.org/Sysdyn-0.0/SysdynModel"
			class="org.simantics.sysdyn.ui.browser.nodes.ModelNode">
			<this />
		</type>

		<resource
			uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.browser.nodes.SymbolNode">
			<this />
		</resource>

		<type
			uri="http://www.simantics.org/Simulation-0.0/Experiment"
			class="org.simantics.sysdyn.ui.browser.nodes.ExperimentNode">
			<this />
		</type>
		
		<type
			uri="http://www.simantics.org/Sysdyn-0.0/Result"
			class="org.simantics.sysdyn.ui.browser.nodes.SimulationResultNode">
			<this />
		</type>
		
	</target>

	<!-- Inject default connection routing algorithm for sysdyn diagrams -->
	<target interface="org.simantics.g2d.diagram.DiagramClass">
		<adapter uri="http://www.simantics.org/Sysdyn-0.0/ConfigurationDiagram"
			adapterClass="org.simantics.sysdyn.ui.elements.ConfigurationDiagramClassAdapter" />
	</target>

	<!-- Sysdyn symbols -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<resource uri="http://www.simantics.org/Sysdyn-0.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements.StockFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements.ModuleFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements.ValveFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements.AuxiliaryFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements.CloudFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements.InputFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ShadowSymbol"
			class="org.simantics.sysdyn.ui.elements.ShadowFactory" />			

		<type uri="http://www.simantics.org/Sysdyn-0.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements.StockFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements.ModuleFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements.ValveFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements.AuxiliaryFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements.CloudFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements.InputFactory" />	
		<type uri="http://www.simantics.org/Sysdyn-0.0/ShadowSymbol"
			class="org.simantics.sysdyn.ui.elements.ShadowFactory" />	
	</target>
	
	<!-- Additional symbols -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
	    <resource uri="http://www.simantics.org/Sysdyn-0.0/AdditionalSymbols/MultilineText"
            class="org.simantics.sysdyn.ui.elements.MultilineTextElementFactory" />
        <type uri="http://www.simantics.org/Sysdyn-0.0/AdditionalSymbols/MultilineText"
            class="org.simantics.sysdyn.ui.elements.MultilineTextElementFactory" />         
    </target>                  
	
	<!-- Sysdyn connections -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<!-- Edges -->       
        <resource uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowEdgeFactory" />
        <type uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowEdgeFactory" />            
        <type uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowConnectionFactory">
            <graph/>
        </type>                  	
			
		<resource uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyConnectionFactory" />
	</target>
	
	<target interface="org.simantics.g2d.connection.EdgeVisualsConfigurer">
	  <baseType uri="http://www.simantics.org/Diagram-0.0/HasConnector" />
	  <resource uri="http://www.simantics.org/Diagram-0.0/HasPlainConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>none 0</string>
	  </resource>
	  <resource uri="http://www.simantics.org/Diagram-0.0/HasArrowConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>fill 1</string>
	  </resource>
	</target>
	
	<!-- ModelBrowser2 -->
	
	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleTypeChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleTypeChildRule"/>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleContentChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleContentChildRule"/>              
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.VariableChildRule"/>                  
                  
        <resource uri="http://www.simantics.org/Sysdyn-0.0/HistoryDataset/HistoryDatasetVariablesBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.historyDataset.VariableChildRule"/>     
        <resource uri=" http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterChildRule"/>              
            
            
	<!-- Sensitivity analysis -->
	    <resource uri="http://www.simantics.org/Sysdyn-0.0/SensitivityAnalysisExperiment/ParameterBrowseContext/ParameterChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.ParameterChildRule"/>         
    </target>
    
    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleTypeLabelRule"
            class="org.simantics.sysdyn.ui.browser.labelrules.ModuleTypeLabelRule"/>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableNameLabelRule"
            class="org.simantics.sysdyn.ui.browser.labelrules.VariableNameLabelRule"/>

        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.VariableImageRule"/>   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ChartImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.ChartImageRule"/>      
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ResultImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.ResultImageRule"/>                        
            
  
        <resource uri="http://www.simantics.org/Sysdyn-0.0/HistoryDataset/HistoryDatasetVariablesBrowseContext/VariableLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.historyDataset.VariableLabelRule"/>                

            
        <resource uri="http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterLabelRule"/>    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterLabelDecorationRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterLabelDecorationRule"/>               
        <resource uri="http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterModifierRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterModifierRule"/>    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterSorterRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterSorterRule"/>      
            
	<!-- Sensitivity analysis -->
	    <resource uri="http://www.simantics.org/Sysdyn-0.0/SensitivityAnalysisExperiment/ParameterBrowseContext/ParameterLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.ParameterLabelRule"/>

    </target>    
    
    <target interface="org.simantics.db.layer0.adapter.ActionFactory">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewModuleType"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewModuleTypeAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewEnumeration"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewEnumerationAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewFunction"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewFunctionAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewFunctionLibrary"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewFunctionLibraryAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSharedFunctionLibrary"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSharedFunctionLibraryAction" />   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewExperiment"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewExperimentAction" />   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSimulationPlaybackExperiment"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSimulationPlaybackExperimentAction" />    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewLineChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewLineChartAction" /> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewBarChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewBarChartAction" /> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewPieChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewPieChartAction" />        
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSheet"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSheetAction" />       
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewHistoryData"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewHistoryDataAction" />                                                                                              
    </target>         
    
   <target interface="org.simantics.db.layer0.adapter.DropActionFactory">
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/FunctionDropAction"
            class="org.simantics.sysdyn.ui.browser.actions.drop.FunctionDropAction" />
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/ChartDropAction"
            class="org.simantics.sysdyn.ui.browser.actions.drop.ChartDropAction" />            
   
                    
    </target>     
  
    <target interface="org.simantics.db.layer0.adapter.Remover">
        <type uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleSymbol"
            class="org.simantics.sysdyn.ui.browser.actions.remove.ModuleTypeRemover">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/Sysdyn-0.0/Variable"
            class="org.simantics.sysdyn.ui.actions.SysdynVariableRemover">
            <this />
        </type>
    </target>
    
    
    <target interface="org.simantics.browsing.ui.model.nodetypes.NodeType">
        <baseType uri="http://www.simantics.org/Layer0-0.0/Entity" />
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleSymbolNodeType"
            class="org.simantics.sysdyn.ui.browser.nodeTypes.ModuleSymbolNodeType"
            constructor="create">
            <this/>
        </type>        
     </target>
    
  <!-- PROFILES -->
    <target interface="org.simantics.scenegraph.profile.Style">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/SimulationPlaybackStyle"
            class="org.simantics.sysdyn.ui.elements.profiles.SimulationPlaybackStyle">
        </resource>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/IssueStyle"
            class="org.simantics.sysdyn.ui.elements.profiles.IssueDecorationStyle">
        </resource>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ShadowStyle"
            class="org.simantics.sysdyn.ui.elements.profiles.ShadowStyle">
        </resource>        
    </target>
    
 
    <!--  TODO: currently maps jfree concepts directly to Sysdyn implementations. Sysdyn needs tool specific types for the datasets. -->
    <!--  TODO: AllVariablesOfModel query is run on random Resources; listing all possible types explicitly is cumbersome, we need a better implementation. -->
    <target interface="org.simantics.jfreechart.chart.properties.IAllVariablesOfModel">  
        <type uri="http://www.simantics.org/Sysdyn-1.1/SysdynModel"
            class="org.simantics.sysdyn.ui.trend.AllVariablesOfModel">
            <this />
        </type>  
        <type uri="http://www.simantics.org/JFreeChart-1.0/NumberAxis"
            class="org.simantics.sysdyn.ui.trend.AllVariablesOfModel">
            <this />
        </type>   
        <type uri="http://www.simantics.org/JFreeChart-1.0/Series"
            class="org.simantics.sysdyn.ui.trend.AllVariablesOfModel">
            <this />
        </type>      
        <type uri="http://www.simantics.org/Sysdyn-0.0/SensitivityAnalysisExperiment/Parameter"
            class="org.simantics.sysdyn.ui.trend.AllParametersOfModel">
            <this />
        </type>
    </target> 
       
    <target interface="org.simantics.jfreechart.chart.properties.RangeHandlerFactory">  
        <type uri="http://www.simantics.org/JFreeChart-1.0/Series"
            class="org.simantics.sysdyn.ui.trend.SysdynRangeHandlerFactory">
        </type>    
        <type uri="http://www.simantics.org/Sysdyn-0.0/SensitivityAnalysisExperiment/Parameter"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.SensitivityRangeHandlerFactory">
        </type>
    </target> 
    
    <!--  TODO: currently maps jfree concepts directly to Sysdyn implementations. Sysdyn needs tool specific types for the datasets. -->
     <target interface="org.simantics.jfreechart.chart.IDataset">
        <type uri="http://www.simantics.org/JFreeChart-0.0/XYDataset"
            class="org.simantics.sysdyn.ui.trend.XYDataset">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-0.0/CategoryDataset"
            class="org.simantics.sysdyn.ui.trend.CategoryDataset">
            <graph />
            <this />
        </type>        
        <type uri="http://www.simantics.org/JFreeChart-0.0/PieDataset"
            class="org.simantics.sysdyn.ui.trend.PieDataset">
            <graph />
            <this />
        </type>   
        <type uri="http://www.simantics.org/Sysdyn-0.0/Charts/SensitivityDataset"
            class="org.simantics.sysdyn.ui.trend.SensitivityDataset">
            <graph />
            <this />
        </type>
    </target>
    
	<!-- Sensitivity analysis -->
   <target
        interface="org.simantics.sysdyn.ui.properties.widgets.sensitivity.IDistributionProperties">
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/NormalDistribution"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.NormalDistributionProperties">
            <this />
        </type>	
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/UniformDistribution"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.UniformDistributionProperties">
            <this />
        </type>	
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/Interval"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.IntervalProperties">
            <this />
        </type>
    </target>
    
+<adapters>

	<target interface="org.simantics.db.layer0.adapter.Realization">
		<type uri="http://www.simantics.org/Sysdyn-0.0/Module"
			class="org.simantics.structural2.realization.StructuralRealization">
			<this />
		</type>
	</target>

	<target interface="org.simantics.layer0.utils.triggers.ITrigger">
	<type uri = "http://www.simantics.org/Sysdyn-0.0/DiagramToCompositeMapping"
	      class = "org.simantics.sysdyn.ui.editor.DiagramToCompositeMapping3">
	    <graph/>
		<this />
	</type>
	</target>
	
	<target interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
		<type uri="http://www.simantics.org/Sysdyn-0.0/SysdynModel"
			class="org.simantics.structural.ui.modelBrowser.nodes.ModelNode">
			<this />
		</type>
	</target>		
		

	<target
		interface="org.simantics.browsing.ui.common.node.AbstractNode">
		<type
			uri="http://www.simantics.org/Sysdyn-0.0/SysdynModel"
			class="org.simantics.sysdyn.ui.browser.nodes.ModelNode">
			<this />
		</type>

		<resource
			uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.browser.nodes.SymbolNode">
			<this />
		</resource>

		<type
			uri="http://www.simantics.org/Simulation-0.0/Experiment"
			class="org.simantics.sysdyn.ui.browser.nodes.ExperimentNode">
			<this />
		</type>
		
		<type
			uri="http://www.simantics.org/Sysdyn-0.0/Result"
			class="org.simantics.sysdyn.ui.browser.nodes.SimulationResultNode">
			<this />
		</type>
		
	</target>

	<!-- Inject default connection routing algorithm for sysdyn diagrams -->
	<target interface="org.simantics.g2d.diagram.DiagramClass">
		<adapter uri="http://www.simantics.org/Sysdyn-0.0/ConfigurationDiagram"
			adapterClass="org.simantics.sysdyn.ui.elements.ConfigurationDiagramClassAdapter" />
	</target>

	<!-- Sysdyn symbols -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<resource uri="http://www.simantics.org/Sysdyn-0.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements.StockFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements.ModuleFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements.ValveFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements.AuxiliaryFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements.CloudFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements.InputFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ShadowSymbol"
			class="org.simantics.sysdyn.ui.elements.ShadowFactory" />			

		<type uri="http://www.simantics.org/Sysdyn-0.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements.StockFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements.ModuleFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements.ValveFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements.AuxiliaryFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements.CloudFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements.InputFactory" />	
		<type uri="http://www.simantics.org/Sysdyn-0.0/ShadowSymbol"
			class="org.simantics.sysdyn.ui.elements.ShadowFactory" />	
	</target>
	
	<!-- Additional symbols -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
	    <resource uri="http://www.simantics.org/Sysdyn-0.0/AdditionalSymbols/MultilineText"
            class="org.simantics.sysdyn.ui.elements.MultilineTextElementFactory" />
        <type uri="http://www.simantics.org/Sysdyn-0.0/AdditionalSymbols/MultilineText"
            class="org.simantics.sysdyn.ui.elements.MultilineTextElementFactory" />         
    </target>                  
	
	<!-- Sysdyn connections -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<!-- Edges -->       
        <resource uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowEdgeFactory" />
        <type uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowEdgeFactory" />            
        <type uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowConnectionFactory">
            <graph/>
        </type>                  	
			
		<resource uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyConnectionFactory" />
	</target>
	
	<target interface="org.simantics.g2d.connection.EdgeVisualsConfigurer">
	  <baseType uri="http://www.simantics.org/Diagram-0.0/HasConnector" />
	  <resource uri="http://www.simantics.org/Diagram-0.0/HasPlainConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>none 0</string>
	  </resource>
	  <resource uri="http://www.simantics.org/Diagram-0.0/HasArrowConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>fill 1</string>
	  </resource>
	</target>
	
	<!-- ModelBrowser2 -->
	
	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleTypeChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleTypeChildRule"/>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleContentChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleContentChildRule"/>              
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.VariableChildRule"/>                  
                  
        <resource uri="http://www.simantics.org/Sysdyn-0.0/HistoryDataset/HistoryDatasetVariablesBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.historyDataset.VariableChildRule"/>     
        <resource uri=" http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterChildRule"/>              
            
            
	<!-- Sensitivity analysis -->
	    <resource uri="http://www.simantics.org/Sysdyn-0.0/SensitivityAnalysisExperiment/ParameterBrowseContext/ParameterChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.ParameterChildRule"/>         
    </target>
    
    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleTypeLabelRule"
            class="org.simantics.sysdyn.ui.browser.labelrules.ModuleTypeLabelRule"/>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableNameLabelRule"
            class="org.simantics.sysdyn.ui.browser.labelrules.VariableNameLabelRule"/>

        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.VariableImageRule"/>   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ChartImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.ChartImageRule"/>      
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ResultImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.ResultImageRule"/>                        
            
  
        <resource uri="http://www.simantics.org/Sysdyn-0.0/HistoryDataset/HistoryDatasetVariablesBrowseContext/VariableLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.historyDataset.VariableLabelRule"/>                

            
        <resource uri="http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterLabelRule"/>    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterLabelDecorationRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterLabelDecorationRule"/>               
        <resource uri="http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterModifierRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterModifierRule"/>    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/Module/ParameterOverrideBrowseContext/ParameterSorterRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterSorterRule"/>      
            
	<!-- Sensitivity analysis -->
	    <resource uri="http://www.simantics.org/Sysdyn-0.0/SensitivityAnalysisExperiment/ParameterBrowseContext/ParameterLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.ParameterLabelRule"/>

    </target>    
    
    <target interface="org.simantics.db.layer0.adapter.ActionFactory">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewModuleType"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewModuleTypeAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewEnumeration"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewEnumerationAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewFunction"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewFunctionAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewFunctionLibrary"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewFunctionLibraryAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSharedFunctionLibrary"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSharedFunctionLibraryAction" />   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewExperiment"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewExperimentAction" />   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSimulationPlaybackExperiment"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSimulationPlaybackExperimentAction" />    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewLineChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewLineChartAction" /> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewBarChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewBarChartAction" /> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewPieChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewPieChartAction" />        
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSheet"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSheetAction" />       
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewHistoryData"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewHistoryDataAction" />                                                                                              
    </target>         
    
   <target interface="org.simantics.db.layer0.adapter.DropActionFactory">
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/FunctionDropAction"
            class="org.simantics.sysdyn.ui.browser.actions.drop.FunctionDropAction" />
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/ChartDropAction"
            class="org.simantics.sysdyn.ui.browser.actions.drop.ChartDropAction" />            
   
                    
    </target>     
  
    <target interface="org.simantics.db.layer0.adapter.Remover">
        <type uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleSymbol"
            class="org.simantics.sysdyn.ui.browser.actions.remove.ModuleTypeRemover">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/Sysdyn-0.0/Variable"
            class="org.simantics.sysdyn.ui.actions.SysdynVariableRemover">
            <this />
        </type>
    </target>
    
    
    <target interface="org.simantics.browsing.ui.model.nodetypes.NodeType">
        <baseType uri="http://www.simantics.org/Layer0-0.0/Entity" />
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleSymbolNodeType"
            class="org.simantics.sysdyn.ui.browser.nodeTypes.ModuleSymbolNodeType"
            constructor="create">
            <this/>
        </type>        
     </target>
    
  <!-- PROFILES -->
    <target interface="org.simantics.scenegraph.profile.Style">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/SimulationPlaybackStyle"
            class="org.simantics.sysdyn.ui.elements.profiles.SimulationPlaybackStyle">
        </resource>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/IssueStyle"
            class="org.simantics.sysdyn.ui.elements.profiles.IssueDecorationStyle">
        </resource>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ShadowStyle"
            class="org.simantics.sysdyn.ui.elements.profiles.ShadowStyle">
        </resource>        
    </target>
    
 
    <!--  TODO: currently maps jfree concepts directly to Sysdyn implementations. Sysdyn needs tool specific types for the datasets. -->
    <!--  TODO: AllVariablesOfModel query is run on random Resources; listing all possible types explicitly is cumbersome, we need a better implementation. -->
    <target interface="org.simantics.jfreechart.chart.properties.IAllVariablesOfModel">  
        <type uri="http://www.simantics.org/Sysdyn-1.1/SysdynModel"
            class="org.simantics.sysdyn.ui.trend.AllVariablesOfModel">
            <this />
        </type>  
        <type uri="http://www.simantics.org/JFreeChart-1.0/NumberAxis"
            class="org.simantics.sysdyn.ui.trend.AllVariablesOfModel">
            <this />
        </type>   
        <type uri="http://www.simantics.org/JFreeChart-1.0/Series"
            class="org.simantics.sysdyn.ui.trend.AllVariablesOfModel">
            <this />
        </type>      
        <type uri="http://www.simantics.org/Sysdyn-0.0/SensitivityAnalysisExperiment/Parameter"
            class="org.simantics.sysdyn.ui.trend.AllParametersOfModel">
            <this />
        </type>
    </target> 
       
    <target interface="org.simantics.jfreechart.chart.properties.RangeHandlerFactory">  
        <type uri="http://www.simantics.org/JFreeChart-1.0/Series"
            class="org.simantics.sysdyn.ui.trend.SysdynRangeHandlerFactory">
        </type>    
        <type uri="http://www.simantics.org/Sysdyn-0.0/SensitivityAnalysisExperiment/Parameter"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.SensitivityRangeHandlerFactory">
        </type>
    </target> 
    
    <!--  TODO: currently maps jfree concepts directly to Sysdyn implementations. Sysdyn needs tool specific types for the datasets. -->
     <target interface="org.simantics.jfreechart.chart.IDataset">
        <type uri="http://www.simantics.org/JFreeChart-0.0/XYDataset"
            class="org.simantics.sysdyn.ui.trend.XYDataset">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-0.0/CategoryDataset"
            class="org.simantics.sysdyn.ui.trend.CategoryDataset">
            <graph />
            <this />
        </type>        
        <type uri="http://www.simantics.org/JFreeChart-0.0/PieDataset"
            class="org.simantics.sysdyn.ui.trend.PieDataset">
            <graph />
            <this />
        </type>   
        <type uri="http://www.simantics.org/Sysdyn-0.0/Charts/SensitivityDataset"
            class="org.simantics.sysdyn.ui.trend.SensitivityDataset">
            <graph />
            <this />
        </type>
    </target>
    
	<!-- Sensitivity analysis -->
   <target
        interface="org.simantics.sysdyn.ui.properties.widgets.sensitivity.IDistributionProperties">
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/NormalDistribution"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.NormalDistributionProperties">
            <this />
        </type>	
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/UniformDistribution"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.UniformDistributionProperties">
            <this />
        </type>	
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/Interval"
            class="org.simantics.sysdyn.ui.properties.widgets.sensitivity.IntervalProperties">
            <this />
        </type>
    </target>
    
    <!-- Search -->
	<target interface="org.simantics.scl.runtime.function.Function">
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ModulesSearchFunction"
			class="org.simantics.sysdyn.ui.function.ModulesSearchFunction">
		</resource>
	</target>
    
 </adapters>
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index b375b9eb..ed403bc7 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -183,6 +183,12 @@
                relationship="right"
                relative="org.eclipse.ui.editorss">
          </view>
+         <view
+               id="org.simantics.workbench.search.browser"
+               minimized="false"
+               relationship="stack"
+               relative="org.simantics.browsing.ui.graph.propertyView">
+         </view>
          <!--
          <view
                id="org.simantics.document.workbench.documentViewer"
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
new file mode 100644
index 00000000..d584a70e
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.function;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.simantics.databoard.Bindings;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.common.utils.Logger;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.genericrelation.Dependencies;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.layer0.Layer0;
+import org.simantics.operation.Layer0X;
+import org.simantics.scl.runtime.function.FunctionImpl4;
+import org.simantics.sysdyn.SysdynResource;
+import org.simantics.workbench.search.NamedResource;
+import org.simantics.workbench.search.QueryResult;
+import org.simantics.workbench.search.SearchResult;
+import org.simantics.workbench.search.Searching;
+
+//import fi.vtt.apros.AprosBuiltins;
+import freemarker.template.TemplateException;
+
+/**
+ * modulesSearchFunction:
+ *      (ReadGraph, query : String, maxResults : Integer) -> QueryResult
+ * 
+ * @author Tuukka Lehtonen
+ */
+public class ModulesSearchFunction extends FunctionImpl4<IProgressMonitor, ReadGraph, String, Integer, Collection<SearchResult>> {
+
+    @Override
+    public Collection<SearchResult> apply(IProgressMonitor monitor, ReadGraph graph, String query, Integer maxResults) {
+        try {
+            Collection<Map<String, Object>> results = Searching.performSearch(graph,
+                    Layer0X.getInstance(graph).Dependencies, query, maxResults);
+
+            return generateSearchResults(graph, results);
+        } catch (DatabaseException e) {
+            Logger.defaultLogError(e);
+        }
+        return null;
+    }
+
+    public static final Collection<SearchResult> generateSearchResults(ReadGraph graph,
+            Collection<Map<String, Object>> results) throws DatabaseException {
+    	System.out.println(results.size());
+    	Layer0 L0 = Layer0.getInstance(graph);
+    	SysdynResource SR = SysdynResource.getInstance(graph);
+        DiagramResource DIA = DiagramResource.getInstance(graph);
+
+        Collection<SearchResult> result = new ArrayList<SearchResult>(results.size());
+        Set<Resource> processed = new HashSet<Resource>();
+
+        for (Map<String, Object> r : results) {
+            Resource resource = (Resource) r.get(Dependencies.FIELD_RESOURCE);
+
+            // Ignore non-AprosModules
+            /*if (!graph.isInstanceOf(resource, APROS.AprosModule))
+                continue;
+
+            // Ignore attached default modules.
+            if (graph.hasStatement(resource, APROS.AttachedModule))
+                continue;*/
+
+            // Prevent index corruption from producing duplicate results.
+            if (!processed.add(resource))
+                continue;
+
+            // Prevent diagram elements from being collected into the results.
+            Collection<Resource> typeResources = graph.getTypes(resource);
+            if (typeResources.contains(DIA.Element))
+                continue;
+
+            Resource parent = (Resource) r.get(Dependencies.FIELD_PARENT);
+            String name = (String) r.get(Dependencies.FIELD_NAME);
+
+            SearchResult rst = new SearchResult();
+            rst.resource = NamedResource.of(graph, resource, name);
+            rst.parent = NamedResource.of(graph, parent);
+
+            Collection<Resource> principalTypeResources = graph.getPrincipalTypes(resource);
+            if (!typeResources.isEmpty()) {
+                rst.types = new ArrayList<NamedResource>(typeResources.size());
+                rst.principalTypes = new ArrayList<NamedResource>(principalTypeResources.size());
+                for (Resource t : typeResources) {
+                    String aprosName = graph.getPossibleRelatedValue(t, L0.HasName, Bindings.STRING);
+                    if (aprosName == null)
+                        aprosName = NameUtils.getSafeLabel(graph, t);
+                    NamedResource nr = NamedResource.of(graph, t, aprosName);
+                    rst.types.add(nr);
+                    if (principalTypeResources.contains(t))
+                        rst.principalTypes.add(nr);
+                }
+            }
+
+            result.add(rst);
+        }
+        return result;
+    }
+
+}
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 2664e975..5fd9af0b 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
@@ -49,6 +49,7 @@ import org.simantics.sysdyn.SysdynResource;
 import org.simantics.sysdyn.ui.editor.SysdynEditorNamingService;
 import org.simantics.ui.workbench.IEditorNamingService;
 import org.simantics.utils.FileUtils;
+import org.simantics.workbench.ontology.WorkbenchResource;
 
 public class SysdynProject extends AbstractProjectFeature {
 	private static final String DEFAULT_PERSPECTIVE = "org.simantics.sysdyn.ui.perspective";
@@ -111,12 +112,40 @@ public class SysdynProject extends AbstractProjectFeature {
 			}
 
 
-			VirtualGraphSupport support = session.getService(VirtualGraphSupport.class);
+			final VirtualGraphSupport support = session.getService(VirtualGraphSupport.class);
 
 			support.getWorkspacePersistent("experiments");
 			support.getWorkspacePersistent("profiles");
-			//            support.getWorkspacePersistent("preferences");
+            support.getWorkspacePersistent("preferences");
 			support.getWorkspacePersistent("issues");
+			
+            // Before activating, make sure that the necessary activations have been installed into the project.
+            //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) {