Removed plug-in org.simantics.proconf.ui.workbench and moved its contents into org...

 - 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

diff --git a/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF b/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF
index e74a7fdc9d023ae4fd7ddc6837213ac74b5a2ed3..332d852c758602c4929adf00347db130e85808d5 100644 (file)
--- 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 82655511d41e055357c328d42744690b407c9c2d..e54575c4a661aea5555b85eed9a39cdefcc119cf 100644 (file)
--- a/org.simantics.proconf.g3d.shapeeditor/plugin.xml
+++ b/org.simantics.proconf.g3d.shapeeditor/plugin.xml
@@ -54,15 +54,15 @@
       </menuContribution>\r
    </extension>\r
    <extension\r
-         point="org.simantics.proconf.ui.workbench.resourceEditorAdapter">\r
-      <ResourceEditorDescription\r
+         point="org.simantics.proconf.ui.resourceEditorAdapter">\r
+      <adapterClass\r
             class="org.simantics.proconf.g3d.shapeeditor.handlers.ResourceEditorAdapter1"\r
             id="org.simantics.proconf.shapeeditor.ResourceEditorDescription1">\r
-      </ResourceEditorDescription>\r
-      <ResourceEditorDescription\r
+      </adapterClass>\r
+      <adapterClass\r
             class="org.simantics.proconf.g3d.shapeeditor.handlers.ResourceEditorAdapter3"\r
             id="org.simantics.proconf.shapeeditor.ResourceEditorDescription3">\r
-      </ResourceEditorDescription>\r
+      </adapterClass>\r
    </extension>\r
    <extension\r
          point="org.eclipse.ui.editors">\r
@@ -157,7 +157,7 @@
       </context>\r
    </extension>\r
    <extension\r
-         point="org.simantics.proconf.ui.workbench.perspectiveContextBinding">\r
+         point="org.simantics.proconf.ui.perspectiveContextBinding">\r
       <binding\r
             contextIds="org.simantics.proconf.shapeeditor.csg"\r
             perspectiveId="org.simantics.proconf.shapeeditor.perspectives.csg">\r

diff --git a/org.simantics.proconf.g3d/META-INF/MANIFEST.MF b/org.simantics.proconf.g3d/META-INF/MANIFEST.MF
index 53b8505ffd4a0fb379632fecca888a28e6ab84ce..ae81bc874ef884dc2706a68ab4a1663216fb705d 100644 (file)
--- 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 bb32772c3efda43210552b9fcc4d84190184979a..fc55861e501eb7572035af2e1bd8fbbbf40936fe 100644 (file)
--- a/org.simantics.proconf.g3d/plugin.xml
+++ b/org.simantics.proconf.g3d/plugin.xml
@@ -5,7 +5,7 @@
    <extension\r
          point="org.eclipse.ui.preferencePages">\r
       <page\r
-            category="fi.vtt.proconf.preferences.ProConfPreferencePage"\r
+            category="org.simantics.proconf.preferences"\r
             class="org.simantics.proconf.g3d.preferences.G3DPreferencesPage"\r
             id="fi.vtt.simantics.g3d.page1"\r
             name="3D Preferences">\r

diff --git a/org.simantics.proconf.processeditor/META-INF/MANIFEST.MF b/org.simantics.proconf.processeditor/META-INF/MANIFEST.MF
index bcf51a4fadbbf1a5ea28d67dcc2d2bc4fb3e4372..2c2e6e9d9b3f247c6e3f32da91b8cdf9b7d4c6a9 100644 (file)
--- 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 55bc77f37b22a791066aba4e00dd23b287eaae8e..33501414f567d2ecf68d29ade890904c6cfd1722 100644 (file)
--- a/org.simantics.proconf.processeditor/plugin.xml
+++ b/org.simantics.proconf.processeditor/plugin.xml
@@ -191,19 +191,19 @@
       </menuContribution>\r
    </extension>\r
    <extension\r
-         point="org.simantics.proconf.ui.workbench.resourceEditorAdapter">\r
-      <ResourceEditorDescription\r
+         point="org.simantics.proconf.ui.resourceEditorAdapter">\r
+      <adapterClass\r
             class="fi.vtt.simantics.processeditor.handlers.Plant3DEditorAdapter"\r
             id="org.simantics.proconf.processeditor.ResourceEditorDescription1">\r
-      </ResourceEditorDescription>\r
-      <ResourceEditorDescription\r
+      </adapterClass>\r
+      <adapterClass\r
             class="fi.vtt.simantics.processeditor.handlers.PipelineComponentEditorAdapter"\r
             id="org.simantics.proconf.processeditor.ResourceEditorDescription2">\r
-      </ResourceEditorDescription>\r
-      <ResourceEditorDescription\r
+      </adapterClass>\r
+      <adapterClass\r
             class="fi.vtt.simantics.processeditor.handlers.EquipmentEditorAdapter"\r
             id="org.simantics.proconf.processeditor.ResourceEditorDescription3">\r
-      </ResourceEditorDescription>\r
+      </adapterClass>\r
    </extension>\r
    <extension\r
          point="org.eclipse.ui.perspectives">\r
@@ -248,7 +248,7 @@
       </Geometry>\r
    </extension>\r
    <extension\r
-         point="org.simantics.proconf.ui.workbench.perspectiveContextBinding">\r
+         point="org.simantics.proconf.ui.perspectiveContextBinding">\r
       <binding\r
             contextIds="org.simantics.proconf.processeditor.plantmodelling"\r
             perspectiveId="org.simantics.proconf.processeditor.plantmodelling">\r