Reorganize util methods

18 files changed, 43 insertions, 43 deletions

diff --git a/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/cases/AtsBranchConfigurationTest.java b/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/cases/AtsBranchConfigurationTest.java
index 98b32926714..a6062a207dc 100644
--- a/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/cases/AtsBranchConfigurationTest.java
+++ b/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/cases/AtsBranchConfigurationTest.java
@@ -28,7 +28,7 @@ import org.eclipse.osee.ats.artifact.TeamWorkflowManager;
 import org.eclipse.osee.ats.artifact.VersionArtifact;

 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState;

 import org.eclipse.osee.ats.config.AtsBulkLoadCache;

-import org.eclipse.osee.ats.config.AtsConfig;

+import org.eclipse.osee.ats.config.AtsConfigManager;

 import org.eclipse.osee.ats.editor.SMAEditor;

 import org.eclipse.osee.ats.util.ActionManager;

 import org.eclipse.osee.ats.util.AtsRelation;

@@ -92,7 +92,7 @@ public class AtsBranchConfigurationTest {
 

       OseeLog.log(AtsPlugin.class, Level.INFO, "Configuring ATS for team org.branchTest.viaTeamDefs");

       // create team definition and actionable item

-      AtsConfig.configureAtsForDefaultTeam(namespace, TestType.BranchViaVersions.name(), Arrays.asList(

+      AtsConfigManager.configureAtsForDefaultTeam(namespace, TestType.BranchViaVersions.name(), Arrays.asList(

             TestType.BranchViaVersions.name() + "- Ver1", TestType.BranchViaVersions.name() + "- Ver2"), Arrays.asList(

             TestType.BranchViaVersions.name() + "- A1", TestType.BranchViaVersions.name() + "- A2"), namespace);

 

@@ -206,7 +206,7 @@ public class AtsBranchConfigurationTest {
 

       OseeLog.log(AtsPlugin.class, Level.INFO, "Configuring ATS for team org.branchTest.viaTeamDefs");

       // create team definition and actionable item

-      AtsConfig.configureAtsForDefaultTeam(namespace, TestType.BranchViaTeamDef.name(), null, Arrays.asList(

+      AtsConfigManager.configureAtsForDefaultTeam(namespace, TestType.BranchViaTeamDef.name(), null, Arrays.asList(

             TestType.BranchViaTeamDef.name() + "- A1", TestType.BranchViaTeamDef.name() + "- A2"), namespace);

 

       TestUtil.sleep(2000);

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
index 07bada53c48..2da128131af 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.HashSet;

 import java.util.List;

 import java.util.Set;

-import org.eclipse.osee.ats.config.AtsCache;

+import org.eclipse.osee.ats.config.AtsCacheManager;

 import org.eclipse.osee.ats.util.AtsFolderUtil;

 import org.eclipse.osee.ats.util.AtsRelation;

 import org.eclipse.osee.ats.util.AtsUtil;

@@ -51,7 +51,7 @@ public class ActionableItemArtifact extends Artifact {
    }

 

    public static List<ActionableItemArtifact> getActionableItems(Active active) throws OseeCoreException {

-      return AtsCache.getArtifactsByActive(active, ActionableItemArtifact.class);

+      return AtsCacheManager.getArtifactsByActive(active, ActionableItemArtifact.class);

    }

 

    public static String getNotActionableItemError(Artifact aia) {

@@ -74,7 +74,7 @@ public class ActionableItemArtifact extends Artifact {
    }

 

    public static List<ActionableItemArtifact> getActionableItems() throws OseeCoreException {

-      return AtsCache.getArtifactsByActive(Active.Both, ActionableItemArtifact.class);

+      return AtsCacheManager.getArtifactsByActive(Active.Both, ActionableItemArtifact.class);

    }

 

    public boolean isActionable() throws OseeCoreException {

@@ -84,7 +84,7 @@ public class ActionableItemArtifact extends Artifact {
    public static Set<ActionableItemArtifact> getActionableItems(Collection<String> actionableItemNames) throws OseeCoreException {

       Set<ActionableItemArtifact> aias = new HashSet<ActionableItemArtifact>();

       for (String actionableItemName : actionableItemNames) {

-         aias.addAll(AtsCache.getArtifactsByName(actionableItemName, ActionableItemArtifact.class));

+         aias.addAll(AtsCacheManager.getArtifactsByName(actionableItemName, ActionableItemArtifact.class));

       }

       return aias;

    }

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
index f9b9f7a1d48..03c6547992f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
@@ -19,7 +19,7 @@ import java.util.Set;
 import java.util.logging.Level;

 import org.eclipse.osee.ats.AtsPlugin;

 import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType;

-import org.eclipse.osee.ats.config.AtsCache;

+import org.eclipse.osee.ats.config.AtsCacheManager;

 import org.eclipse.osee.ats.util.AtsFolderUtil;

 import org.eclipse.osee.ats.util.AtsRelation;

 import org.eclipse.osee.ats.util.AtsUtil;

@@ -114,7 +114,7 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt
       for (ActionableItemArtifact aia : actionableItems) {

          addRelation(AtsRelation.TeamActionableItem_ActionableItem, aia);

       }

-      AtsCache.cache(this);

+      AtsCacheManager.cache(this);

    }

 

    public static Set<TeamDefinitionArtifact> getTopLevelTeamDefinitions(Active active) throws OseeCoreException {

@@ -189,7 +189,7 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt
    }

 

    public static List<TeamDefinitionArtifact> getTeamDefinitions(Active active) throws OseeCoreException {

-      return AtsCache.getArtifactsByActive(active, TeamDefinitionArtifact.class);

+      return AtsCacheManager.getArtifactsByActive(active, TeamDefinitionArtifact.class);

    }

 

    public static Set<TeamDefinitionArtifact> getTeamTopLevelDefinitions(Active active) throws OseeCoreException {

@@ -400,7 +400,7 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt
             (VersionArtifact) ArtifactTypeManager.addArtifact(VersionArtifact.ARTIFACT_NAME, AtsUtil.getAtsBranch(),

                   name);

       addRelation(AtsRelation.TeamDefinitionToVersion_Version, versionArt);

-      AtsCache.cache(versionArt);

+      AtsCacheManager.cache(versionArt);

       return versionArt;

    }

 

@@ -473,7 +473,7 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt
    public static Set<TeamDefinitionArtifact> getTeamDefinitions(Collection<String> teamDefNames) throws OseeCoreException {

       Set<TeamDefinitionArtifact> teamDefs = new HashSet<TeamDefinitionArtifact>();

       for (String teamDefName : teamDefNames) {

-         teamDefs.addAll(AtsCache.getArtifactsByName(teamDefName, TeamDefinitionArtifact.class));

+         teamDefs.addAll(AtsCacheManager.getArtifactsByName(teamDefName, TeamDefinitionArtifact.class));

       }

       return teamDefs;

    }

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
index e58eef0edc1..9e6ea819899 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
@@ -21,7 +21,7 @@ import java.util.logging.Level;
 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.nebula.widgets.xviewer.XViewerCells;

 import org.eclipse.osee.ats.AtsPlugin;

-import org.eclipse.osee.ats.config.AtsCache;

+import org.eclipse.osee.ats.config.AtsCacheManager;

 import org.eclipse.osee.ats.util.AtsRelation;

 import org.eclipse.osee.ats.util.AtsUtil;

 import org.eclipse.osee.ats.util.AtsPriority.PriorityType;

@@ -222,7 +222,7 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement
       String guid = this.getSoleAttributeValue(ATSAttributes.TEAM_DEFINITION_GUID_ATTRIBUTE.getStoreName(), "");

       if (guid == null || guid.equals("")) throw new IllegalArgumentException(

             "TeamWorkflow [" + getHumanReadableId() + "] has no TeamDefinition associated.");

-      return AtsCache.getTeamDefinitionArtifact(guid);

+      return AtsCacheManager.getTeamDefinitionArtifact(guid);

    }

 

    public String getTeamTitle() throws OseeCoreException {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java
index 7bccfa372d8..a4dfd876b75 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java
@@ -16,7 +16,7 @@ import java.util.HashSet;
 import java.util.Set;

 import java.util.logging.Level;

 import org.eclipse.osee.ats.AtsPlugin;

-import org.eclipse.osee.ats.config.AtsCache;

+import org.eclipse.osee.ats.config.AtsCacheManager;

 import org.eclipse.osee.ats.util.AtsRelation;

 import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact;

 import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist;

@@ -176,6 +176,6 @@ public class VersionArtifact extends Artifact implements ICommitConfigArtifact {
     * @return Version

     */

    public static VersionArtifact getSoleVersion(String name) throws OseeCoreException {

-      return AtsCache.getArtifactsByName(name, VersionArtifact.class).iterator().next();

+      return AtsCacheManager.getArtifactsByName(name, VersionArtifact.class).iterator().next();

    }

 }

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsBulkLoadCache.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsBulkLoadCache.java
index e225f3a22a4..49efff29291 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsBulkLoadCache.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsBulkLoadCache.java
@@ -72,7 +72,7 @@ public class AtsBulkLoadCache extends org.eclipse.core.runtime.jobs.Job {
                RelationManager.getRelatedArtifacts(Collections.singleton(headingArt), 8,

                      CoreRelationEnumeration.DEFAULT_HIERARCHICAL__CHILD, AtsRelation.TeamDefinitionToVersion_Version);

          for (Artifact artifact : artifacts) {

-            AtsCache.cache(artifact);

+            AtsCacheManager.cache(artifact);

          }

          WorkItemDefinitionFactory.loadDefinitions();

       } catch (Exception ex) {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCache.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java
index 59c2d3e645f..05cf5ec4715 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCache.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java
@@ -57,19 +57,19 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.
  * 

  * @author Donald G. Dunne

  */

-public class AtsCache implements IArtifactsPurgedEventListener, IFrameworkTransactionEventListener {

+public class AtsCacheManager implements IArtifactsPurgedEventListener, IFrameworkTransactionEventListener {

 

    private final Set<Artifact> cache = new HashSet<Artifact>();

    private final Map<String, ActionableItemArtifact> guidToActionableItem =

          new HashMap<String, ActionableItemArtifact>();

    private final Map<String, TeamDefinitionArtifact> guidToTeamDefinition =

          new HashMap<String, TeamDefinitionArtifact>();

-   private static final AtsCache instance = new AtsCache();

+   private static final AtsCacheManager instance = new AtsCacheManager();

    private static List<String> cacheTypes =

          Arrays.asList(ActionableItemArtifact.ARTIFACT_NAME, TeamDefinitionArtifact.ARTIFACT_NAME,

                VersionArtifact.ARTIFACT_NAME);

 

-   public AtsCache() {

+   public AtsCacheManager() {

       OseeEventManager.addListener(this);

    }

 

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java
index 7916d988a41..ea238f8cf8e 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java
@@ -40,7 +40,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionF
 /**
  * @author Donald G. Dunne
  */
-public class AtsConfig {
+public class AtsConfigManager {
 
    /**
     * This method creates a simple configuration of ATS given teamdef name, version names (if desired), actionable items
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java
index 6f66cb2ccdf..b8bf44656ad 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java
@@ -14,7 +14,7 @@ import java.util.Collection;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osee.ats.AtsPlugin;

-import org.eclipse.osee.ats.config.AtsConfig;

+import org.eclipse.osee.ats.config.AtsConfigManager;

 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;

 import org.eclipse.osee.framework.logging.OseeLevel;

 import org.eclipse.osee.framework.logging.OseeLog;

@@ -58,7 +58,7 @@ public class AtsConfigWizard extends Wizard implements INewWizard {
          Collection<String> aias = page1.getActionableItems();

          Collection<String> versionNames = page1.getVersions();

          String workflowId = page1.getWorkflowId();

-         AtsConfig.configureAtsForDefaultTeam(namespace, teamDefName, versionNames, aias, workflowId);

+         AtsConfigManager.configureAtsForDefaultTeam(namespace, teamDefName, versionNames, aias, workflowId);

       } catch (OseeCoreException ex) {

          OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);

          return false;

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java
index ad2c38de04b..1e5d1e09e89 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.ats.AtsImage;
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.VersionMetrics;
 import org.eclipse.osee.ats.util.VersionTeamMetrics;
@@ -73,7 +73,7 @@ public class FirstTimeQualityMetricReportItem extends XNavigateItemAction {
    public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException {
       TeamDefinitionArtifact useTeamDef = teamDef;
       if (useTeamDef == null && teamDefName != null) {
-         useTeamDef = AtsCache.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
+         useTeamDef = AtsCacheManager.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
       }
       if (useTeamDef == null) {
          TeamDefinitionDialog ld = new TeamDefinitionDialog("Select Team", "Select Team");
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java
index 1341f534db5..411504cfcfa 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.ats.util.VersionReportJob;
 import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog;
 import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist;
@@ -77,7 +77,7 @@ public class GenerateFullVersionReportItem extends XNavigateItemAction {
       if (teamDef != null) return teamDef;
       if (teamDefName != null && !teamDefName.equals("")) {
          try {
-            TeamDefinitionArtifact teamDef = AtsCache.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
+            TeamDefinitionArtifact teamDef = AtsCacheManager.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
             if (teamDef != null) return teamDef;
          } catch (ArtifactDoesNotExist ex) {
             // do nothing, going to get team below
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java
index 9873a071246..4efdbe17204 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.navigate;
 
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog;
 import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.db.connection.exception.MultipleAttributesExist;
@@ -62,7 +62,7 @@ public class MassEditTeamVersionItem extends XNavigateItemAction {
       if (teamDef != null) return teamDef;
       if (teamDefName != null && !teamDefName.equals("")) {
          try {
-            TeamDefinitionArtifact teamDef = AtsCache.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
+            TeamDefinitionArtifact teamDef = AtsCacheManager.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
             if (teamDef != null) return teamDef;
          } catch (ArtifactDoesNotExist ex) {
             // do nothing, going to get team below
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java
index 5ff0d9b1e7a..6d78b9e940d 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.ats.util.VersionReportJob;
 import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog;
 import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist;
@@ -73,7 +73,7 @@ public class PublishFullVersionReportItem extends XNavigateItemAction {
       TeamDefinitionArtifact useTeamDef = teamDef;
       if (useTeamDef == null && teamDefName != null) {
          try {
-            useTeamDef = AtsCache.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
+            useTeamDef = AtsCacheManager.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
          } catch (ArtifactDoesNotExist ex) {
             // do nothing, going to get team below
          }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
index b650f02c62f..f415258397c 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
@@ -28,7 +28,7 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkflowLabelProvider;
 import org.eclipse.osee.ats.artifact.VersionArtifact;
 import org.eclipse.osee.ats.config.AtsBulkLoadCache;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.ats.editor.SMAEditor;
 import org.eclipse.osee.ats.task.TaskEditor;
 import org.eclipse.osee.ats.task.TaskEditorSimpleProvider;
@@ -280,7 +280,7 @@ public class AtsUtil implements IAtsLib {
    public void createATSAction(String initialDescription, String actionableItemName) {
       // Ensure actionable item is configured for ATS before continuing
       try {
-         AtsCache.getSoleArtifactByName(actionableItemName, VersionArtifact.class);
+         AtsCacheManager.getSoleArtifactByName(actionableItemName, VersionArtifact.class);
       } catch (ArtifactDoesNotExist ex) {
          AWorkbench.popup(
                "Configuration Error",
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java
index f59567f79aa..26dd3d559ca 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.ats.artifact.ActionArtifact;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.artifact.VersionArtifact;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.ats.util.ActionManager;
 import org.eclipse.osee.ats.util.AtsNotifyUsers;
 import org.eclipse.osee.ats.util.AtsPriority;
@@ -155,7 +155,7 @@ public class ExcelAtsActionArtifactExtractor extends AbstractArtifactExtractor i
          else {
             for (String actionableItemName : aData.actionableItems) {
                try {
-                  if (AtsCache.getArtifactsByName(actionableItemName, ActionableItemArtifact.class).size() > 0) {
+                  if (AtsCacheManager.getArtifactsByName(actionableItemName, ActionableItemArtifact.class).size() > 0) {
                      rd.logError("Row " + rowNum + ": Couldn't find actionable item for \"" + actionableItemName + "\"");
                   }
                } catch (Exception ex) {
@@ -166,7 +166,7 @@ public class ExcelAtsActionArtifactExtractor extends AbstractArtifactExtractor i
          }
          if (!aData.version.equals("")) {
             try {
-               if (AtsCache.getSoleArtifactByName(aData.version, VersionArtifact.class) == null) {
+               if (AtsCacheManager.getSoleArtifactByName(aData.version, VersionArtifact.class) == null) {
                   rd.logError("Row " + rowNum + ": Can't find single version \"" + aData.version + "\"");
                }
             } catch (Exception ex) {
@@ -205,7 +205,7 @@ public class ExcelAtsActionArtifactExtractor extends AbstractArtifactExtractor i
                         ActionableItemArtifact.getActionableItems(aData.actionableItems), transaction);
             actionArts.add(actionArt);
             if (!aData.version.equals("")) {
-               VersionArtifact verArt = AtsCache.getSoleArtifactByName(aData.version, VersionArtifact.class);
+               VersionArtifact verArt = AtsCacheManager.getSoleArtifactByName(aData.version, VersionArtifact.class);
 
                for (TeamWorkFlowArtifact team : actionArt.getTeamWorkFlowArtifacts())
                   verArt.addRelation(AtsRelation.TeamWorkflowTargetedForVersion_Workflow, team);
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XActionableItemsDam.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XActionableItemsDam.java
index 6da93821f13..9a5d3a877c8 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XActionableItemsDam.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XActionableItemsDam.java
@@ -18,7 +18,7 @@ import java.util.logging.Level;
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.ATSAttributes;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -42,7 +42,7 @@ public class XActionableItemsDam extends XTextDam {
       Set<ActionableItemArtifact> ais = new HashSet<ActionableItemArtifact>();
       for (String guid : getActionableItemGuids()) {
          try {
-            ActionableItemArtifact aia = AtsCache.getActionableItemByGuid(guid);
+            ActionableItemArtifact aia = AtsCacheManager.getActionableItemByGuid(guid);
             if (aia == null)
                OseeLog.log(AtsPlugin.class, Level.SEVERE, "Can't find Actionable Item for guid " + guid);
             else
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ActionableItemWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ActionableItemWorldSearchItem.java
index 7add59fac95..d110c4e6400 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ActionableItemWorldSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ActionableItemWorldSearchItem.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.ats.AtsImage;
 import org.eclipse.osee.ats.artifact.ATSAttributes;
 import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.widgets.dialog.ActionActionableItemListDialog;
 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
@@ -87,7 +87,7 @@ public class ActionableItemWorldSearchItem extends WorldUISearchItem {
    public void getActionableItems() throws OseeCoreException {
       if (actionItemNames != null && actionItems == null) {
          for (String actionItemName : actionItemNames) {
-            ActionableItemArtifact aia = AtsCache.getSoleArtifactByName(actionItemName, ActionableItemArtifact.class);
+            ActionableItemArtifact aia = AtsCacheManager.getSoleArtifactByName(actionItemName, ActionableItemArtifact.class);
             if (aia != null) {
                actionItems.add(aia);
             }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
index 9f8868df6c1..96366b1f8a7 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.artifact.VersionArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState;
-import org.eclipse.osee.ats.config.AtsCache;
+import org.eclipse.osee.ats.config.AtsCacheManager;
 import org.eclipse.osee.ats.util.AtsRelation;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
@@ -119,7 +119,7 @@ public class TeamWorldSearchItem extends WorldUISearchItem {
       if (teamDefNames != null && teamDefs == null) {
          teamDefs = new HashSet<TeamDefinitionArtifact>();
          for (String teamDefName : teamDefNames) {
-            TeamDefinitionArtifact aia = AtsCache.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
+            TeamDefinitionArtifact aia = AtsCacheManager.getSoleArtifactByName(teamDefName, TeamDefinitionArtifact.class);
             if (aia != null) {
                teamDefs.add(aia);
             }