From 34ad96ca09c4a1c6b6eee7af3af3967ca6b02047 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 30 Aug 2019 00:21:15 +0300
Subject: [PATCH] Move plant3d test-product specific contributions to product
 plugin.

This prevents polluting any products including the plant3d modeling
feature with unwanted UI contributions.

gitlab #29

Change-Id: I28ceb91db0d12da19afcd41789cf94397142bd06
---
 .../META-INF/MANIFEST.MF                      |  4 +-
 org.simantics.plant3d.product/plugin.xml      | 99 +++++++++++++++++++
 .../.settings/org.eclipse.jdt.core.prefs      |  6 +-
 org.simantics.plant3d/plugin.xml              | 97 ------------------
 4 files changed, 105 insertions(+), 101 deletions(-)

diff --git a/org.simantics.plant3d.product/META-INF/MANIFEST.MF b/org.simantics.plant3d.product/META-INF/MANIFEST.MF
index 4730f353..199456f5 100644
--- a/org.simantics.plant3d.product/META-INF/MANIFEST.MF
+++ b/org.simantics.plant3d.product/META-INF/MANIFEST.MF
@@ -5,7 +5,9 @@ Bundle-SymbolicName: org.simantics.plant3d.product;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.plant3d.product.Activator
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui;bundle-version="3.7.0"
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.simantics.plant3d;bundle-version="1.0.0",
+ org.simantics.project;bundle-version="1.0.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: VTT
diff --git a/org.simantics.plant3d.product/plugin.xml b/org.simantics.plant3d.product/plugin.xml
index c7215caf..490a25e1 100644
--- a/org.simantics.plant3d.product/plugin.xml
+++ b/org.simantics.plant3d.product/plugin.xml
@@ -18,4 +18,103 @@
       </product>
    </extension>
 
+   <extension
+         point="org.simantics.project.feature">
+      <feature
+            class="org.simantics.plant3d.project.P3DProjectFeature"
+            id="org.simantics.plant3d.project.feature"
+            label="Plant3D Project"
+            published="true">
+         <installGroup
+               id="org.simantics.plant3d.installGroup"
+               version="[1.0.0,2.0.0)">
+         </installGroup>
+      </feature>
+   </extension>
+   <extension
+         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"
+            id="org.simantics.plant3d.ModelBrowser"
+            name="Model Browser"
+            restorable="true">
+      </view>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            class="org.simantics.plant3d.project.P3DPerspectiveFactory"
+            icon="icons/factory.png"
+            id="org.simantics.plant3d.perspective"
+            name="Plant3D">
+      </perspective>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="org.simantics.plant3d.perspective">
+         <view
+               id="org.simantics.plant3d.ModelBrowser"
+               minimized="false"
+               ratio="0.3"
+               relationship="left"
+               relative="org.eclipse.ui.editorss">
+         </view>
+         <view
+               id="org.simantics.browsing.ui.graph.propertyView"
+               minimized="false"
+               ratio="0.7"
+               relationship="bottom"
+               relative="org.eclipse.ui.editorss"
+               visible="true">
+         </view>
+         <view
+               id="org.simantics.browsing.ui.graph.propertyView:*"
+               minimized="false"
+               relationship="stack"
+               relative="org.simantics.browsing.ui.graph.propertyView"
+               visible="false">
+         </view>
+         <view
+               id="org.simantics.browsing.ui.graph.propertyViewPinned:*"
+               minimized="false"
+               relationship="stack"
+               relative="org.simantics.browsing.ui.graph.propertyView"
+               visible="false">
+         </view>
+         <view
+               id="org.eclipse.ui.views.ContentOutline"
+               minimized="false"
+               ratio="0.8"
+               relationship="right"
+               relative="org.eclipse.ui.editorss"
+               visible="true">
+         </view>
+      </perspectiveExtension>
+   </extension>
+   <extension
+         point="org.simantics.ui.perspectiveContextBinding">
+      <binding
+            contextIds="org.simantics.plant3d.context"
+            perspectiveId="org.simantics.plant3d.perspective">
+      </binding>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:#FileNewMenu">
+         <command
+               commandId="org.simantics.plant3d.newPlant"
+               label="New Plant"
+               style="push">
+         </command>
+         <command
+               commandId="org.simantics.plant3d.newCSGModel"
+               label="New CSG Model"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
 </plugin>
diff --git a/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs b/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs
index c537b630..0c68a61d 100644
--- a/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.plant3d/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.simantics.plant3d/plugin.xml b/org.simantics.plant3d/plugin.xml
index 29f03e32..fe2eb710 100644
--- a/org.simantics.plant3d/plugin.xml
+++ b/org.simantics.plant3d/plugin.xml
@@ -21,84 +21,8 @@
             type_uris="http://www.simantics.org/Plant3D-0.1/Plant">
       </adapter>
    </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            class="org.simantics.plant3d.project.P3DPerspectiveFactory"
-            icon="icons/factory.png"
-            id="org.simantics.plant3d.perspective"
-            name="Plant3D">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.simantics.plant3d.perspective">
-         <view
-               id="org.simantics.plant3d.ModelBrowser"
-               minimized="false"
-               ratio="0.3"
-               relationship="left"
-               relative="org.eclipse.ui.editorss">
-         </view>
-         <view
-               id="org.simantics.browsing.ui.graph.propertyView"
-               minimized="false"
-               ratio="0.7"
-               relationship="bottom"
-               relative="org.eclipse.ui.editorss"
-               visible="true">
-         </view>
-         <view
-               id="org.simantics.browsing.ui.graph.propertyView:*"
-               minimized="false"
-               relationship="stack"
-               relative="org.simantics.browsing.ui.graph.propertyView"
-               visible="false">
-         </view>
-         <view
-               id="org.simantics.browsing.ui.graph.propertyViewPinned:*"
-               minimized="false"
-               relationship="stack"
-               relative="org.simantics.browsing.ui.graph.propertyView"
-               visible="false">
-         </view>
-         <view
-               id="org.eclipse.ui.views.ContentOutline"
-               minimized="false"
-               ratio="0.8"
-               relationship="right"
-               relative="org.eclipse.ui.editorss"
-               visible="true">
-         </view>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         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"
-            id="org.simantics.plant3d.ModelBrowser"
-            name="Model Browser"
-            restorable="true">
-      </view>
-   </extension>
    <extension
          point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="menu:#FileNewMenu">
-         <command
-               commandId="org.simantics.plant3d.newPlant"
-               label="New Plant"
-               style="push">
-         </command>
-         <command
-               commandId="org.simantics.plant3d.newCSGModel"
-               label="New CSG Model"
-               style="push">
-         </command>
-      </menuContribution>
       <menuContribution
             allPopups="false"
             locationURI="toolbar:org.eclipse.ui.main.toolbar">
@@ -233,19 +157,6 @@
             commandId="org.simantics.plant3d.newCSGModel">
       </handler>
    </extension>
-   <extension
-         point="org.simantics.project.feature">
-      <feature
-            class="org.simantics.plant3d.project.P3DProjectFeature"
-            id="org.simantics.plant3d.project.feature"
-            label="Plant3D Project"
-            published="true">
-         <installGroup
-               id="org.simantics.plant3d.installGroup"
-               version="[1.0.0,2.0.0)">
-         </installGroup>
-      </feature>
-   </extension>
    <extension
          point="org.eclipse.ui.contexts">
       <context
@@ -253,13 +164,6 @@
             name="Plant3D Context">
       </context>
    </extension>
-   <extension
-         point="org.simantics.ui.perspectiveContextBinding">
-      <binding
-            contextIds="org.simantics.plant3d.context"
-            perspectiveId="org.simantics.plant3d.perspective">
-      </binding>
-   </extension>
    <extension
          point="org.simantics.browsing.ui.common.selectionProcessorBinding">
       <binding
@@ -269,5 +173,4 @@
          </implementation>
       </binding>
    </extension>
-
 </plugin>
-- 
2.47.1