From 353b632fcd5c487be4d08c030d08f8c9d43753b5 Mon Sep 17 00:00:00 2001
From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Sun, 28 Sep 2008 08:59:37 +0000
Subject: [PATCH] Removed plug-in org.simantics.proconf.ui.workbench and moved
 its contents into org.simantics.proconf.ui.

 - There was no clear reason for the ui.workbench plug-in to exist. There is really no point in creating separate plug-ins unless there is a real need - useless separation of concerns tends to bloat plug-in dependency chains and generally make code management harder.
 - Removed almost all dependencies on the plug-in, but if you still run across any, just remove them and use org.simantics.proconf.ui instead.
 - Note that also the 3 extension points in org.simantics.proconf.ui.workbench were moved to org.simantics.proconf.ui which means your plugin.xml's may need fixing - just remove the .workbench. The extensions points are:
  - perspectiveBars
  - perspectiveContextBinding
  - resourceEditorAdapter

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/dev@6832 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 .../META-INF/MANIFEST.MF                         |  1 -
 org.simantics.proconf.g3d.shapeeditor/plugin.xml | 12 ++++++------
 org.simantics.proconf.g3d/META-INF/MANIFEST.MF   |  1 -
 org.simantics.proconf.g3d/plugin.xml             |  2 +-
 .../META-INF/MANIFEST.MF                         |  1 -
 org.simantics.proconf.processeditor/plugin.xml   | 16 ++++++++--------
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF b/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF
index e74a7fdc..332d852c 100644
--- a/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF
+++ b/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.utils,
  org.simantics.proconf.g3d.occ,
  org.simantics.proconf.ui,
- org.simantics.proconf.ui.workbench,
  org.simantics.animation,
  org.simantics.proconf.ode,
  org.simantics.utils.ui,
diff --git a/org.simantics.proconf.g3d.shapeeditor/plugin.xml b/org.simantics.proconf.g3d.shapeeditor/plugin.xml
index 82655511..e54575c4 100644
--- a/org.simantics.proconf.g3d.shapeeditor/plugin.xml
+++ b/org.simantics.proconf.g3d.shapeeditor/plugin.xml
@@ -54,15 +54,15 @@
       </menuContribution>
    </extension>
    <extension
-         point="org.simantics.proconf.ui.workbench.resourceEditorAdapter">
-      <ResourceEditorDescription
+         point="org.simantics.proconf.ui.resourceEditorAdapter">
+      <adapterClass
             class="org.simantics.proconf.g3d.shapeeditor.handlers.ResourceEditorAdapter1"
             id="org.simantics.proconf.shapeeditor.ResourceEditorDescription1">
-      </ResourceEditorDescription>
-      <ResourceEditorDescription
+      </adapterClass>
+      <adapterClass
             class="org.simantics.proconf.g3d.shapeeditor.handlers.ResourceEditorAdapter3"
             id="org.simantics.proconf.shapeeditor.ResourceEditorDescription3">
-      </ResourceEditorDescription>
+      </adapterClass>
    </extension>
    <extension
          point="org.eclipse.ui.editors">
@@ -157,7 +157,7 @@
       </context>
    </extension>
    <extension
-         point="org.simantics.proconf.ui.workbench.perspectiveContextBinding">
+         point="org.simantics.proconf.ui.perspectiveContextBinding">
       <binding
             contextIds="org.simantics.proconf.shapeeditor.csg"
             perspectiveId="org.simantics.proconf.shapeeditor.perspectives.csg">
diff --git a/org.simantics.proconf.g3d/META-INF/MANIFEST.MF b/org.simantics.proconf.g3d/META-INF/MANIFEST.MF
index 53b8505f..ae81bc87 100644
--- a/org.simantics.proconf.g3d/META-INF/MANIFEST.MF
+++ b/org.simantics.proconf.g3d/META-INF/MANIFEST.MF
@@ -20,7 +20,6 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.utils.datastructures,
  org.simantics.utils.ui,
  org.simantics.proconf.ui,
- org.simantics.proconf.ui.workbench,
  org.simantics.equation,
  org.simantics.proconf.browsing,
  org.eclipse.ui.forms,
diff --git a/org.simantics.proconf.g3d/plugin.xml b/org.simantics.proconf.g3d/plugin.xml
index bb32772c..fc55861e 100644
--- a/org.simantics.proconf.g3d/plugin.xml
+++ b/org.simantics.proconf.g3d/plugin.xml
@@ -5,7 +5,7 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            category="fi.vtt.proconf.preferences.ProConfPreferencePage"
+            category="org.simantics.proconf.preferences"
             class="org.simantics.proconf.g3d.preferences.G3DPreferencesPage"
             id="fi.vtt.simantics.g3d.page1"
             name="3D Preferences">
diff --git a/org.simantics.proconf.processeditor/META-INF/MANIFEST.MF b/org.simantics.proconf.processeditor/META-INF/MANIFEST.MF
index bcf51a4f..2c2e6e9d 100644
--- a/org.simantics.proconf.processeditor/META-INF/MANIFEST.MF
+++ b/org.simantics.proconf.processeditor/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.utils,
  org.simantics.utils.datastructures,
  javax.vecmath,
- org.simantics.proconf.ui.workbench,
  org.simantics.proconf.ode,
  org.simantics.proconf.browsing,
  org.simantics.utils.ui,
diff --git a/org.simantics.proconf.processeditor/plugin.xml b/org.simantics.proconf.processeditor/plugin.xml
index 55bc77f3..33501414 100644
--- a/org.simantics.proconf.processeditor/plugin.xml
+++ b/org.simantics.proconf.processeditor/plugin.xml
@@ -191,19 +191,19 @@
       </menuContribution>
    </extension>
    <extension
-         point="org.simantics.proconf.ui.workbench.resourceEditorAdapter">
-      <ResourceEditorDescription
+         point="org.simantics.proconf.ui.resourceEditorAdapter">
+      <adapterClass
             class="fi.vtt.simantics.processeditor.handlers.Plant3DEditorAdapter"
             id="org.simantics.proconf.processeditor.ResourceEditorDescription1">
-      </ResourceEditorDescription>
-      <ResourceEditorDescription
+      </adapterClass>
+      <adapterClass
             class="fi.vtt.simantics.processeditor.handlers.PipelineComponentEditorAdapter"
             id="org.simantics.proconf.processeditor.ResourceEditorDescription2">
-      </ResourceEditorDescription>
-      <ResourceEditorDescription
+      </adapterClass>
+      <adapterClass
             class="fi.vtt.simantics.processeditor.handlers.EquipmentEditorAdapter"
             id="org.simantics.proconf.processeditor.ResourceEditorDescription3">
-      </ResourceEditorDescription>
+      </adapterClass>
    </extension>
    <extension
          point="org.eclipse.ui.perspectives">
@@ -248,7 +248,7 @@
       </Geometry>
    </extension>
    <extension
-         point="org.simantics.proconf.ui.workbench.perspectiveContextBinding">
+         point="org.simantics.proconf.ui.perspectiveContextBinding">
       <binding
             contextIds="org.simantics.proconf.processeditor.plantmodelling"
             perspectiveId="org.simantics.proconf.processeditor.plantmodelling">
-- 
2.47.1