From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 9 Sep 2014 05:08:08 +0000 (+0000)
Subject: Show other models (workroom) also in sysdyn browser
X-Git-Tag: v1.29.0~185
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=78fbfb0c1c7cd63506f6ab8d747c96a846f444ab;p=simantics%2Fsysdyn.git

Show other models (workroom) also in sysdyn browser
refs #5280

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

diff --git a/org.simantics.sysdyn.ui/adapters.xml b/org.simantics.sysdyn.ui/adapters.xml
index 517bc7e2..26ca56a7 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" />			
		<resource uri="http://www.simantics.org/Sysdyn-0.0/LoopSymbol"
			class="org.simantics.sysdyn.ui.elements.LoopFactory" />			

		<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" />	
		<type uri="http://www.simantics.org/Sysdyn-0.0/LoopSymbol"
			class="org.simantics.sysdyn.ui.elements.LoopFactory" />	
	</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>

	<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/Simulation-0.0/Model"
			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/Simulation-0.0/Model"
			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" />			
		<resource uri="http://www.simantics.org/Sysdyn-0.0/LoopSymbol"
			class="org.simantics.sysdyn.ui.elements.LoopFactory" />			

		<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" />	
		<type uri="http://www.simantics.org/Sysdyn-0.0/LoopSymbol"
			class="org.simantics.sysdyn.ui.elements.LoopFactory" />	
	</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/src/org/simantics/sysdyn/ui/browser/contributions/Project.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Project.java
index 0d381be5..06105db3 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Project.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Project.java
@@ -24,7 +24,7 @@ import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.layer0.Layer0;
 import org.simantics.project.ontology.ProjectResource;
-import org.simantics.sysdyn.SysdynResource;
+import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.sysdyn.ui.browser.nodes.SharedOntologyNode;
 
 public class Project extends ViewpointContributor<Resource> {
@@ -36,8 +36,8 @@ public class Project extends ViewpointContributor<Resource> {
 
         ArrayList<AbstractNode<Resource>> result = new ArrayList<AbstractNode<Resource>>();
         Layer0 l0 = Layer0.getInstance(graph);
-        SysdynResource sr = SysdynResource.getInstance(graph);
-        for(Resource r : graph.syncRequest(new ObjectsWithType(project, l0.ConsistsOf, sr.SysdynModel))) {
+        SimulationResource SIMU = SimulationResource.getInstance(graph);
+        for(Resource r : graph.syncRequest(new ObjectsWithType(project, l0.ConsistsOf, SIMU.Model))) {
             try {
                 result.add(graph.adapt(r, AbstractNode.class));
             } catch(DatabaseException e) {
@@ -49,7 +49,7 @@ public class Project extends ViewpointContributor<Resource> {
         if(!graph.isInstanceOf(project, PROJ.Project)) return Collections.emptyList();
         Collection<Resource> ontologies = Simantics.applySCL("Simantics/SharedOntologies", "traverseSharedOntologies", graph, graph.getRootLibrary());
         for(Resource o : ontologies) {
-        	if(!graph.isImmutable(o))
+//        	if(!graph.isImmutable(o))
         		result.add(new SharedOntologyNode(o));
         }
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/SysdynProject.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/SysdynProject.java
index 91c46b6a..ce71ad29 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/SysdynProject.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/SysdynProject.java
@@ -9,8 +9,8 @@ import org.simantics.db.Resource;
 import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.layer0.Layer0;
+import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.structural.ui.modelBrowser.nodes.AbstractNode;
-import org.simantics.sysdyn.SysdynResource;
 
 public class SysdynProject  extends ViewpointContributor<Resource> {
 
@@ -20,7 +20,7 @@ public class SysdynProject  extends ViewpointContributor<Resource> {
 
         ArrayList<AbstractNode> result = new ArrayList<AbstractNode>();
         Layer0 L0 = Layer0.getInstance(graph);
-        for(Resource r : graph.syncRequest(new ObjectsWithType(project, L0.ConsistsOf, SysdynResource.getInstance(graph).SysdynModel))) {
+        for(Resource r : graph.syncRequest(new ObjectsWithType(project, L0.ConsistsOf, SimulationResource.getInstance(graph).Model))) {
             try {
                 result.add(graph.adapt(r, AbstractNode.class));
             } catch(DatabaseException e) {