From: akallio <akallio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 29 Jun 2011 15:31:50 +0000 (+0000)
Subject: modelbrowser2 enabled
X-Git-Tag: simantics-1.5~80
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=fcb66d4904025d07f0f06e7959ee51423609e913;p=simantics%2Fsysdyn.git

modelbrowser2 enabled

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

diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 3428e820..7f8b35c6 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -27,7 +27,7 @@ SYSDYN.SharedModuleOntolofgy <T L0.Ontology
 // Model
 //#####################################################################    
 
-SYSDYN.SysdynModel <T SIMU.Model
+SYSDYN.SysdynModel <T MOD.StructuralModel
     // TODO [SIMU.HasConfiguration all SYSDYN.Configuration]
     @L0.assert SYSDYN.HasStartTime 0.0
     @L0.assert SYSDYN.HasStopTime 10.0
diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph
new file mode 100644
index 00000000..bc1dedbf
--- /dev/null
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph
@@ -0,0 +1,27 @@
+L0 = <http://www.simantics.org/Layer0-1.0>
+VP = <http://www.simantics.org/Viewpoint-1.0>
+SIMU = <http://www.simantics.org/Simulation-1.0>
+PROJECT = <http://www.simantics.org/Project-1.0>
+IMAGE = <http://www.simantics.org/Image-2.0>
+ACT = <http://www.simantics.org/Action-1.0>
+MOD = <http://www.simantics.org/Modeling-1.0>
+STR = <http://www.simantics.org/Structural-1.0>
+SYSDYN = <http://www.simantics.org/Sysdyn-1.0>
+
+SBC = SYSDYN.ProjectBrowseContext : VP.BrowseContext
+SAC = SYSDYN.ProjectActionContext : VP.BrowseContext
+
+MBC = MOD.ModelingBrowseContext : VP.BrowseContext
+    VP.BrowseContext.IsIncludedIn PROJECT.ProjectBrowseContext
+MAC = MOD.ModelingActionContext : VP.BrowseContext
+    VP.BrowseContext.IsIncludedIn PROJECT.ProjectActionContext
+
+//dymmy moduleslibrary to make this easier
+SYSDYN.ModulesLibrary <T L0.Library
+
+MBC
+    @VP.relationChildRule      MOD.StructuralModel      L0.ConsistsOf      SYSDYN.ModulesLibrary
+    VP.BrowseContext.HasChildContribution _ : VP.ChildContribution
+        VP.ChildContribution.HasParentNodeType SYSDYN.ModulesLibrary
+        VP.ChildContribution.HasChildNodeType L0.Entity
+        VP.ChildContribution.HasRule SBC.ModuleTypeChildRule : VP.ChildRule
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 70727806..ed95e058 100644
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -39,7 +39,8 @@ Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.diagram.ontology;bundle-version="1.0.0",
  org.simantics.graph;bundle-version="1.0.2",
  org.simantics.graph.db;bundle-version="1.0.0",
- org.simantics.structural.ui;bundle-version="1.1.1"
+ org.simantics.structural.ui;bundle-version="1.1.1",
+ org.simantics.browsing.ui.model;bundle-version="1.0.0"
 Bundle-Activator: org.simantics.sysdyn.ui.Activator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.sysdyn.ui.browser.nodes
diff --git a/org.simantics.sysdyn.ui/adapters.xml b/org.simantics.sysdyn.ui/adapters.xml
index b3e7e606..6db4046b 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-1.0/Module"
			class="org.simantics.structural2.realization.StructuralRealization">
			<this />
		</type>
	</target>

<!-- 
	<target interface="org.simantics.db.layer0.variable.Variable">
		<type uri="http://www.simantics.org/Sysdyn-1.0/HistoryRealization"
			class="org.simantics.sysdyn.ui.project.HistoryVariable" >
			<this />
		</type>
		<type uri="http://www.simantics.org/Sysdyn-1.0/DefaultRealization"
			class="org.simantics.sysdyn.ui.project.DefaultVariable" >
			<this />
		</type>
	</target>
 -->

	<target interface="org.simantics.layer0.utils.triggers.ITrigger">
	<type uri = "http://www.simantics.org/Sysdyn-1.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-1.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-1.0/SysdynModel"
			class="org.simantics.sysdyn.ui.browser.nodes.ModelNode">
			<this />
		</type>

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

		<type
			uri="http://www.simantics.org/Simulation-1.0/Experiment"
			class="org.simantics.sysdyn.ui.browser.nodes.ExperimentNode">
			<this />
		</type>
		
		<type
			uri="http://www.simantics.org/Sysdyn-1.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-1.0/ConfigurationDiagram"
			adapterClass="org.simantics.sysdyn.ui.elements2.ConfigurationDiagramClassAdapter" />
	</target>

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

		<type uri="http://www.simantics.org/Sysdyn-1.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements2.StockFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements2.ModuleFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements2.ValveFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements2.AuxiliaryFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements2.CloudFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements2.InputFactory" />			
	</target>
	
	<!-- Sysdyn connections -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<!-- Edges -->
		<resource uri="http://www.simantics.org/Sysdyn-1.0/FlowConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.FlowEdgeFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-1.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/FlowConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.FlowEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyEdgeFactory" />
		<!-- : SYSDYN.Connection-->
		<type uri="http://www.simantics.org/Sysdyn-1.0/FlowConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.FlowConnectionFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyConnectionFactory" />
	</target>
	
	<target interface="org.simantics.g2d.connection.EdgeVisualsConfigurer">
	  <baseType uri="http://www.simantics.org/Diagram-2.0/HasConnector" />
	  <resource uri="http://www.simantics.org/Diagram-2.0/HasPlainConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>none 0</string>
	  </resource>
	  <resource uri="http://www.simantics.org/Diagram-2.0/HasArrowConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>fill 1</string>
	  </resource>
	</target>
	
+<adapters>

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

<!-- 
	<target interface="org.simantics.db.layer0.variable.Variable">
		<type uri="http://www.simantics.org/Sysdyn-1.0/HistoryRealization"
			class="org.simantics.sysdyn.ui.project.HistoryVariable" >
			<this />
		</type>
		<type uri="http://www.simantics.org/Sysdyn-1.0/DefaultRealization"
			class="org.simantics.sysdyn.ui.project.DefaultVariable" >
			<this />
		</type>
	</target>
 -->

	<target interface="org.simantics.layer0.utils.triggers.ITrigger">
	<type uri = "http://www.simantics.org/Sysdyn-1.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-1.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-1.0/SysdynModel"
			class="org.simantics.sysdyn.ui.browser.nodes.ModelNode">
			<this />
		</type>

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

		<type
			uri="http://www.simantics.org/Simulation-1.0/Experiment"
			class="org.simantics.sysdyn.ui.browser.nodes.ExperimentNode">
			<this />
		</type>
		
		<type
			uri="http://www.simantics.org/Sysdyn-1.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-1.0/ConfigurationDiagram"
			adapterClass="org.simantics.sysdyn.ui.elements2.ConfigurationDiagramClassAdapter" />
	</target>

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

		<type uri="http://www.simantics.org/Sysdyn-1.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements2.StockFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements2.ModuleFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements2.ValveFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements2.AuxiliaryFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements2.CloudFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements2.InputFactory" />			
	</target>
	
	<!-- Sysdyn connections -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<!-- Edges -->
		<resource uri="http://www.simantics.org/Sysdyn-1.0/FlowConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.FlowEdgeFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-1.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/FlowConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.FlowEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyEdgeFactory" />
		<!-- : SYSDYN.Connection-->
		<type uri="http://www.simantics.org/Sysdyn-1.0/FlowConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.FlowConnectionFactory" />
		<type uri="http://www.simantics.org/Sysdyn-1.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyConnectionFactory" />
	</target>
	
	<target interface="org.simantics.g2d.connection.EdgeVisualsConfigurer">
	  <baseType uri="http://www.simantics.org/Diagram-2.0/HasConnector" />
	  <resource uri="http://www.simantics.org/Diagram-2.0/HasPlainConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>none 0</string>
	  </resource>
	  <resource uri="http://www.simantics.org/Diagram-2.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-1.0/ProjectBrowseContext/ModuleTypeChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleTypeChildRule"/>
    </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 cf30c2d7..f8db234d 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -144,6 +144,12 @@
                relationship="left"
                relative="org.eclipse.ui.editorss">
          </view>
+         <view
+               id="org.simantics.structural.ui.modelBrowser2"
+               minimized="false"
+               relationship="stack"
+               relative="org.simantics.sysdyn.ui.browser">
+         </view>
          <view
                id="org.simantics.diagram.symbollibrary"
                minimized="false"
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/childrules/ModuleTypeChildRule.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/childrules/ModuleTypeChildRule.java
new file mode 100644
index 00000000..7b5d7646
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/childrules/ModuleTypeChildRule.java
@@ -0,0 +1,57 @@
+package org.simantics.sysdyn.ui.browser.childrules;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.simantics.browsing.ui.model.children.ChildRule;
+import org.simantics.db.ReadGraph;
+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.modeling.ModelingResources;
+import org.simantics.structural.stubs.StructuralResource2;
+import org.simantics.sysdyn.SysdynResource;
+
+
+public class ModuleTypeChildRule implements ChildRule {
+
+	@Override
+	public boolean isCompatible(Class<?> contentType) {
+		return contentType.equals(Resource.class);
+	}
+
+	@Override
+	public Collection<?> getChildren(ReadGraph graph, Object parent)
+			throws DatabaseException {
+
+    	ArrayList<Resource> children = new ArrayList<Resource>();
+    	
+		if(!(parent instanceof Resource)) {
+			return children;
+		}
+		
+		Layer0 l0 = Layer0.getInstance(graph);
+		StructuralResource2 st = StructuralResource2.getInstance(graph);
+
+		Resource modulelibrary = (Resource)parent;
+		
+		Resource model = graph.getSingleObject(modulelibrary, l0.PartOf);
+		
+        for(Resource r : graph.syncRequest(new ObjectsWithType(model, l0.ConsistsOf, st.ComponentType))) {
+        	if(graph.isInheritedFrom(r, SysdynResource.getInstance(graph).Module)) {
+        		Resource symbol = graph.getPossibleObject(r,ModelingResources.getInstance(graph).ComponentTypeToSymbol);
+        		children.add(symbol);
+        	}
+        }
+		
+		return children;
+	}
+
+	@Override
+	public Collection<?> getParents(ReadGraph graph, Object child)
+			throws DatabaseException {
+		return new ArrayList<Resource>();
+	}
+
+}
\ No newline at end of file
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 657a8ff1..3f6cde47 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
@@ -153,6 +153,11 @@ public class SysdynProject extends AbstractProjectFeature {
                         l0.HasLabel, "Experiment",
                         l0.HasReportFactory, report,
                         l0.PartOf, model);
+                
+                //model browser2
+                Resource moduleslibrary = g.newResource();
+                g.claim(moduleslibrary, l0.InstanceOf, sr.ModulesLibrary);
+                g.claim(model, l0.ConsistsOf, moduleslibrary);
 
                 ProjectResource PROJ = ProjectResource.getInstance(g);
                 for(Resource dep : g.getObjects(library, l0.IsLinkedTo)) {