From 4c1873fcdb948bfef4e7a298e1e8d4d718f710bc Mon Sep 17 00:00:00 2001
From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Fri, 6 Mar 2020 17:16:42 +0200
Subject: [PATCH] Move global UI bindings to the product plugin

gitlab #101

Change-Id: I83c0e42c400579cd3709b78146a5b07cdeac82d1
---
 .../graph/plant3d_viewpoint.pgraph               |  2 +-
 org.simantics.plant3d.product/.gitignore         |  1 +
 org.simantics.plant3d.product/.project           |  6 ++++++
 .../META-INF/MANIFEST.MF                         |  6 +++++-
 org.simantics.plant3d.product/build.properties   |  3 ++-
 .../graph/plant3d_product.pgraph                 |  5 +++++
 org.simantics.plant3d.product/plugin.xml         | 16 +++++++++++++---
 org.simantics.plant3d/plugin.xml                 | 10 ----------
 8 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 org.simantics.plant3d.product/graph/plant3d_product.pgraph

diff --git a/org.simantics.plant3d.ontology/graph/plant3d_viewpoint.pgraph b/org.simantics.plant3d.ontology/graph/plant3d_viewpoint.pgraph
index 5be0264c..e898991d 100644
--- a/org.simantics.plant3d.ontology/graph/plant3d_viewpoint.pgraph
+++ b/org.simantics.plant3d.ontology/graph/plant3d_viewpoint.pgraph
@@ -40,7 +40,7 @@ IMAGES.Tank : IMAGE.PngImage
     @L0.loadBytes "images/tank.png"
     
 MAC = P3D.P3DActionContext : VP.BrowseContext
-    VP.BrowseContext.IsIncludedIn PROJ.ProjectActionContext
+    // VP.BrowseContext.IsIncludedIn PROJ.ProjectActionContext - This is added in the product plugin
     
     @VP.actionContribution "Plant" L0.Library IMAGES.Factory VP.NewActionCategory P3D.Actions.NewPlant
 
diff --git a/org.simantics.plant3d.product/.gitignore b/org.simantics.plant3d.product/.gitignore
index ae3c1726..e696a218 100644
--- a/org.simantics.plant3d.product/.gitignore
+++ b/org.simantics.plant3d.product/.gitignore
@@ -1 +1,2 @@
 /bin/
+/graph.tg
diff --git a/org.simantics.plant3d.product/.project b/org.simantics.plant3d.product/.project
index 6ef52379..f9bddb1b 100644
--- a/org.simantics.plant3d.product/.project
+++ b/org.simantics.plant3d.product/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.simantics.graph.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
@@ -18,5 +23,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.simantics.graph.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.simantics.plant3d.product/META-INF/MANIFEST.MF b/org.simantics.plant3d.product/META-INF/MANIFEST.MF
index b8e15b91..18b269a2 100644
--- a/org.simantics.plant3d.product/META-INF/MANIFEST.MF
+++ b/org.simantics.plant3d.product/META-INF/MANIFEST.MF
@@ -6,6 +6,10 @@ Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui;bundle-version="3.7.0",
  org.simantics.plant3d;bundle-version="1.0.0",
- org.simantics.project;bundle-version="1.0.1"
+ org.simantics.project;bundle-version="1.0.1",
+ org.simantics.project.ontology;bundle-version="1.2.0",
+ org.simantics.viewpoint.ontology;bundle-version="1.2.0",
+ org.simantics.plant3d.ontology;bundle-version="1.0.0",
+ org.simantics.layer0;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: VTT
diff --git a/org.simantics.plant3d.product/build.properties b/org.simantics.plant3d.product/build.properties
index 122283d1..33770595 100644
--- a/org.simantics.plant3d.product/build.properties
+++ b/org.simantics.plant3d.product/build.properties
@@ -1,4 +1,5 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               splash.bmp
+               splash.bmp,\
+               graph.tg
diff --git a/org.simantics.plant3d.product/graph/plant3d_product.pgraph b/org.simantics.plant3d.product/graph/plant3d_product.pgraph
new file mode 100644
index 00000000..9bbc98db
--- /dev/null
+++ b/org.simantics.plant3d.product/graph/plant3d_product.pgraph
@@ -0,0 +1,5 @@
+VP = <http://www.simantics.org/Viewpoint-1.2>
+PROJ = <http://www.simantics.org/Project-1.2>
+P3D = <http://www.simantics.org/Plant3D-0.1>
+
+P3D.P3DActionContext VP.BrowseContext.IsIncludedIn PROJ.ProjectActionContext
diff --git a/org.simantics.plant3d.product/plugin.xml b/org.simantics.plant3d.product/plugin.xml
index 490a25e1..cde18bec 100644
--- a/org.simantics.plant3d.product/plugin.xml
+++ b/org.simantics.plant3d.product/plugin.xml
@@ -17,7 +17,17 @@
          </property>
       </product>
    </extension>
-
+   <extension
+         point="org.simantics.ui.resourceEditorAdapter">
+      <adapter
+            editorId="org.simantics.plant3d.editor"
+            groupId="org.simantics.plant3dEditor.group"
+            image="platform:/plugin/org.simantics.plant3d/icons/factory.png"
+            label="Plant3D Editor"
+            priority="1"
+            type_uris="http://www.simantics.org/Plant3D-0.1/Plant">
+      </adapter>
+   </extension>
    <extension
          point="org.simantics.project.feature">
       <feature
@@ -35,7 +45,7 @@
          point="org.eclipse.ui.views">
       <view
             class="org.simantics.plant3d.browser.P3DBrowser:browseContext=http://www.simantics.org/CSG-0.1/CSGBrowseContext;browseContext=http://www.simantics.org/Plant3D-0.1/P3DBrowseContext"
-            icon="icons/factory.png"
+            icon="platform:/plugin/org.simantics.plant3d/icons/factory.png"
             id="org.simantics.plant3d.ModelBrowser"
             name="Model Browser"
             restorable="true">
@@ -45,7 +55,7 @@
          point="org.eclipse.ui.perspectives">
       <perspective
             class="org.simantics.plant3d.project.P3DPerspectiveFactory"
-            icon="icons/factory.png"
+            icon="platform:/plugin/org.simantics.plant3d/icons/factory.png"
             id="org.simantics.plant3d.perspective"
             name="Plant3D">
       </perspective>
diff --git a/org.simantics.plant3d/plugin.xml b/org.simantics.plant3d/plugin.xml
index 7d6b9042..8fb207a6 100644
--- a/org.simantics.plant3d/plugin.xml
+++ b/org.simantics.plant3d/plugin.xml
@@ -12,16 +12,6 @@
             name="Plant3D Editor">
       </editor>
    </extension>
-   <extension
-         point="org.simantics.ui.resourceEditorAdapter">
-      <adapter
-            editorId="org.simantics.plant3d.editor"
-            image="icons/factory.png"
-            label="Plant3D Editor"
-            priority="1"
-            type_uris="http://www.simantics.org/Plant3D-0.1/Plant">
-      </adapter>
-   </extension>
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-- 
2.47.1