"Team Workflow" - M46QV - "Enable "Check Signals" to work for V13"

3 files changed, 10 insertions, 15 deletions

diff --git a/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigDemoDatabaseConfig.java b/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigDemoDatabaseConfig.java
index 5b6db4f7b01..e0ce49dc35f 100644
--- a/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigDemoDatabaseConfig.java
+++ b/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigDemoDatabaseConfig.java
@@ -138,8 +138,7 @@ public class AtsConfigDemoDatabaseConfig extends DbInitializationTask {
             SawBuilds.SAW_Bld_3.name()}) {
          VersionArtifact ver =
                (VersionArtifact) ConfigurationPersistenceManager.getInstance().getArtifactSubtypeDescriptor(
-                     VersionArtifact.ARTIFACT_NAME).makeNewArtifact(
-                     BranchPersistenceManager.getInstance().getAtsBranch());
+                     VersionArtifact.ARTIFACT_NAME).makeNewArtifact(BranchPersistenceManager.getAtsBranch());
          ver.setDescriptiveName(verName);
          if (verName.contains("1")) ver.setReleased(true);
          if (verName.contains("2")) ver.setSoleBooleanAttributeValue(
@@ -153,8 +152,7 @@ public class AtsConfigDemoDatabaseConfig extends DbInitializationTask {
             CISBuilds.CIS_Bld_3.name()}) {
          VersionArtifact ver =
                (VersionArtifact) ConfigurationPersistenceManager.getInstance().getArtifactSubtypeDescriptor(
-                     VersionArtifact.ARTIFACT_NAME).makeNewArtifact(
-                     BranchPersistenceManager.getInstance().getAtsBranch());
+                     VersionArtifact.ARTIFACT_NAME).makeNewArtifact(BranchPersistenceManager.getAtsBranch());
          ver.setDescriptiveName(verName);
          if (verName.contains("1")) ver.setReleased(true);
          if (verName.contains("2")) ver.setSoleBooleanAttributeValue(
diff --git a/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/PopulateDemoActions.java b/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/PopulateDemoActions.java
index 24c3cff73af..460256a1d34 100644
--- a/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/PopulateDemoActions.java
+++ b/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/PopulateDemoActions.java
@@ -87,28 +87,25 @@ public class PopulateDemoActions extends XNavigateItemAction {
             Display.getCurrent().getActiveShell(), getName(), getName()))) {
          try {
 
-            setDefaultBranch(BranchPersistenceManager.getInstance().getKeyedBranch(SawBuilds.SAW_Bld_1.name()));
+            setDefaultBranch(BranchPersistenceManager.getKeyedBranch(SawBuilds.SAW_Bld_1.name()));
 
             // Import all requirements on SAW_Bld_1 Branch
             ImportRequirementsTx importTx =
-                  new ImportRequirementsTx(BranchPersistenceManager.getInstance().getAtsBranch(),
-                        !SkynetDbInit.isDbInit());
+                  new ImportRequirementsTx(BranchPersistenceManager.getAtsBranch(), !SkynetDbInit.isDbInit());
             importTx.execute();
 
             sleep(5000);
 
             // Create traceability between System, Subsystem and Software requirements
             CreateTraceabilityTx traceTx =
-                  new CreateTraceabilityTx(BranchPersistenceManager.getInstance().getAtsBranch(),
-                        !SkynetDbInit.isDbInit());
+                  new CreateTraceabilityTx(BranchPersistenceManager.getAtsBranch(), !SkynetDbInit.isDbInit());
             traceTx.execute();
 
             sleep(5000);
 
             // Create SAW_Bld_2 Child Main Working Branch off SAW_Bld_1
             CreateMainWorkingBranchTx saw2BranchTx =
-                  new CreateMainWorkingBranchTx(BranchPersistenceManager.getInstance().getAtsBranch(),
-                        !SkynetDbInit.isDbInit());
+                  new CreateMainWorkingBranchTx(BranchPersistenceManager.getAtsBranch(), !SkynetDbInit.isDbInit());
             saw2BranchTx.execute();
 
             // Create SAW_Bld_2 Actions 
@@ -302,7 +299,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
    }
 
    private Branch createChildMainWorkingBranch(String parentBrachName, String childBranchName) throws Exception {
-      Branch parentBranch = BranchPersistenceManager.getInstance().getKeyedBranch(parentBrachName);
+      Branch parentBranch = BranchPersistenceManager.getKeyedBranch(parentBrachName);
 
       Branch childBranch =
             BranchPersistenceManager.getInstance().createWorkingBranch(
@@ -499,7 +496,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
 
       OSEELog.logInfo(OseeAtsConfigDemoPlugin.class,
             "Importing \"" + rootArtifactName + "\" requirements on branch \"" + buildName + "\"", false);
-      Branch branch = BranchPersistenceManager.getInstance().getKeyedBranch(buildName);
+      Branch branch = BranchPersistenceManager.getKeyedBranch(buildName);
       ArtifactTypeNameSearch srch = new ArtifactTypeNameSearch("Folder", rootArtifactName, branch);
       Artifact systemReq = srch.getSingletonArtifactOrException(Artifact.class);
       File file = OseeAtsConfigDemoPlugin.getInstance().getPluginFile(filename);
@@ -536,7 +533,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
                if (versionStr != null && !versionStr.equals("")) {
                   VersionArtifact verArt =
                         ((new ArtifactTypeNameSearch(VersionArtifact.ARTIFACT_NAME, versionStr,
-                              BranchPersistenceManager.getInstance().getAtsBranch())).getSingletonArtifactOrException(VersionArtifact.class));
+                              BranchPersistenceManager.getAtsBranch())).getSingletonArtifactOrException(VersionArtifact.class));
                   teamWf.relate(RelationSide.TeamWorkflowTargetedForVersion_Version, verArt);
                   teamWf.persist(true);
                }
diff --git a/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/util/DemoTeams.java b/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/util/DemoTeams.java
index f74f8743d40..ebfa3b649cf 100644
--- a/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/util/DemoTeams.java
+++ b/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/util/DemoTeams.java
@@ -43,7 +43,7 @@ public class DemoTeams {
       if (DatabaseActivator.getInstance().isProductionDb()) return null;
       try {
          return (new ArtifactTypeNameSearch(TeamDefinitionArtifact.ARTIFACT_NAME, team.name().replaceAll("_", " "),
-               BranchPersistenceManager.getInstance().getAtsBranch())).getSingletonArtifactOrException(TeamDefinitionArtifact.class);
+               BranchPersistenceManager.getAtsBranch())).getSingletonArtifactOrException(TeamDefinitionArtifact.class);
       } catch (Exception ex) {
          OSEELog.logException(OseeAtsConfigDemoPlugin.class, ex, false);
       }