feature[ats_ATS34674]: Add configurable ATS Branch

Change-Id: I8d43a571176ce40de53dfe2225240decc0098277

1 files changed, 11 insertions, 1 deletions

diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsUtilCore.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsUtilCore.java
index 689e50a0d54..71ea509be3a 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsUtilCore.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsUtilCore.java
@@ -13,7 +13,9 @@ package org.eclipse.osee.ats.core.util;
 import org.eclipse.osee.ats.api.IAtsWorkItem;
 import org.eclipse.osee.ats.api.workflow.IAttribute;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.TokenFactory;
 import org.eclipse.osee.framework.core.enums.CoreBranches;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.orcs.data.ArtifactId;
 import org.eclipse.osee.orcs.data.AttributeId;
 
@@ -23,9 +25,17 @@ import org.eclipse.osee.orcs.data.AttributeId;
 public class AtsUtilCore {
 
    public final static double DEFAULT_HOURS_PER_WORK_DAY = 8;
+   private static IOseeBranch commonBranch = null;
 
    public static IOseeBranch getAtsBranch() {
-      return CoreBranches.COMMON;
+      if (commonBranch == null) {
+         if (Strings.isValid(System.getProperty("ats.branch"))) {
+            commonBranch = TokenFactory.createBranch(Long.valueOf(System.getProperty("ats.branch")), "ATS Branch");
+         } else {
+            commonBranch = CoreBranches.COMMON;
+         }
+      }
+      return commonBranch;
    }
 
    public static boolean isInTest() {