refactor: Remove OseeCm and use ServiceProvider instead

11 files changed, 29 insertions, 20 deletions

diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
index ced27473313..6f20b3593ea 100644
--- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ats;singleton:=true
 Bundle-Version: 0.9.9.qualifier
 Eclipse-ExtensibleAPI: true
 Bundle-Activator: org.eclipse.osee.ats.internal.AtsPlugin
+Service-Component: OSGI-INF/*.xml
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Require-Bundle: org.eclipse.gef,
  org.eclipse.osee.framework.jdk.core,
diff --git a/plugins/org.eclipse.osee.ats/build.properties b/plugins/org.eclipse.osee.ats/build.properties
index 663089b87f2..3ec56aaf8bc 100644
--- a/plugins/org.eclipse.osee.ats/build.properties
+++ b/plugins/org.eclipse.osee.ats/build.properties
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
                images/,\
                support/,\
                schema/,\
-               ui/
+               ui/,\
+               OSGI-INF/
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
index 7e9338ce6f4..4cf1b019565 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.ui.skynet;singleton:=true
 Bundle-Version: 0.9.9.qualifier
 Eclipse-ExtensibleAPI: true
 Bundle-Activator: org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin
+Service-Component: OSGI-INF/*.xml
 Require-Bundle: javax.mail.glassfish,
  org.eclipse.birt.chart.engine,
  org.eclipse.compare,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/build.properties b/plugins/org.eclipse.osee.framework.ui.skynet/build.properties
index aea5c64fa56..8e8b0c40b9e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/build.properties
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/build.properties
@@ -7,4 +7,5 @@ bin.includes = META-INF/,\
                support/,\
                schema/,\
                .,\
-               ui/
+               ui/,\
+               OSGI-INF/
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AdminContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AdminContributionItem.java
index d3f23e2bb05..02b1ee23405 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AdminContributionItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AdminContributionItem.java
@@ -11,8 +11,7 @@
 package org.eclipse.osee.framework.ui.skynet;
 
 import org.eclipse.osee.framework.ui.plugin.OseeStatusContributionItem;
-import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
-import org.eclipse.osee.framework.ui.skynet.cm.OseeCm;
+import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.swt.graphics.Image;
 
@@ -57,8 +56,6 @@ public class AdminContributionItem extends OseeStatusContributionItem {
 
    @Override
    public boolean isCreationAllowed() {
-      IOseeCmService atsService = OseeCm.getInstance();
-      return atsService != null && atsService.isCmAdmin();
+      return ServiceProvider.isOseeCmServiceAvailable() && ServiceProvider.getOseeCmService().isCmAdmin();
    }
-
-}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/OseeCm.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/OseeCm.java
index 7864f80b78c..43afe5484b6 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/OseeCm.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/OseeCm.java
@@ -21,7 +21,7 @@ public final class OseeCm {
 
    private static IOseeCmService oseeCmInstance;
 
-   public static IOseeCmService getInstance() {
+   private static IOseeCmService getInstance() {
       try {
          if (Platform.getExtensionRegistry() == null) {
             return null;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
index ca7c9a30328..fb90e61ff30 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
@@ -26,9 +26,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.cm.OseeCm;
+import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor;
 import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers;
+import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider;
 import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
 import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
 
@@ -49,8 +50,9 @@ public class OpenAssociatedArtifactHandler extends CommandHandler {
          return null;
       }
       if (AccessControlManager.hasPermission(associatedArtifact, PermissionEnum.READ)) {
-         if (OseeCm.getInstance().isPcrArtifact(associatedArtifact)) {
-            OseeCm.getInstance().openArtifact(associatedArtifact, OseeCmEditor.CmPcrEditor);
+         IOseeCmService cmService = ServiceProvider.getOseeCmService();
+         if (cmService.isPcrArtifact(associatedArtifact)) {
+            cmService.openArtifact(associatedArtifact, OseeCmEditor.CmPcrEditor);
          } else {
             RendererManager.open(associatedArtifact, PresentationType.DEFAULT_OPEN);
          }
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java
index 16de5db3782..d5f38959765 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java
@@ -23,8 +23,8 @@ import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.cm.OseeCm;
 import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers;
+import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider;
 import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView;
 import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView;
 
@@ -67,7 +67,7 @@ public class MergeManagerHandler extends CommandHandler {
                   enabled = true;
                } else {
                   enabled =
-                     selectedBranch != null && !(OseeCm.getInstance().isPcrArtifact(BranchManager.getAssociatedArtifact(selectedBranch))) && selectedBranch.hasParentBranch();
+                     selectedBranch != null && !(ServiceProvider.getOseeCmService().isPcrArtifact(BranchManager.getAssociatedArtifact(selectedBranch))) && selectedBranch.hasParentBranch();
                }
             } catch (OseeCoreException ex) {
                OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceProvider.java
index f623ab62c16..64e51f49763 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
+ * 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
@@ -27,6 +27,10 @@ public class ServiceProvider {
       return instance.service;
    }
 
+   public static boolean isOseeCmServiceAvailable() {
+      return instance != null;
+   }
+
    public void start() {
       instance = this;
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java
index 151ce45602b..881896d11ae 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java
@@ -20,8 +20,8 @@ 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.OseeCm;
 import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor;
+import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider;
 import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
 import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
 import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView;
@@ -105,7 +105,7 @@ public class XResultBrowserListener implements LocationListener {
    }
 
    private void openArtifact(String guid, OseeCmEditor view) {
-      OseeCm.getInstance().openArtifact(guid, view);
+      ServiceProvider.getOseeCmService().openArtifact(guid, view);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
index cf16e37114d..9356c9e23cc 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
@@ -51,8 +51,9 @@ import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil;
-import org.eclipse.osee.framework.ui.skynet.cm.OseeCm;
+import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor;
+import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider;
 import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
 import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
 import org.eclipse.osee.framework.ui.skynet.widgets.GenericXWidget;
@@ -577,8 +578,9 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable {
          try {
             Branch sourceBranch = storedConflicts[0].getSourceBranch();
             Artifact branchAssociatedArtifact = BranchManager.getAssociatedArtifact(sourceBranch);
-            if (OseeCm.getInstance().isPcrArtifact(branchAssociatedArtifact)) {
-               OseeCm.getInstance().openArtifact(branchAssociatedArtifact, OseeCmEditor.CmPcrEditor);
+            IOseeCmService cmService = ServiceProvider.getOseeCmService();
+            if (cmService.isPcrArtifact(branchAssociatedArtifact)) {
+               cmService.openArtifact(branchAssociatedArtifact, OseeCmEditor.CmPcrEditor);
             } else if (!branchAssociatedArtifact.equals(UserManager.getUser(SystemUser.OseeSystem))) {
                RendererManager.open(branchAssociatedArtifact, PresentationType.SPECIALIZED_EDIT);
             } else {