Datatools plugins cannot depend on Teiid UI plugins

* The plugins prefixed with org.teiid.datatools are part of a feature that
  is not dependent on other teiid features. In fact, this feature is
  depended on by all the other teiid features.

* Moves the EnableQueryPlanPreferenceContributor into the dpq UI plugin
  along with the other preferences. This is not perfect since the query
  plans are dealt with mostly in the datatools.connectivity plugins.
  However, it only sets a global preference so is not fatal and solves the
  circular dependency that has to be removed.

plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF

@@ -28,8 +28,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.103.0,4.0.0)",
  org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.2,2.0.0)",
  org.eclipse.datatools.sqltools.routineeditor;bundle-version="[1.0.0,2.0.0)",
  org.teiid.designer.spi;bundle-version="[8.1.0,9.0.0)",
- org.teiid.designer.ui;bundle-version="[8.2.0,9.0.0)",
- org.teiid.designer.ui.common;bundle-version="[8.2.0,9.0.0)",
  org.jboss.tools.locus.sf.saxon;bundle-version="[9.2.1,10.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

plugins/org.teiid.datatools.connectivity.ui/build.xml

@@ -2,13 +2,10 @@
 
 <!--
 ==
-== Script to resolve the plugin's lib directory dependencies
-== and generate the SQLParser sources using javacc
-==
-== Note. This has to build both the target platform and the
-==       spi plugin in order to satisfy the dependencies of
-==       this plugin (even though we are not actually
-==       compiling it!)
+== Script to generate the execution plan data zip
+== from the ExecPlanData directory. This avoids the
+== need of storing a zip in the codebase but is
+== more efficient at extracting during runtime.
 ==
 -->
 

plugins/org.teiid.datatools.connectivity.ui/plugin.xml

@@ -94,15 +94,4 @@
             type="org.teiid.datatools.models.teiidsqlmodel.Document">
       </contributor>
    </extension>
-
-<!-- Preferences -->
-  <extension point="org.teiid.designer.ui.generalPreferenceContributor">
-      <!-- Enable QueryPlans Preference -->
-      <preference
-            id="enableQueryPlanPreferenceContributor"
-            categoryId="dqpUiPreferenceCategory"
-            class="org.teiid.datatools.connectivity.ui.preferences.EnableQueryPlanPreferenceContributor">
-      </preference>
-  </extension>
-
 </plugin>

plugins/org.teiid.designer.dqp.ui/plugin.xml

@@ -52,6 +52,12 @@
             categoryId="dqpUiPreferenceCategory"
             class="org.teiid.designer.runtime.ui.preferences.TeiidImporterTimeoutPreferenceContributor">
       </preference>
+      <!-- Enable QueryPlans Preference -->
+      <preference
+            id="enableQueryPlanPreferenceContributor"
+            categoryId="dqpUiPreferenceCategory"
+            class="org.teiid.designer.runtime.ui.preferences.EnableQueryPlanPreferenceContributor">
+      </preference>
   </extension>
 <!-- Actions contributed to the object/model generation -->
    <extension
@@ -334,10 +340,6 @@
             name="%editServerCommand.label">
       </command>
    </extension>
-   <extension point="org.eclipse.ui.elementFactories">
-  <factory id="org.teiid.designer.runtime.ui.server.editor.input.factory"
-    class="org.teiid.designer.runtime.ui.server.editor.TeiidServerEditorInputFactory"/>
-</extension>
    <extension
          point="org.eclipse.core.runtime.adapters">
       <factory

plugins/org.teiid.datatools.connectivity.ui/src/org/teiid/datatools/connectivity/ui/preferences/EnableQueryPlanPreferenceContributor.java → plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/preferences/EnableQueryPlanPreferenceContributor.java

@@ -5,10 +5,9 @@
  *
  * See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
  */
-package org.teiid.datatools.connectivity.ui.preferences;
+package org.teiid.designer.runtime.ui.preferences;
 
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -62,7 +61,7 @@ public String getName() {
 
     /**
      * Obtains the <code>IEclipsePreferences</code> where this preference is being persisted.
-     * 
+     *
      * @return the preferences
      */
     private IEclipsePreferences getPreferences() {
@@ -133,14 +132,6 @@ public void refresh() {
         this.chkEnabled.setSelection(enable);
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.teiid.designer.ui.preferences.IGeneralPreferencePageContributor#setPreferencePage(org.eclipse.jface.preference.PreferencePage)
-     */
-    public void setPreferencePage( PreferencePage preferencePage ) {
-    }
-
     /**
      * @see org.teiid.designer.ui.preferences.IGeneralPreferencePageContributor#setWorkbench(org.eclipse.ui.IWorkbench)
      * @since 5.0