refactor: Rename activator for org.eclipse.osee.define

21 files changed, 84 insertions, 74 deletions

diff --git a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
index 9fa0331f71b..9c6741d2d74 100644
--- a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: OSEE Define Plug-in (Incubation)
 Bundle-SymbolicName: org.eclipse.osee.define;singleton:=true
 Bundle-Version: 0.9.9.qualifier
 Eclipse-ExtensibleAPI: true
-Bundle-Activator: org.eclipse.osee.define.internal.DefinePlugin
+Bundle-Activator: org.eclipse.osee.define.internal.Activator
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Export-Package: org.eclipse.osee.define,
  org.eclipse.osee.define.artifact,
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/artifact/Resolver.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/artifact/Resolver.java
index 0482a4afa3e..f6ef6ec214a 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/artifact/Resolver.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/artifact/Resolver.java
@@ -11,21 +11,34 @@
 package org.eclipse.osee.define.artifact;
 
 import java.io.CharArrayReader;
+import java.io.IOException;
 import java.nio.CharBuffer;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
-import org.eclipse.osee.define.internal.DefinePlugin;
-import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
+import org.eclipse.osee.define.internal.Activator;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.plugin.core.PluginUtil;
 
 public class Resolver implements URIResolver {
-   private static final OseeUiActivator plugin = DefinePlugin.getInstance();
-   private static final CharBuffer xslAuxiliary = plugin.getCharBuffer("support/xslt/auxiliary.xsl");
-   private static final CharBuffer xslProperties = plugin.getCharBuffer("support/xslt/elementProperties.xsl");
-   private static final CharBuffer xslStructure = plugin.getCharBuffer("support/xslt/elementStructure.xsl");
-   private static final CharBuffer xslPageLayout = plugin.getCharBuffer("support/xslt/pageLayout.xsl");
-   private static final CharBuffer xslProfile = plugin.getCharBuffer("support/xslt/profile.xsl");
+   private static final PluginUtil plugin = new PluginUtil(Activator.PLUGIN_ID);
+   private static final CharBuffer xslAuxiliary = getResource("support/xslt/auxiliary.xsl");
+   private static final CharBuffer xslProperties = getResource("support/xslt/elementProperties.xsl");
+   private static final CharBuffer xslStructure = getResource("support/xslt/elementStructure.xsl");
+   private static final CharBuffer xslPageLayout = getResource("support/xslt/pageLayout.xsl");
+   private static final CharBuffer xslProfile = getResource("support/xslt/profile.xsl");
+
+   private static CharBuffer getResource(String resource) {
+      try {
+         return Lib.inputStreamToCharBuffer(plugin.getInputStream(resource));
+      } catch (IOException ex) {
+         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+         return null;
+      }
+   }
 
    @Override
    public Source resolve(String href, String base) throws TransformerException {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/DefinePlugin.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/Activator.java
index b6d1f1758ef..17c17b7b503 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/DefinePlugin.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/Activator.java
@@ -10,21 +10,19 @@
  *******************************************************************************/
 package org.eclipse.osee.define.internal;
 
-import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
 
-public class DefinePlugin extends OseeUiActivator {
-   private static DefinePlugin pluginInstance;
+public class Activator implements BundleActivator {
    public static final String PLUGIN_ID = "org.eclipse.osee.define";
 
-   public DefinePlugin() {
-      super(PLUGIN_ID);
-      pluginInstance = this;
+   @Override
+   public void start(BundleContext context) {
+      // do nothing
    }
 
-   /**
-    * Returns the shared instance.
-    */
-   public static DefinePlugin getInstance() {
-      return pluginInstance;
+   @Override
+   public void stop(BundleContext context) {
+      // do nothing
    }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
index 5a52ea12bd9..ac1dc7c7513 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.ui.plugin.util.OpenPerspectiveNavigateItem;
@@ -53,7 +53,7 @@ public class DefineNavigateViewItems implements XNavigateViewItems, IXNavigateCo
             MassEditDirtyArtifactOperation.NAME, new MassEditDirtyArtifactOperation()));
          addExtensionPointItems(items);
       } catch (Exception ex) {
-         OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+         OseeLog.log(Activator.class, Level.SEVERE, ex);
       }
    }
 
@@ -61,7 +61,7 @@ public class DefineNavigateViewItems implements XNavigateViewItems, IXNavigateCo
       IExtensionPoint point =
          Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.define.DefineNavigateItem");
       if (point == null) {
-         OseeLog.log(DefinePlugin.class, OseeLevel.SEVERE_POPUP, "Can't access DefineNavigateItem extension point");
+         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Can't access DefineNavigateItem extension point");
          return;
       }
       IExtension[] extensions = point.getExtensions();
@@ -83,7 +83,7 @@ public class DefineNavigateViewItems implements XNavigateViewItems, IXNavigateCo
                IDefineNavigateItem task = (IDefineNavigateItem) obj;
                items.addAll(task.getNavigateItems());
             } catch (Exception ex) {
-               OseeLog.log(DefinePlugin.class, OseeLevel.SEVERE_POPUP, "Error loading DefineNavigateItem extension", ex);
+               OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error loading DefineNavigateItem extension", ex);
             }
          }
       }
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
index da003139431..a83b862dfdb 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
@@ -19,7 +19,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
@@ -124,7 +124,7 @@ public class ExtractTestRelations {
       try {
          return ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.TestCase, testArtifactFile.getName(), branch);
       } catch (MultipleArtifactsExist ex) {
-         OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+         OseeLog.log(Activator.class, Level.SEVERE, ex);
          return null;
       } catch (ArtifactDoesNotExist ex) {
          Artifact testArtifact =
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ArtifactOperations.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ArtifactOperations.java
index 83263370746..33fde4bc125 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ArtifactOperations.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ArtifactOperations.java
@@ -17,7 +17,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.TreeSet;
 import java.util.logging.Level;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;
@@ -102,7 +102,7 @@ public class ArtifactOperations {
             partitions.addAll(artifact.getAttributesToStringList(CoreAttributeTypes.Partition));
             Collections.sort(partitions);
          } catch (OseeCoreException ex) {
-            OseeLog.logf(DefinePlugin.class, Level.WARNING,
+            OseeLog.logf(Activator.class, Level.WARNING,
                ex, "Error obtaining partition info for [%s]", getName());
             partitions.add("Error");
          }
@@ -142,7 +142,7 @@ public class ArtifactOperations {
             }
          }
       } catch (OseeCoreException ex) {
-         OseeLog.logf(DefinePlugin.class, Level.WARNING,
+         OseeLog.logf(Activator.class, Level.WARNING,
             ex, "Error obtaining qualification info [%s]", getName());
       }
       qualificationMethod = qualMethodBuilder.toString();
@@ -188,7 +188,7 @@ public class ArtifactOperations {
                }
                return toReturn;
             } catch (Exception ex) {
-               OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+               OseeLog.log(Activator.class, Level.SEVERE, ex);
             }
             return 1;
          }
@@ -217,7 +217,7 @@ public class ArtifactOperations {
       try {
          toReturn = this.artifact.getSoleAttributeValue(CoreAttributeTypes.Category, "");
       } catch (Exception ex) {
-         OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+         OseeLog.log(Activator.class, Level.SEVERE, ex);
          toReturn = "";
       }
       return toReturn;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
index c5efa55916a..e1f3f9ec9cc 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.data.RequirementData;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
@@ -41,7 +41,7 @@ public class BranchTraceabilityOperation extends TraceabilityProviderOperation {
    private final boolean withInheritance;
 
    private BranchTraceabilityOperation(RequirementData requirementData, Branch branch, Collection<? extends IArtifactType> types, boolean withInheritance) {
-      super("Branch Traceability Provider", DefinePlugin.PLUGIN_ID);
+      super("Branch Traceability Provider", Activator.PLUGIN_ID);
       this.requirementData = requirementData;
       this.branch = branch;
       this.types = types;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
index 2517335c634..e2f23401f7a 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.define.traceability;
 import java.io.File;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.logging.OseeLevel;
@@ -40,7 +40,7 @@ public class ImportTraceabilityWizard extends Wizard implements IImportWizard {
          File file = mainPage.getImportFile();
          Operations.executeWorkAndCheckStatus(new ScriptTraceabilityOperation(file, branch, true));
       } catch (Exception ex) {
-         OseeLog.log(DefinePlugin.class, OseeLevel.SEVERE_POPUP, "Traceability Import Error", ex);
+         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Traceability Import Error", ex);
       }
       return true;
    }
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
index afa7311947b..fc7bad00e14 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
@@ -26,7 +26,7 @@ import java.util.logging.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.data.RequirementData;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -91,7 +91,7 @@ public class RequirementTraceabilityData {
             status = Status.CANCEL_STATUS;
          }
       } catch (Exception ex) {
-         status = new Status(IStatus.ERROR, DefinePlugin.PLUGIN_ID, "Error gathering traceability data", ex);
+         status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error gathering traceability data", ex);
       }
       return status;
    }
@@ -198,7 +198,7 @@ public class RequirementTraceabilityData {
             testScripts.put(getScriptName(script), testScript);
             toReturn.add(testScript);
          } catch (OseeCoreException ex) {
-            OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
          }
       }
       return toReturn;
@@ -237,13 +237,13 @@ public class RequirementTraceabilityData {
                toReturn.add(line.trim());
             }
          } catch (Exception ex) {
-            OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
          } finally {
             if (reader != null) {
                try {
                   reader.close();
                } catch (IOException ex) {
-                  OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+                  OseeLog.log(Activator.class, Level.SEVERE, ex);
                }
             }
          }
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
index 33d0487e950..27b8e85d246 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.regex.Pattern;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.data.RequirementData;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
@@ -62,7 +62,7 @@ public class ScriptTraceabilityOperation extends TraceabilityProviderOperation {
    private final boolean writeOutResults;
 
    private ScriptTraceabilityOperation(RequirementData requirementData, File file, boolean writeOutResults) throws IOException {
-      super("Importing Traceability", DefinePlugin.PLUGIN_ID);
+      super("Importing Traceability", Activator.PLUGIN_ID);
       this.file = file;
       this.requirementData = requirementData;
       this.writeOutResults = writeOutResults;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/TraceUnitExtensionManager.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/TraceUnitExtensionManager.java
index bc11a5c6e84..65611763bc1 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/TraceUnitExtensionManager.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/TraceUnitExtensionManager.java
@@ -20,7 +20,7 @@ import java.util.Set;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints;
@@ -108,7 +108,7 @@ public class TraceUnitExtensionManager {
    private void checkObjectsLoaded() throws OseeCoreException {
       if (contributions.isEmpty()) {
          List<IConfigurationElement> elements =
-            ExtensionPoints.getExtensionElements(DefinePlugin.PLUGIN_ID + "." + TRACE_UNIT_HANDLER, TRACE_UNIT_HANDLER);
+            ExtensionPoints.getExtensionElements(Activator.PLUGIN_ID + "." + TRACE_UNIT_HANDLER, TRACE_UNIT_HANDLER);
          for (IConfigurationElement element : elements) {
             IExtension extension = (IExtension) element.getParent();
             String identifier = extension.getUniqueIdentifier();
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java
index 1b96950e7f0..ac3dca4caad 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java
@@ -14,7 +14,7 @@ import java.util.logging.Level;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.jobs.FindTraceUnitJob;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.plugin.core.util.Jobs;
@@ -35,7 +35,7 @@ public class FindTraceUnitEditorAction implements IEditorActionDelegate {
       if (editorInput instanceof IFileEditorInput) {
          iFile = ((IFileEditorInput) editorInput).getFile();
          if (iFile != null) {
-            OseeLog.log(DefinePlugin.class, Level.INFO, "iFile *" + iFile + "*");
+            OseeLog.log(Activator.class, Level.INFO, "iFile *" + iFile + "*");
          }
       }
       if (iFile == null) {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
index f710b0806e2..6c82d5b5670 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.ITraceParser;
 import org.eclipse.osee.define.traceability.ITraceUnitResourceLocator;
 import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
@@ -227,7 +227,7 @@ public class RemoveTraceMarksFromTraceUnits extends AbstractBlam {
                      try {
                         Lib.writeCharBufferToFile(modifiedBuffer, new File(uriPath));
                      } catch (Exception ex) {
-                        OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+                        OseeLog.log(Activator.class, Level.SEVERE, ex);
                      }
                   }
                } else {
@@ -345,7 +345,7 @@ public class RemoveTraceMarksFromTraceUnits extends AbstractBlam {
                return Status.OK_STATUS;
             }
          };
-         Jobs.runInJob(getName(), runnable, DefinePlugin.class, DefinePlugin.PLUGIN_ID);
+         Jobs.runInJob(getName(), runnable, Activator.class, Activator.PLUGIN_ID);
       }
    }
 }
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
index f919b589d8a..980ef370614 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.data.BaseTraceDataCache;
 import org.eclipse.osee.define.traceability.data.CodeUnitData;
 import org.eclipse.osee.define.traceability.data.RequirementData;
@@ -324,7 +324,7 @@ public class TraceReportBlam extends AbstractBlam {
                return Status.OK_STATUS;
             }
          };
-         Jobs.runInJob(getName(), runnable, DefinePlugin.class, DefinePlugin.PLUGIN_ID);
+         Jobs.runInJob(getName(), runnable, Activator.class, Activator.PLUGIN_ID);
       }
    }
 
@@ -449,7 +449,7 @@ public class TraceReportBlam extends AbstractBlam {
          try {
             sheetWriter.writeRow(data);
          } catch (IOException ex) {
-            OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
          }
       }
 
@@ -459,7 +459,7 @@ public class TraceReportBlam extends AbstractBlam {
             sheetWriter.startSheet(title, header.length);
             sheetWriter.writeRow(header);
          } catch (IOException ex) {
-            OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
          }
       }
 
@@ -468,7 +468,7 @@ public class TraceReportBlam extends AbstractBlam {
          try {
             sheetWriter.endSheet();
          } catch (IOException ex) {
-            OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
          }
       }
    }
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
index abe4d636f1f..eaa4e543e9b 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
@@ -15,7 +15,7 @@ import java.util.Map;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 
@@ -55,7 +55,7 @@ public abstract class BaseTraceDataCache {
          }
          isInitialized = true;
       } catch (Exception ex) {
-         toReturn = new Status(IStatus.ERROR, DefinePlugin.PLUGIN_ID, String.format("Loading %s ", traceType), ex);
+         toReturn = new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("Loading %s ", traceType), ex);
       }
       return toReturn;
    }
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
index a05af71405e..17d0f2835f2 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
@@ -25,7 +25,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
 import org.eclipse.osee.define.traceability.TraceUnitExtensionManager.TraceHandler;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
@@ -206,7 +206,7 @@ public class ImportTraceUnitPage extends WizardDataTransferPage {
             createTraceHandler(composite, handler.getName(), handler.getId());
          }
       } catch (Exception ex) {
-         OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+         OseeLog.log(Activator.class, Level.SEVERE, ex);
       }
 
    }
@@ -406,7 +406,7 @@ public class ImportTraceUnitPage extends WizardDataTransferPage {
             try {
                settings.put(BRANCH_KEY, BranchManager.getBranchId(branch));
             } catch (OseeCoreException ex) {
-               OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+               OseeLog.log(Activator.class, Level.SEVERE, ex);
             }
          }
 
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
index 9005c5d8365..a051f1e55a9 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.define.traceability.importer;
 import java.net.URI;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.operations.ImportTraceUnitsOperation;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.operation.IOperation;
@@ -32,7 +32,6 @@ public class ImportTraceUnitWizard extends Wizard implements IImportWizard {
 
    public ImportTraceUnitWizard() {
       super();
-      setDialogSettings(DefinePlugin.getInstance().getDialogSettings());
       setWindowTitle("Import Trace Units Wizard");
    }
 
@@ -52,7 +51,7 @@ public class ImportTraceUnitWizard extends Wizard implements IImportWizard {
          Operations.executeAsJob(op, true);
          page.saveWidgetValues();
       } catch (Exception ex) {
-         OseeLog.log(DefinePlugin.class, OseeLevel.SEVERE_POPUP, "Import Trace Unit Error", ex);
+         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Import Trace Unit Error", ex);
       }
       return true;
    }
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
index 7bd48951921..705b9476b95 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.operations.FindTraceUnitFromResource;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.plugin.core.util.IExceptionableRunnable;
@@ -61,7 +61,7 @@ public class FindTraceUnitJob extends Job {
                         return Status.OK_STATUS;
                      }
                   };
-                  Jobs.runInJob(getName(), runnable, DefinePlugin.class, DefinePlugin.PLUGIN_ID);
+                  Jobs.runInJob(getName(), runnable, Activator.class, Activator.PLUGIN_ID);
                }
             }
          });
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
index 1c9cf9c1096..bef0384ad4e 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
@@ -21,7 +21,7 @@ import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.ITraceUnitResourceLocator;
 import org.eclipse.osee.define.traceability.ResourceIdentifier;
 import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
@@ -59,7 +59,7 @@ public final class FindTraceUnitFromResource {
                resourceToId(returnCollection, resource, locators);
             }
          } catch (Exception ex) {
-            OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
          }
       }
       return returnCollection;
@@ -78,7 +78,7 @@ public final class FindTraceUnitFromResource {
                   IArtifactType traceType = locator.getTraceUnitType(identifier.getName(), buffer);
                   idStore.put(traceType, identifier);
                } catch (Exception ex) {
-                  OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+                  OseeLog.log(Activator.class, Level.SEVERE, ex);
                } finally {
                   if (inputStream != null) {
                      try {
@@ -91,7 +91,7 @@ public final class FindTraceUnitFromResource {
             }
          }
       } catch (Exception ex) {
-         OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+         OseeLog.log(Activator.class, Level.SEVERE, ex);
       }
    }
 
@@ -111,7 +111,7 @@ public final class FindTraceUnitFromResource {
                            branch));
                      }
                   } catch (OseeCoreException ex) {
-                     OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+                     OseeLog.log(Activator.class, Level.SEVERE, ex);
                   }
                }
             }
@@ -140,7 +140,7 @@ public final class FindTraceUnitFromResource {
                      true);
                }
             } catch (Exception ex) {
-               OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+               OseeLog.log(Activator.class, Level.SEVERE, ex);
             }
          }
       });
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
index 28109bc2a42..8df9fbc8480 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.define.traceability.AbstractSourceTagger;
 import org.eclipse.osee.define.traceability.TestUnitTagger;
 import org.eclipse.osee.define.traceability.TraceabilityExtractor;
@@ -287,7 +287,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor {
             return Status.OK_STATUS;
          }
       };
-      Jobs.runInJob("Trace Unit to Artifact Report", runnable, DefinePlugin.class, DefinePlugin.PLUGIN_ID);
+      Jobs.runInJob("Trace Unit to Artifact Report", runnable, Activator.class, Activator.PLUGIN_ID);
    }
 
    private static final class TestRunHandler {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/utility/UriResourceContentFinder.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/utility/UriResourceContentFinder.java
index 2fc4b816b9e..3eba81413ea 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/utility/UriResourceContentFinder.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/utility/UriResourceContentFinder.java
@@ -23,7 +23,7 @@ import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.define.internal.DefinePlugin;
+import org.eclipse.osee.define.internal.Activator;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;
@@ -177,7 +177,7 @@ public class UriResourceContentFinder {
             try {
                inputStream.close();
             } catch (IOException ex) {
-               OseeLog.logf(DefinePlugin.class, Level.SEVERE,
+               OseeLog.logf(Activator.class, Level.SEVERE,
                   ex, "Error closing stream for resource: [%s]", fileStore.getName());
             }
          }