feature: WorkDef - Allow Resolution options to be turned off via osee_info

5 files changed, 35 insertions, 1 deletions

diff --git a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF
index 81862e6042f..fff22e3026b 100644
--- a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@ Import-Package: com.google.inject,
  org.eclipse.osee.framework.core.operation,
  org.eclipse.osee.framework.core.services,
  org.eclipse.osee.framework.core.util,
+ org.eclipse.osee.framework.database.core,
  org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.framework.jdk.core.util,
  org.eclipse.osee.framework.jdk.core.util.xml,
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskArtifact.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskArtifact.java
index 3aa63b07f9d..1051a6c2db5 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskArtifact.java
@@ -17,6 +17,7 @@ import org.eclipse.osee.ats.core.team.TeamState;
 import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.type.AtsAttributeTypes;
 import org.eclipse.osee.ats.core.type.AtsRelationTypes;
+import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.workdef.StateDefinition;
 import org.eclipse.osee.ats.core.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.workflow.EstimatedHoursUtil;
@@ -53,10 +54,13 @@ public class TaskArtifact extends AbstractWorkflowArtifact implements IATSStateM
    }
 
    public boolean isUsingTaskResolutionOptions() throws OseeCoreException {
-      return getTaskResolutionOptionDefintions().size() > 0;
+      return AtsUtilCore.isAtsUsingResolutionOptions() && getTaskResolutionOptionDefintions().size() > 0;
    }
 
    public List<TaskResOptionDefinition> getTaskResolutionOptionDefintions() throws OseeCoreException {
+      if (!AtsUtilCore.isAtsUsingResolutionOptions()) {
+         return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
+      }
       TeamWorkFlowArtifact team = getParentTeamWorkflow();
       if (team == null) {
          return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
@@ -65,6 +69,9 @@ public class TaskArtifact extends AbstractWorkflowArtifact implements IATSStateM
    }
 
    public TaskResOptionDefinition getTaskResolutionOptionDefinition(String optionName) throws OseeCoreException {
+      if (!AtsUtilCore.isAtsUsingResolutionOptions()) {
+         return null;
+      }
       for (TaskResOptionDefinition def : getTaskResolutionOptionDefintions()) {
          if (def.getName().equals(optionName)) {
             return def;
@@ -74,6 +81,9 @@ public class TaskArtifact extends AbstractWorkflowArtifact implements IATSStateM
    }
 
    public List<TaskResOptionDefinition> getTaskResolutionOptionDefintions(String stateName) throws OseeCoreException {
+      if (!AtsUtilCore.isAtsUsingResolutionOptions()) {
+         return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
+      }
       TeamWorkFlowArtifact team = getParentTeamWorkflow();
       if (team == null) {
          return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
@@ -82,6 +92,9 @@ public class TaskArtifact extends AbstractWorkflowArtifact implements IATSStateM
    }
 
    public TaskResOptionDefinition getTaskResolutionOptionDefinition(String stateName, String optionName) throws OseeCoreException {
+      if (!AtsUtilCore.isAtsUsingResolutionOptions()) {
+         return null;
+      }
       for (TaskResOptionDefinition def : getTaskResolutionOptionDefintions(stateName)) {
          if (def.getName().equals(optionName)) {
             return def;
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java
index 23f79c2063d..55ace834380 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java
@@ -46,6 +46,9 @@ public class TaskResolutionOptionRule {
       new HashMap<StateDefinition, List<TaskResOptionDefinition>>();
 
    public static List<TaskResOptionDefinition> getTaskResolutionOptions(StateDefinition stateDefinition) throws OseeCoreException {
+      if (!AtsUtilCore.isAtsUsingResolutionOptions()) {
+         return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
+      }
       if (!stateDefToTaskResOptDefCache.containsKey(stateDefinition)) {
          TaskResolutionOptionRule taskResolutionOptionRule = getTaskResolutionOptionRule(stateDefinition);
          if (taskResolutionOptionRule != null) {
@@ -58,6 +61,9 @@ public class TaskResolutionOptionRule {
    }
 
    public static TaskResolutionOptionRule getTaskResolutionOptionRule(StateDefinition stateDefinition) throws OseeCoreException {
+      if (!AtsUtilCore.isAtsUsingResolutionOptions()) {
+         return null;
+      }
       List<RuleDefinition> wids = new ArrayList<RuleDefinition>();
       for (RuleDefinition ruleDef : stateDefinition.getRules()) {
          if (ruleDef.getName().contains("taskResolutionOptions")) {
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 57313e3dfbe..d35b6e469fe 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
@@ -23,6 +23,7 @@ import org.eclipse.osee.framework.core.enums.Active;
 import org.eclipse.osee.framework.core.enums.CoreBranches;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.database.core.OseeInfo;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -48,6 +49,17 @@ public class AtsUtilCore {
    private static List<IEventFilter> atsObjectEventFilter = new ArrayList<IEventFilter>(2);
    private static boolean emailEnabled = true;
 
+   /**
+    * Is ATS using Resolution Options
+    */
+   public static boolean isAtsUsingResolutionOptions() throws OseeCoreException {
+      return OseeInfo.isBoolean("AtsUsingResolutionOptions");
+   }
+
+   public static void setAtsUsingResolutionOptions(boolean set) throws OseeCoreException {
+      OseeInfo.setBoolean("AtsUsingResolutionOptions", true);
+   }
+
    public static boolean isEmailEnabled() {
       return emailEnabled;
    }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
index d81f06c515a..4f203bf670b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
@@ -15,6 +15,7 @@ import org.eclipse.osee.ats.core.config.AtsArtifactToken;
 import org.eclipse.osee.ats.core.config.TeamDefinitionManager;
 import org.eclipse.osee.ats.core.type.AtsAttributeTypes;
 import org.eclipse.osee.ats.core.util.AtsGroup;
+import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.workdef.WorkDefinitionFactory;
 import org.eclipse.osee.ats.core.workflow.ActionableItemManagerCore;
 import org.eclipse.osee.ats.util.AtsUtil;
@@ -32,6 +33,7 @@ public class AtsDatabaseConfig implements IDbInitializationTask {
 
    @Override
    public void run() throws OseeCoreException {
+      AtsUtilCore.setAtsUsingResolutionOptions(false);
       createAtsFolders();
 
       AtsWorkDefinitionSheetProviders.initializeDatabase(new XResultData(false), false);