refactor: Replace usage of Branch with IOseeBranch where possible

3 files changed, 7 insertions, 11 deletions

diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java
index b31ea750dff..e68512e7b41 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java
@@ -131,8 +131,6 @@ public class PopulateDemoActions extends XNavigateItemAction {
 
          SevereLoggingMonitor monitorLog = TestUtil.severeLoggingStart();
 
-         Branch saw1Branch = BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1);
-
          // Import all requirements on SAW_Bld_1 Branch
          demoDbImportReqsTx();
 
@@ -140,8 +138,8 @@ public class PopulateDemoActions extends XNavigateItemAction {
 
          // Create traceability between System, Subsystem and Software requirements
          SkynetTransaction demoDbTraceability =
-            new SkynetTransaction(saw1Branch, "Populate Demo DB - Create Traceability");
-         demoDbTraceabilityTx(demoDbTraceability, saw1Branch);
+            new SkynetTransaction(DemoSawBuilds.SAW_Bld_1, "Populate Demo DB - Create Traceability");
+         demoDbTraceabilityTx(demoDbTraceability, DemoSawBuilds.SAW_Bld_1);
          demoDbTraceability.execute();
 
          DemoDbUtil.sleep(5000);
@@ -207,9 +205,8 @@ public class PopulateDemoActions extends XNavigateItemAction {
       try {
          OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating SAW_Bld_2 branch off SAW_Bld_1");
          // Create SAW_Bld_2 branch off SAW_Bld_1
-         Branch parentBranch = BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid());
          Branch childBranch =
-            BranchManager.createBaselineBranch(parentBranch, DemoSawBuilds.SAW_Bld_2,
+            BranchManager.createBaselineBranch(DemoSawBuilds.SAW_Bld_1, DemoSawBuilds.SAW_Bld_2,
                UserManager.getUser(SystemUser.OseeSystem));
 
          DemoDbUtil.sleep(5000);
@@ -500,7 +497,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
       }
    }
 
-   private void demoDbTraceabilityTx(SkynetTransaction transaction, Branch branch) {
+   private void demoDbTraceabilityTx(SkynetTransaction transaction, IOseeBranch branch) {
       try {
          Collection<Artifact> systemArts =
             DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SystemRequirement, "Robot", branch);
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java
index de2804a7d40..375f1fbd183 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java
@@ -15,7 +15,6 @@ import org.eclipse.osee.ats.config.demo.DemoSubsystems;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.database.init.IDbInitializationTask;
 import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -47,8 +46,7 @@ public class DemoDatabaseConfig implements IDbInitializationTask {
 
    }
 
-   private void populateProgramBranch(IOseeBranch branch) throws OseeCoreException {
-      Branch programBranch = BranchManager.getBranch(branch);
+   private void populateProgramBranch(IOseeBranch programBranch) throws OseeCoreException {
       Artifact sawProduct =
          ArtifactTypeManager.addArtifact(CoreArtifactTypes.Component, programBranch, "SAW Product Decomposition");
 
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java
index a7a44a9f07d..323d608ad9a 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java
@@ -19,6 +19,7 @@ import org.eclipse.osee.ats.config.demo.internal.OseeAtsConfigDemoActivator;
 import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
@@ -79,7 +80,7 @@ public class DemoDbUtil {
       return getArtTypeRequirements(CoreArtifactTypes.SoftwareRequirement, str.name(), branch);
    }
 
-   public static Collection<Artifact> getArtTypeRequirements(IArtifactType artifactType, String artifactNameStr, Branch branch) throws OseeCoreException {
+   public static Collection<Artifact> getArtTypeRequirements(IArtifactType artifactType, String artifactNameStr, IOseeBranch branch) throws OseeCoreException {
       OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO,
          "Getting \"" + artifactNameStr + "\" requirement(s) from Branch " + branch.getName());
       Collection<Artifact> arts =