feature[ats_VGR8B]: Delete IActionReportingService

18 files changed, 40 insertions, 128 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/Activator.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/Activator.java
index af129cf1257..62f6ae560df 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/Activator.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/Activator.java
@@ -19,7 +19,6 @@ import org.eclipse.osee.framework.core.client.ClientSessionManager;
 import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
 import org.eclipse.osee.framework.core.util.OsgiUtil;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.plugin.core.IActionReportingService;
 import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService;
 import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager;
 import org.osgi.framework.BundleActivator;
@@ -32,7 +31,6 @@ import org.osgi.framework.ServiceRegistration;
 public class Activator implements BundleActivator {
    public static final String PLUGIN_ID = "org.eclipse.osee.ats";
 
-   private ServiceRegistration service1;
    private ServiceRegistration service2;
 
    private volatile boolean needsInitialization = true;
@@ -41,8 +39,6 @@ public class Activator implements BundleActivator {
 
    @Override
    public void start(BundleContext context) throws Exception {
-      service1 =
-         context.registerService(IActionReportingService.class.getName(), new AtsActionReportingServiceImpl(), null);
       service2 = context.registerService(IOseeCmService.class.getName(), new OseeAtsServiceImpl(), null);
 
       Runnable runnable = new Runnable() {
@@ -74,7 +70,6 @@ public class Activator implements BundleActivator {
          thread = null;
       }
       AtsBranchManager.stop();
-      OsgiUtil.close(service1);
       OsgiUtil.close(service2);
    }
 
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsActionReportingServiceImpl.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsActionReportingServiceImpl.java
deleted file mode 100644
index 4650afa6253..00000000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsActionReportingServiceImpl.java
+++ /dev/null
@@ -1,25 +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.ats.internal;
-
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.framework.plugin.core.IActionReportingService;
-
-/**
- * @author Roberto E. Escobar
- */
-public class AtsActionReportingServiceImpl implements IActionReportingService {
-
-   @Override
-   public void report(String actionableItem, String desc) throws Exception {
-      AtsUtil.createATSAction(desc, actionableItem);
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF
index 621a53a5cb9..e3b21c6845d 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: OSEE Framework Ui Plug-in (Incubation)
 Bundle-SymbolicName: org.eclipse.osee.framework.ui.plugin;singleton:=true
 Bundle-Version: 0.9.9.qualifier
-Bundle-Activator: org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/PluginUiImage.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/PluginUiImage.java
index aa2b4570ad5..0ef7c2c8e4d 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/PluginUiImage.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/PluginUiImage.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.framework.ui.plugin;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.osee.framework.ui.swt.KeyedImage;
 
@@ -36,11 +36,11 @@ public enum PluginUiImage implements KeyedImage {
 
    @Override
    public ImageDescriptor createImageDescriptor() {
-      return ImageManager.createImageDescriptor(OseePluginUiActivator.PLUGIN_ID, "images", fileName);
+      return ImageManager.createImageDescriptor(UiPluginConstants.PLUGIN_ID, "images", fileName);
    }
 
    @Override
    public String getImageKey() {
-      return OseePluginUiActivator.PLUGIN_ID + "." + fileName;
+      return UiPluginConstants.PLUGIN_ID + "." + fileName;
    }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/OseePluginUiActivator.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/OseePluginUiActivator.java
deleted file mode 100644
index 1aa9453b305..00000000000
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/OseePluginUiActivator.java
+++ /dev/null
@@ -1,60 +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.framework.ui.plugin.internal;
-
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.plugin.core.IActionReportingService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * a The activator class controls the plug-in life cycle
- */
-public class OseePluginUiActivator implements BundleActivator {
-
-   public static final String PLUGIN_ID = "org.eclipse.osee.framework.ui.plugin";
-
-   private static OseePluginUiActivator plugin;
-   private ServiceTracker tracker;
-
-   @Override
-   public void start(BundleContext context) throws Exception {
-      tracker = new ServiceTracker(context, IActionReportingService.class.getName(), null);
-      tracker.open();
-      plugin = this;
-   }
-
-   @Override
-   public void stop(BundleContext context) throws Exception {
-      if (tracker != null) {
-         tracker.close();
-      }
-      tracker = null;
-      plugin = null;
-      context = null;
-   }
-
-   public static OseePluginUiActivator getInstance() {
-      return plugin;
-   }
-
-   public IActionReportingService getActionReportingService() throws OseeCoreException {
-      IActionReportingService service = null;
-      try {
-         service = (IActionReportingService) tracker.waitForService(3000);
-      } catch (InterruptedException ex) {
-         OseeExceptions.wrapAndThrow(ex);
-      }
-      return service;
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/IActionReportingService.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/UiPluginConstants.java
index fe7ac1f44b0..4edb30ff0b1 100644
--- a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/IActionReportingService.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/internal/UiPluginConstants.java
@@ -8,13 +8,16 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.plugin.core;
+package org.eclipse.osee.framework.ui.plugin.internal;
 
 /**
- * @author Roberto E. Escobar
+ * a The activator class controls the plug-in life cycle
  */
-public interface IActionReportingService {
+public final class UiPluginConstants {
 
-   public void report(String actionableItem, String desc) throws Exception;
+   public static final String PLUGIN_ID = "org.eclipse.osee.framework.ui.plugin";
 
-}
+   private UiPluginConstants() {
+      // Constants
+   }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/CommandHandler.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/CommandHandler.java
index 38be08d41d8..490d96e2798 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/CommandHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/CommandHandler.java
@@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
@@ -40,7 +40,7 @@ public abstract class CommandHandler extends AbstractHandler {
             result = isEnabledWithException(selection);
          }
       } catch (Exception ex) {
-         OseeLog.log(OseePluginUiActivator.class, Level.SEVERE, ex);
+         OseeLog.log(UiPluginConstants.class, Level.SEVERE, ex);
       }
       return result;
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/GetChildrenJob.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/GetChildrenJob.java
index 20e22f101a7..ba89d03950e 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/GetChildrenJob.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/GetChildrenJob.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.osee.framework.ui.swt.IContentProviderRunnable;
 
@@ -66,7 +66,7 @@ public class GetChildrenJob extends Job {
             parent.cancelled();
          }
       } catch (Exception ex) {
-         OseeLog.log(OseePluginUiActivator.class, Level.SEVERE, ex);
+         OseeLog.log(UiPluginConstants.class, Level.SEVERE, ex);
          parent.cancelled(ex);
       } finally {
          watcher.done();
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/OseeConsole.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/OseeConsole.java
index d57e7c9b4fd..caa49264ae7 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/OseeConsole.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/OseeConsole.java
@@ -21,7 +21,7 @@ import java.util.logging.Level;
 import org.eclipse.osee.framework.jdk.core.util.IConsoleInputListener;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.swt.SWT;
 import org.eclipse.ui.console.ConsolePlugin;
@@ -236,7 +236,7 @@ public class OseeConsole {
          } catch (IOException e) {
             e.printStackTrace();
          }
-         OseeLog.log(OseePluginUiActivator.class, Level.INFO, "done with the handling of input");
+         OseeLog.log(UiPluginConstants.class, Level.INFO, "done with the handling of input");
       }
 
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/views/property/IntegerPropertyDescriptor.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/views/property/IntegerPropertyDescriptor.java
index 6eb65737150..40ff4077120 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/views/property/IntegerPropertyDescriptor.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/views/property/IntegerPropertyDescriptor.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.plugin.views.property;
 
 import java.util.logging.Level;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
 public class IntegerPropertyDescriptor extends TextPropertyDescriptor {
@@ -30,7 +30,7 @@ public class IntegerPropertyDescriptor extends TextPropertyDescriptor {
       try {
          return Integer.parseInt((String) string);
       } catch (NumberFormatException ex) {
-         OseeLog.log(OseePluginUiActivator.class, Level.SEVERE, ex);
+         OseeLog.log(UiPluginConstants.class, Level.SEVERE, ex);
       }
       return 0;
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/widgets/PropertyStoreControlContributions.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/widgets/PropertyStoreControlContributions.java
index bf98159745e..3f490209b73 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/widgets/PropertyStoreControlContributions.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/widgets/PropertyStoreControlContributions.java
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.Platform;
 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.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.osgi.framework.Bundle;
 
 /**
@@ -34,7 +34,7 @@ public class PropertyStoreControlContributions {
    public static List<IPropertyStoreBasedControl> getContributions(String viewIdToMatch) {
       List<IPropertyStoreBasedControl> toReturn = new ArrayList<IPropertyStoreBasedControl>();
       List<IConfigurationElement> elements =
-         ExtensionPoints.getExtensionElements(OseePluginUiActivator.PLUGIN_ID + ".PropertyStoreControl",
+         ExtensionPoints.getExtensionElements(UiPluginConstants.PLUGIN_ID + ".PropertyStoreControl",
             "PropertyStoreControl");
       for (IConfigurationElement element : elements) {
          String className = element.getAttribute("classname");
@@ -55,7 +55,7 @@ public class PropertyStoreControlContributions {
                   }
                   toReturn.add((IPropertyStoreBasedControl) object);
                } catch (Exception ex) {
-                  OseeLog.logf(OseePluginUiActivator.class, Level.SEVERE,
+                  OseeLog.logf(UiPluginConstants.class, Level.SEVERE,
                      ex, "Unable to Load: [%s - %s]", bundleName, className);
                }
             }
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/workspace/EarlyStartup.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/workspace/EarlyStartup.java
index 6355e180b12..f7bcd367cf8 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/workspace/EarlyStartup.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/workspace/EarlyStartup.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.framework.ui.plugin.workspace;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.osee.framework.ui.plugin.workspace.internal.SafeWorkspaceAccessImpl;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.ui.IStartup;
@@ -33,7 +33,7 @@ public class EarlyStartup implements IStartup {
    }
 
    private void registerWorkspaceAccessService() {
-      Bundle bundle = Platform.getBundle(OseePluginUiActivator.PLUGIN_ID);
+      Bundle bundle = Platform.getBundle(UiPluginConstants.PLUGIN_ID);
       bundle.getBundleContext().registerService(SafeWorkspaceAccess.class.getName(), new SafeWorkspaceAccessImpl(),
          null);
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateCommonItems.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateCommonItems.java
index 3bfed932b7f..65b3eb551fe 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateCommonItems.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateCommonItems.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.osgi.framework.Bundle;
 
 public class XNavigateCommonItems {
@@ -35,7 +35,7 @@ public class XNavigateCommonItems {
             }
          }
       } catch (Exception ex) {
-         OseeLog.log(OseePluginUiActivator.class, Level.SEVERE, ex);
+         OseeLog.log(UiPluginConstants.class, Level.SEVERE, ex);
       }
    }
 
@@ -48,7 +48,7 @@ public class XNavigateCommonItems {
       IExtensionPoint point =
          Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.framework.ui.plugin.XCommonNavigateItem");
       if (point == null) {
-         OseeLog.log(OseePluginUiActivator.class, OseeLevel.SEVERE_POPUP,
+         OseeLog.log(UiPluginConstants.class, OseeLevel.SEVERE_POPUP,
             "Can't access XCommonNavigateItem extension point");
          return items;
       }
@@ -68,7 +68,7 @@ public class XNavigateCommonItems {
                      Object obj = taskClass.newInstance();
                      items.add((IXNavigateCommonItem) obj);
                   } catch (Exception ex) {
-                     OseeLog.log(OseePluginUiActivator.class, OseeLevel.SEVERE_POPUP,
+                     OseeLog.log(UiPluginConstants.class, OseeLevel.SEVERE_POPUP,
                         "Error loading XCommonNavigateItem extension", ex);
                   }
                }
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateComposite.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateComposite.java
index 6275cf4d37f..9965fc608fd 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateComposite.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.osee.framework.ui.swt.OSEEFilteredTree;
 import org.eclipse.osee.framework.ui.swt.Widgets;
@@ -91,7 +91,7 @@ public class XNavigateComposite extends Composite {
             try {
                handleDoubleClick();
             } catch (OseeCoreException ex) {
-               OseeLog.log(OseePluginUiActivator.class, OseeLevel.SEVERE_POPUP, ex);
+               OseeLog.log(UiPluginConstants.class, OseeLevel.SEVERE_POPUP, ex);
             }
          }
       });
@@ -103,7 +103,7 @@ public class XNavigateComposite extends Composite {
                try {
                   handleDoubleClick();
                } catch (OseeCoreException ex) {
-                  OseeLog.log(OseePluginUiActivator.class, OseeLevel.SEVERE_POPUP, ex);
+                  OseeLog.log(UiPluginConstants.class, OseeLevel.SEVERE_POPUP, ex);
                }
             }
          }
@@ -133,7 +133,7 @@ public class XNavigateComposite extends Composite {
          try {
             item.run(tableLoadOptions);
          } catch (Exception ex) {
-            OseeLog.log(OseePluginUiActivator.class, OseeLevel.SEVERE_POPUP, ex);
+            OseeLog.log(UiPluginConstants.class, OseeLevel.SEVERE_POPUP, ex);
          }
       }
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java
index cec01a40400..2df631dc86c 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java
@@ -17,7 +17,7 @@ import java.util.logging.Level;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 
 /**
  * @author Donald G. Dunne
@@ -55,7 +55,7 @@ public class XNavigateContentProvider implements ITreeContentProvider {
          try {
             return ((XNavigateItem) element).hasChildren();
          } catch (Exception ex) {
-            OseeLog.log(OseePluginUiActivator.class, Level.SEVERE, ex);
+            OseeLog.log(UiPluginConstants.class, Level.SEVERE, ex);
          }
       }
       return getChildren(element).length > 0;
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContributionManager.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContributionManager.java
index ef3e5443f19..c5627cafe87 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContributionManager.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContributionManager.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.plugin.core.OseeActivator;
 import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.osgi.framework.Bundle;
 
 /**
@@ -39,7 +39,7 @@ public final class XNavigateContributionManager {
       Conditions.checkNotNull(viewIdToMatch, "viewIdToMatch");
       Set<XNavigateExtensionPointData> toReturn = new HashSet<XNavigateExtensionPointData>();
       List<IConfigurationElement> elements =
-         ExtensionPoints.getExtensionElements(OseePluginUiActivator.PLUGIN_ID + ".XNavigateItem", "XNavigateItem");
+         ExtensionPoints.getExtensionElements(UiPluginConstants.PLUGIN_ID + ".XNavigateItem", "XNavigateItem");
       for (IConfigurationElement element : elements) {
          String viewId = element.getAttribute("viewId");
          if (viewIdToMatch.equals(viewId)) {
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateEventManager.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateEventManager.java
index 0f86347556a..6357f6507a4 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateEventManager.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateEventManager.java
@@ -14,7 +14,7 @@ import java.util.HashSet;
 import java.util.Set;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.osee.framework.ui.swt.Displays;
 
 public class XNavigateEventManager {
@@ -33,7 +33,7 @@ public class XNavigateEventManager {
                try {
                   listener.refresh(item);
                } catch (Exception ex) {
-                  OseeLog.log(OseePluginUiActivator.class, OseeLevel.SEVERE, ex);
+                  OseeLog.log(UiPluginConstants.class, OseeLevel.SEVERE, ex);
                }
             }
          }
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateUrlItem.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateUrlItem.java
index f344f20b8f8..d31f1de7ecc 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateUrlItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateUrlItem.java
@@ -14,7 +14,7 @@ import java.net.URL;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
-import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
+import org.eclipse.osee.framework.ui.plugin.internal.UiPluginConstants;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
 import org.eclipse.osee.framework.ui.swt.KeyedImage;
 import org.eclipse.swt.program.Program;
@@ -57,7 +57,7 @@ public class XNavigateUrlItem extends XNavigateItemAction {
             IWebBrowser browser = browserSupport.createBrowser("osee.ats.navigator.browser");
             browser.openURL(new URL(url));
          } catch (Exception ex) {
-            OseeLog.log(OseePluginUiActivator.class, OseeLevel.SEVERE_POPUP, ex);
+            OseeLog.log(UiPluginConstants.class, OseeLevel.SEVERE_POPUP, ex);
          }
       }
    }