refactor: Cleanup dependencies for improved modularity

10 files changed, 9 insertions, 133 deletions

diff --git a/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF
index fe1d65d3edd..fd1a5e5d753 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.jdk.core/META-INF/MANIFEST.MF
@@ -30,7 +30,4 @@ Export-Package: org.eclipse.osee.framework.jdk.core.collection.tree,
  org.eclipse.osee.framework.jdk.core.validate
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.apache.commons.codec.binary,
- org.apache.commons.httpclient,
- org.apache.commons.httpclient.methods,
- org.apache.commons.httpclient.params,
  org.apache.xml.serialize;version="2.9.0"
diff --git a/plugins/org.eclipse.osee.framework.jini/.classpath b/plugins/org.eclipse.osee.framework.jini/.classpath
index 16d067f284a..ad32c83a788 100644
--- a/plugins/org.eclipse.osee.framework.jini/.classpath
+++ b/plugins/org.eclipse.osee.framework.jini/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.osee.framework.ui.swt/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.swt/META-INF/MANIFEST.MF
index 6ecceb70af6..31480237bc8 100644
--- a/plugins/org.eclipse.osee.framework.ui.swt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.swt/META-INF/MANIFEST.MF
@@ -5,9 +5,6 @@ Bundle-SymbolicName: org.eclipse.osee.framework.ui.swt;singleton:=true
 Bundle-Version: 0.9.9.qualifier
 Bundle-Activator: org.eclipse.osee.framework.ui.swt.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.swt,
- org.eclipse.jface,
- org.eclipse.jface.text,
  org.eclipse.ui,
  org.eclipse.ui.forms
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/META-INF/MANIFEST.MF
index 5b4a22115a1..af701069f5f 100644
--- a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Import-Package: org.eclipse.core.resources,
  org.eclipse.osee.framework.plugin.core.util,
  org.eclipse.osee.framework.ui.plugin.workspace,
  org.eclipse.osee.framework.ui.swt,
- org.eclipse.swt.widgets,
  org.eclipse.ui,
  org.osgi.framework,
  org.osgi.util.tracker
diff --git a/plugins/org.eclipse.osee.ote.ui.host.cmd/.classpath b/plugins/org.eclipse.osee.ote.ui.host.cmd/.classpath
index 1fa3e6803d3..ad32c83a788 100644
--- a/plugins/org.eclipse.osee.ote.ui.host.cmd/.classpath
+++ b/plugins/org.eclipse.osee.ote.ui.host.cmd/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.osee.ote.ui.mux/.classpath b/plugins/org.eclipse.osee.ote.ui.mux/.classpath
index 751c8f2e504..ad32c83a788 100644
--- a/plugins/org.eclipse.osee.ote.ui.mux/.classpath
+++ b/plugins/org.eclipse.osee.ote.ui.mux/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.osee.ote.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui/META-INF/MANIFEST.MF
index 62142436344..c4f5e9d3cc5 100644
--- a/plugins/org.eclipse.osee.ote.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ote.ui/META-INF/MANIFEST.MF
@@ -12,8 +12,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
  org.eclipse.jface.action,
  org.eclipse.jface.resource,
  org.eclipse.jface.viewers,
@@ -23,17 +21,13 @@ Import-Package: org.eclipse.core.resources,
  org.eclipse.osee.framework.jdk.core.util,
  org.eclipse.osee.framework.logging,
  org.eclipse.osee.framework.plugin.core,
- org.eclipse.osee.framework.plugin.core.server,
  org.eclipse.osee.framework.plugin.core.util,
- org.eclipse.osee.framework.svn,
  org.eclipse.osee.framework.ui.plugin,
  org.eclipse.osee.framework.ui.plugin.util,
  org.eclipse.osee.framework.ui.plugin.workspace,
  org.eclipse.osee.framework.ui.plugin.xnavigate,
  org.eclipse.osee.framework.ui.swt,
- org.eclipse.osee.ote.client.msg,
  org.eclipse.osee.ote.core.environment.interfaces,
- org.eclipse.osee.ote.runtimemanager,
  org.eclipse.osee.ote.service,
  org.eclipse.swt,
  org.eclipse.swt.widgets,
diff --git a/plugins/org.eclipse.osee.ote.ui/plugin.xml b/plugins/org.eclipse.osee.ote.ui/plugin.xml
index ef5adb4a0fa..98dddcfa46b 100644
--- a/plugins/org.eclipse.osee.ote.ui/plugin.xml
+++ b/plugins/org.eclipse.osee.ote.ui/plugin.xml
@@ -17,13 +17,6 @@
             name="OTE Navigator"/>
    </extension>
      <extension
-           point="org.eclipse.osee.framework.ui.plugin.XNavigateItem">
-        <XNavigateItem
-              classname="org.eclipse.osee.ote.ui.navigate.WorkspaceSetupViewItems"
-              viewId="org.eclipse.osee.ote.ui.navigate.OteNavigateView" >
-        </XNavigateItem>
-     </extension>
-     <extension
            id="testnature"
            name="Test Nature"
            point="org.eclipse.core.resources.natures">
diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/TestPerspective.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/TestPerspective.java
index ecb515a8974..62263829c34 100644
--- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/TestPerspective.java
+++ b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/TestPerspective.java
@@ -11,7 +11,6 @@
 
 package org.eclipse.osee.ote.ui;
 
-import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.osee.ote.ui.navigate.OteNavigateView;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
@@ -67,8 +66,11 @@ public class TestPerspective implements IPerspectiveFactory {
       lower.addView("org.eclipse.ui.console.ConsoleView");
       lower.addView(IPageLayout.ID_PROBLEM_VIEW);
 
-      layout.addActionSet(JavaUI.ID_ACTION_SET);
-      layout.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET);
+      // string found in JavaUI.ID_ACTION_SET
+      layout.addActionSet("org.eclipse.jdt.ui.JavaActionSet");
+      
+      // string found in JavaUI.ID_ELEMENT_CRATION_ACTION_SET
+      layout.addActionSet("org.eclipse.jdt.ui.JavaElementCreationActionSet");
       layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
 
    }
diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/WorkspaceSetupViewItems.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/WorkspaceSetupViewItems.java
deleted file mode 100644
index 4cf4832d644..00000000000
--- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/WorkspaceSetupViewItems.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ote.ui.navigate;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints;
-import org.eclipse.osee.framework.svn.CheckoutProjectSetJob;
-import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateContainer;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
-import org.eclipse.osee.ote.ui.OteImage;
-import org.eclipse.osee.ote.ui.internal.TestCoreGuiPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * @author Roberto E. Escobar
- */
-public class WorkspaceSetupViewItems implements IXNavigateContainer {
-   private static final String PARENT_FOLDER_NAME = "Workspace Operations";
-
-   public WorkspaceSetupViewItems() {
-      super();
-   }
-
-   @Override
-   public List<XNavigateItem> getNavigateItems() {
-      List<XNavigateItem> items = new ArrayList<XNavigateItem>();
-      XNavigateItem parentFolder = new XNavigateItem(null, PARENT_FOLDER_NAME, PluginUiImage.FOLDER);
-      workspaceSetupFactory(parentFolder);
-      items.add(parentFolder);
-      return items;
-   }
-
-   private void workspaceSetupFactory(XNavigateItem parent) {
-      List<IConfigurationElement> configurationElements =
-         ExtensionPoints.getExtensionElements("org.eclipse.osee.ote.ui.WorkspaceSetup", "WorkspaceConfig");
-      for (IConfigurationElement configElement : configurationElements) {
-         IExtension extension = (IExtension) configElement.getParent();
-         String shortCutName =
-            extension.getLabel() == null || extension.getLabel().length() == 0 ? extension.getSimpleIdentifier() : extension.getLabel();
-         String resourceName = configElement.getAttribute("configFile");
-         String bundleName = configElement.getContributor().getName();
-         if (Strings.isValid(shortCutName) && Strings.isValid(bundleName) && Strings.isValid(resourceName)) {
-            try {
-               URL configPath = getWorkspaceConfig(bundleName, resourceName);
-               if (configPath != null) {
-                  new XNavigateItemRunnable(parent, shortCutName, OteImage.CHECKOUT, configPath);
-               }
-            } catch (Exception ex) {
-               OseeLog.logf(TestCoreGuiPlugin.class, Level.WARNING, ex, "Unable to Load: [%s.%s - %s]", bundleName,
-                  resourceName, OteImage.CHECKOUT);
-            }
-         }
-      }
-   }
-
-   private URL getResource(String bundleName, String resourceName) throws IOException {
-      Bundle bundle = Platform.getBundle(bundleName);
-      URL url = bundle.getEntry(resourceName);
-      url = FileLocator.resolve(url);
-      return url;
-   }
-
-   private URL getWorkspaceConfig(String bundleName, String configName) throws IOException {
-      return getResource(bundleName, configName);
-   }
-
-   private static final class XNavigateItemRunnable extends XNavigateItem {
-      private final URL projectSetFile;
-      private final String jobName;
-
-      public XNavigateItemRunnable(XNavigateItem parent, String name, KeyedImage oseeImage, URL projectSetFile) {
-         super(parent, name, oseeImage);
-         this.jobName = String.format("Workspace Configuration: [%s]", name);
-         this.projectSetFile = projectSetFile;
-      }
-
-      @Override
-      public void run(TableLoadOption... tableLoadOptions) {
-         Job job = new CheckoutProjectSetJob(jobName, getName(), projectSetFile);
-         job.setUser(true);
-         job.schedule();
-      }
-   }
-}