refactor: Remove usage of SkynetGuiPlugin from coverage

18 files changed, 82 insertions, 36 deletions

diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/navigate/CreateWorkProductAction.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/navigate/CreateWorkProductAction.java
index d33e8d65257..54a47e8e14a 100644
--- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/navigate/CreateWorkProductAction.java
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/navigate/CreateWorkProductAction.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
 import java.util.List;
 import org.eclipse.osee.coverage.editor.CoverageEditor;
 import org.eclipse.osee.coverage.editor.CoverageEditorInput;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.model.CoveragePackage;
 import org.eclipse.osee.coverage.model.WorkProductAction;
 import org.eclipse.osee.coverage.store.CoverageRelationTypes;
@@ -28,7 +29,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 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.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 
 /**
@@ -47,7 +47,7 @@ public class CreateWorkProductAction extends XNavigateItemAction {
    @Override
    public void run(TableLoadOption... tableLoadOptions) throws Exception {
 
-      IOseeCmService cmService = SkynetGuiPlugin.getInstance().getOseeCmService();
+      IOseeCmService cmService = ServiceProvider.getOseeCmService();
       if (cmService == null) {
          AWorkbench.popup("Can not acquire CM Service");
          return;
diff --git a/plugins/org.eclipse.osee.coverage/.project b/plugins/org.eclipse.osee.coverage/.project
index c2370f84434..341bd1a164f 100644
--- a/plugins/org.eclipse.osee.coverage/.project
+++ b/plugins/org.eclipse.osee.coverage/.project
@@ -30,6 +30,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
index 1939981448e..fd02271ac64 100644
--- a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
@@ -73,3 +73,4 @@ Export-Package: org.eclipse.osee.coverage,
  org.eclipse.osee.coverage.blam,
  org.eclipse.osee.coverage.util,
  org.eclipse.osee.coverage.vcast
+Service-Component: OSGI-INF/service.provider.xml
diff --git a/plugins/org.eclipse.osee.coverage/OSGI-INF/service.provider.xml b/plugins/org.eclipse.osee.coverage/OSGI-INF/service.provider.xml
new file mode 100644
index 00000000000..1a31a6c7757
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage/OSGI-INF/service.provider.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.coverage.internal.ServiceProvider">
+   <implementation class="org.eclipse.osee.coverage.internal.ServiceProvider"/>
+   <reference bind="setOseeCmService" cardinality="1..1" interface="org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService" name="IOseeCmService" policy="static"/>
+</scr:component>
diff --git a/plugins/org.eclipse.osee.coverage/build.properties b/plugins/org.eclipse.osee.coverage/build.properties
index a81941c4532..4a1dcc9a1f3 100644
--- a/plugins/org.eclipse.osee.coverage/build.properties
+++ b/plugins/org.eclipse.osee.coverage/build.properties
@@ -1,5 +1,3 @@
-source.. = src/,\
-           src-gen/
 output.. = bin/
 bin.includes = plugin.xml,\
                images/,\
@@ -7,4 +5,7 @@ bin.includes = plugin.xml,\
                support/,\
                .,\
                schema/,\
-               jaxb/
+               jaxb/,\
+               OSGI-INF/service.provider.xml
+source.. = src/,\
+           src-gen/
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/CreateWorkProductTaskAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/CreateWorkProductTaskAction.java
index 9e2dbcf7598..b258c5ff6a4 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/CreateWorkProductTaskAction.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/CreateWorkProductTaskAction.java
@@ -16,6 +16,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osee.coverage.editor.xcover.CoverageXViewer;
 import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.model.ICoverage;
 import org.eclipse.osee.coverage.model.IWorkProductRelatable;
 import org.eclipse.osee.coverage.model.WorkProductAction;
@@ -32,7 +33,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 
@@ -79,7 +79,7 @@ public class CreateWorkProductTaskAction extends Action {
          AWorkbench.popup("Only Coverage Item(s) and Coverage Units(s) can be related to Work Products");
          return;
       }
-      IOseeCmService cm = SkynetGuiPlugin.getInstance().getOseeCmService();
+      IOseeCmService cm = ServiceProvider.getOseeCmService();
       if (cm == null) {
          AWorkbench.popup("Unable to connect to CM service.");
          return;
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenMultipleWorkProductsAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenMultipleWorkProductsAction.java
index 6bbb505a667..5f8ebfaf808 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenMultipleWorkProductsAction.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenMultipleWorkProductsAction.java
@@ -19,12 +19,12 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osee.coverage.editor.CoverageEditor;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.model.IWorkProductTaskProvider;
 import org.eclipse.osee.coverage.model.WorkProductAction;
 import org.eclipse.osee.framework.plugin.core.util.Jobs;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
@@ -48,7 +48,7 @@ public class OpenMultipleWorkProductsAction extends Action {
    @Override
    public ImageDescriptor getImageDescriptor() {
       if (image == null) {
-         IOseeCmService service = SkynetGuiPlugin.getInstance().getOseeCmService();
+         IOseeCmService service = ServiceProvider.getOseeCmService();
          if (service != null) {
             image = service.getOpenImage(OseeCmEditor.CmMultiPcrEditor);
          }
@@ -69,7 +69,7 @@ public class OpenMultipleWorkProductsAction extends Action {
 
          @Override
          protected IStatus run(IProgressMonitor monitor) {
-            IOseeCmService service = SkynetGuiPlugin.getInstance().getOseeCmService();
+            IOseeCmService service = ServiceProvider.getOseeCmService();
             List<String> guids = new ArrayList<String>();
             for (WorkProductAction action : provider.getWorkProductRelatedActions()) {
                guids.add(action.getGuid());
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenWorkProductTaskAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenWorkProductTaskAction.java
index b15be94af6b..2f4d05f13f7 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenWorkProductTaskAction.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenWorkProductTaskAction.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.model.ICoverage;
 import org.eclipse.osee.coverage.model.IWorkProductRelatable;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -30,7 +31,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
@@ -60,7 +60,7 @@ public class OpenWorkProductTaskAction extends Action {
          return;
       }
 
-      final IOseeCmService cm = SkynetGuiPlugin.getInstance().getOseeCmService();
+      final IOseeCmService cm = ServiceProvider.getOseeCmService();
       if (cm == null) {
          AWorkbench.popup("Unable to connect to CM service.");
          return;
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
index 16e49dad17f..4f327d60fdd 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java
@@ -40,7 +40,6 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
 import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.ui.IEditorInput;
@@ -260,7 +259,7 @@ public class CoverageEditor extends FormEditor implements IActionable {
             try {
                page.openEditor(coverageEditorInput, EDITOR_ID);
             } catch (PartInitException ex) {
-               OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
             }
          }
       });
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorCoverageTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorCoverageTab.java
index 3a0513c0f66..b4aa87763f3 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorCoverageTab.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorCoverageTab.java
@@ -42,7 +42,6 @@ import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.action.CollapseAllAction;
 import org.eclipse.osee.framework.ui.skynet.action.ExpandAllAction;
 import org.eclipse.osee.framework.ui.swt.ALayout;
@@ -208,7 +207,7 @@ public class CoverageEditorCoverageTab extends FormPage implements ISaveable, IR
             }
          }
       } catch (Exception ex) {
-         OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
       }
    }
 
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java
index 87e9858bf2a..45a6f50e874 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java
@@ -38,7 +38,6 @@ import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider;
 import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
 import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamInputSection;
 import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamOutputSection;
@@ -381,7 +380,7 @@ public class CoverageEditorImportTab extends FormPage {
                                  coverageEditor.simulateImportPostRun();
                                  isSimulateImput = false;
                               } catch (OseeCoreException ex) {
-                                 OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+                                 OseeLog.log(Activator.class, Level.SEVERE, ex);
                               }
                            }
                         });
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorWorkProductTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorWorkProductTab.java
index 6a4b4f63b95..306275a0bdc 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorWorkProductTab.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorWorkProductTab.java
@@ -19,6 +19,7 @@ import org.eclipse.osee.coverage.action.OpenMultipleWorkProductsAction;
 import org.eclipse.osee.coverage.action.RemoveRelatedWorkProductAction;
 import org.eclipse.osee.coverage.help.ui.CoverageHelpContext;
 import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.model.CoverageImport;
 import org.eclipse.osee.coverage.model.CoveragePackage;
 import org.eclipse.osee.coverage.model.ICoverage;
@@ -37,7 +38,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor;
@@ -102,7 +102,7 @@ public class CoverageEditorWorkProductTab extends FormPage implements ISaveable
 
          @Override
          public void handleEvent(Event event) {
-            IOseeCmService cmService = SkynetGuiPlugin.getInstance().getOseeCmService();
+            IOseeCmService cmService = ServiceProvider.getOseeCmService();
             cmService.openArtifact(getSelectedActions().iterator().next().getGuid(), OseeCmEditor.CmPcrEditor);
          }
       });
@@ -126,7 +126,7 @@ public class CoverageEditorWorkProductTab extends FormPage implements ISaveable
             super.performArtifactDrop(dropArtifacts);
             Set<WorkProductAction> workProductActions = new HashSet<WorkProductAction>();
             for (Artifact artifact : dropArtifacts) {
-               if (!artifact.isOfType(SkynetGuiPlugin.getInstance().getOseeCmService().getPcrArtifactType())) {
+               if (!artifact.isOfType(ServiceProvider.getOseeCmService().getPcrArtifactType())) {
                   AWorkbench.popup("Related artifact must be a Team Workflow");
                   return;
                }
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageLabelProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageLabelProvider.java
index 2728b2c57ec..16c0626f782 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageLabelProvider.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageLabelProvider.java
@@ -16,6 +16,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider;
 import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.merge.MergeItem;
 import org.eclipse.osee.coverage.model.CoverageItem;
 import org.eclipse.osee.coverage.model.CoverageUnit;
@@ -31,7 +32,6 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
 import org.eclipse.osee.framework.skynet.core.utility.UsersByIds;
 import org.eclipse.osee.framework.ui.skynet.FrameworkArtifactImageProvider;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService.ImageType;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.swt.graphics.Image;
@@ -73,7 +73,7 @@ public class CoverageLabelProvider extends XViewerLabelProvider {
       }
       if (xCol.equals(CoverageXViewerFactory.Work_Product_Task)) {
          if (Strings.isValid(coverageItem.getWorkProductTaskStr())) {
-            return ImageManager.getImage(SkynetGuiPlugin.getInstance().getOseeCmService().getImage(ImageType.Task));
+            return ImageManager.getImage(ServiceProvider.getOseeCmService().getImage(ImageType.Task));
          }
       }
       return null;
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java
index 35c158e89de..53450e22efb 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.osee.coverage.editor.CoverageEditor;
 import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.model.CoverageItem;
 import org.eclipse.osee.coverage.model.CoveragePackage;
 import org.eclipse.osee.coverage.model.CoverageUnit;
@@ -49,7 +50,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact
 import org.eclipse.osee.framework.skynet.core.event.model.EventModType;
 import org.eclipse.osee.framework.skynet.core.event.model.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
+import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 
 /**
  * @author Donald G. Dunne
@@ -79,11 +80,11 @@ public class CoverageEventManager implements IArtifactEventListener, OseeMessagi
 
    private ArtifactTypeEventFilter createArtifactTypeEventFilter() {
       if (artifactTypeEventFilter == null) {
+         IOseeCmService cmService = ServiceProvider.getOseeCmService();
          artifactTypeEventFilter =
             new ArtifactTypeEventFilter(CoverageArtifactTypes.CoverageFolder, CoverageArtifactTypes.CoverageUnit,
-               CoverageArtifactTypes.CoveragePackage,
-               SkynetGuiPlugin.getInstance().getOseeCmService().getPcrArtifactType(),
-               SkynetGuiPlugin.getInstance().getOseeCmService().getPcrTaskArtifactType());
+               CoverageArtifactTypes.CoveragePackage, cmService.getPcrArtifactType(),
+               cmService.getPcrTaskArtifactType());
       }
       return artifactTypeEventFilter;
    }
@@ -151,8 +152,7 @@ public class CoverageEventManager implements IArtifactEventListener, OseeMessagi
    public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
       for (CoverageEditor editor : new CopyOnWriteArrayList<CoverageEditor>(editors)) {
          try {
-            if (SkynetGuiPlugin.getInstance().getOseeCmService().getCmBranchToken().getGuid().equals(
-               artifactEvent.getBranchGuid())) {
+            if (ServiceProvider.getOseeCmService().getCmBranchToken().getGuid().equals(artifactEvent.getBranchGuid())) {
                boolean updatedWorkProductTab = false;
                for (EventBasicGuidArtifact eventArt : artifactEvent.getArtifacts()) {
                   if (!updatedWorkProductTab) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/ServiceProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/ServiceProvider.java
new file mode 100644
index 00000000000..1b68d08e5f8
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/ServiceProvider.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.coverage.internal;
+
+import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
+
+/**
+ * @author Ryan D. Brooks
+ */
+public class ServiceProvider {
+   private IOseeCmService service;
+   private static ServiceProvider instance;
+
+   public void setOseeCmService(IOseeCmService service) {
+      this.service = service;
+   }
+
+   public static IOseeCmService getOseeCmService() {
+      return instance.service;
+   }
+
+   public void start() {
+      instance = this;
+   }
+
+   public void stop() {
+      instance = null;
+   }
+}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/WorkProductAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/WorkProductAction.java
index 7d8e181a447..46595bf5eae 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/WorkProductAction.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/WorkProductAction.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.coverage.model;
 
 import java.util.HashSet;
 import java.util.Set;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 
 public class WorkProductAction {
 
@@ -33,7 +33,7 @@ public class WorkProductAction {
    }
 
    public boolean isCompleted() {
-      return SkynetGuiPlugin.getInstance().getOseeCmService().isCompleted(artifact);
+      return ServiceProvider.getOseeCmService().isCompleted(artifact);
    }
 
    public Set<WorkProductTask> getTasks() {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java
index 9b2a070db2b..016222e256e 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java
@@ -15,6 +15,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.model.CoveragePackage;
 import org.eclipse.osee.coverage.model.IWorkProductTaskProvider;
 import org.eclipse.osee.coverage.model.WorkProductAction;
@@ -26,7 +27,6 @@ import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 
 public class DbWorkProductTaskProvider implements IWorkProductTaskProvider {
@@ -49,7 +49,7 @@ public class DbWorkProductTaskProvider implements IWorkProductTaskProvider {
       actions.clear();
       try {
          OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage, branch);
-         IOseeCmService cm = SkynetGuiPlugin.getInstance().getOseeCmService();
+         IOseeCmService cm = ServiceProvider.getOseeCmService();
          Artifact packageArt = store.getArtifact(false);
          if (packageArt != null) {
             List<String> relatedActionGuids =
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/WorkProductActionLabelProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/WorkProductActionLabelProvider.java
index 922bd66ecff..c0b7f83863f 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/WorkProductActionLabelProvider.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/WorkProductActionLabelProvider.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.coverage.util;
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.osee.coverage.internal.ServiceProvider;
 import org.eclipse.osee.coverage.model.WorkProductAction;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService.ImageType;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.swt.graphics.Image;
@@ -23,9 +23,9 @@ public class WorkProductActionLabelProvider implements ILabelProvider {
    @Override
    public Image getImage(Object arg0) {
       if (arg0 instanceof WorkProductAction) {
-         return ImageManager.getImage(SkynetGuiPlugin.getInstance().getOseeCmService().getImage(ImageType.Pcr));
+         return ImageManager.getImage(ServiceProvider.getOseeCmService().getImage(ImageType.Pcr));
       } else {
-         return ImageManager.getImage(SkynetGuiPlugin.getInstance().getOseeCmService().getImage(ImageType.Task));
+         return ImageManager.getImage(ServiceProvider.getOseeCmService().getImage(ImageType.Task));
       }
    }