refactor: Clean-up AtsConfigManager construction

3 files changed, 43 insertions, 44 deletions

diff --git a/plugins/org.eclipse.osee.ats/plugin.xml b/plugins/org.eclipse.osee.ats/plugin.xml
index 63770156741..6161c9c35da 100644
--- a/plugins/org.eclipse.osee.ats/plugin.xml
+++ b/plugins/org.eclipse.osee.ats/plugin.xml
@@ -9,7 +9,6 @@
    <extension-point id="AtsHealthCheck" name="AtsHealthCheck" schema="schema/AtsHealthCheck.exsd"/>
    <extension-point id="AtsAdvancedOperationAction" name="AtsAdvancedOperationAction" schema="schema/AtsAdvancedOperationAction.exsd"/>
    <extension-point id="AtsMenuAction" name="AtsMenuAction" schema="schema/AtsMenuAction.exsd"/>
-   <extension-point id="AtsWorkDefinitionProvider" name="AtsWorkDefinitionProvider" schema="schema/AtsWorkDefinitionProvider.exsd"/>
    <extension-point id="AtsWorkDefinitionSheetProvider" name="AtsWorkDefinitionSheetProvider" schema="schema/AtsWorkDefinitionSheetProvider.exsd"/>
          <extension
          point="org.eclipse.ui.editors">
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java
index 46648199743..5972583ddbf 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java
@@ -15,10 +15,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osee.ats.AtsOpenOption;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
@@ -40,19 +36,11 @@ import org.eclipse.osee.ats.workdef.provider.AtsWorkDefinitionProvider;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.core.operation.IOperation;
 import org.eclipse.osee.framework.core.util.XResultData;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.plugin.core.util.Jobs;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.ui.progress.UIJob;
 
 /**
  * This class creates a simple configuration of ATS given team definition name, version names (if desired), actionable
@@ -202,8 +190,7 @@ public class AtsConfigManager extends AbstractOperation {
       return workDef;
    }
 
-   public static WorkDefinition generateDefaultWorkflow(String name, XResultData resultData, SkynetTransaction transaction, TeamDefinitionArtifact teamDef) throws OseeCoreException {
-
+   private WorkDefinition generateDefaultWorkflow(String name, XResultData resultData, SkynetTransaction transaction, TeamDefinitionArtifact teamDef) throws OseeCoreException {
       WorkDefinition defaultWorkDef =
          WorkDefinitionFactory.getWorkDefinition(AtsWorkDefinitionSheetProviders.WORK_DEF_TEAM_DEFAULT).getWorkDefinition();
 
@@ -218,34 +205,6 @@ public class AtsConfigManager extends AbstractOperation {
       newWorkDef.getIds().add(name);
       newWorkDef.setName(name);
       return newWorkDef;
-
-   }
-
-   public static final class OpenAtsConfigEditors implements Display {
-
-      @Override
-      public void openAtsConfigurationEditors(final TeamDefinitionArtifact teamDef, final Collection<ActionableItemArtifact> aias, final WorkDefinition workDefinition) {
-         Job job = new UIJob("Open Ats Configuration Editors") {
-            @Override
-            public IStatus runInUIThread(IProgressMonitor monitor) {
-               AtsUtil.openATSAction(teamDef, AtsOpenOption.OpenAll);
-               for (ActionableItemArtifact aia : aias) {
-                  AtsUtil.openATSAction(aia, AtsOpenOption.OpenAll);
-               }
-               try {
-                  RendererManager.open(ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.WorkDefinition,
-                     workDefinition.getName(), AtsUtil.getAtsBranch()), PresentationType.SPECIALIZED_EDIT, monitor);
-               } catch (OseeCoreException ex) {
-                  OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-               }
-               return Status.OK_STATUS;
-            }
-         };
-         Jobs.startJob(job, true);
-      }
    }
 
-   public static IOperation createAtsConfigOperation(String name, String teamDefName, Collection<String> versionNames, Collection<String> actionableItems) {
-      return new AtsConfigManager(new OpenAtsConfigEditors(), name, teamDefName, versionNames, actionableItems);
-   }
 }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java
index ce2f6d3b714..b7f1c4eba3e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java
@@ -11,17 +11,33 @@
 package org.eclipse.osee.ats.config.wizard;
 
 import java.util.Collection;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.osee.ats.AtsOpenOption;
+import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.config.AtsConfigManager;
+import org.eclipse.osee.ats.config.AtsConfigManager.Display;
+import org.eclipse.osee.ats.core.client.config.ActionableItemArtifact;
+import org.eclipse.osee.ats.core.client.config.TeamDefinitionArtifact;
+import org.eclipse.osee.ats.core.workdef.WorkDefinition;
 import org.eclipse.osee.ats.internal.Activator;
+import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.operation.IOperation;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.plugin.core.util.Jobs;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.progress.UIJob;
 
 /**
  * Create new new .shape-file. Those files can be used with the ShapesEditor (see plugin.xml).
@@ -50,7 +66,8 @@ public class AtsConfigWizard extends Wizard implements INewWizard {
          Collection<String> versionNames = page1.getVersions();
          String workDefName = page1.getWorkDefinitionName();
 
-         IOperation operation = AtsConfigManager.createAtsConfigOperation(workDefName, teamDefName, versionNames, aias);
+         AtsConfigManager.Display display = new OpenAtsConfigEditors();
+         IOperation operation = new AtsConfigManager(display, workDefName, teamDefName, versionNames, aias);
          Operations.executeAsJob(operation, true);
 
       } catch (OseeCoreException ex) {
@@ -59,4 +76,28 @@ public class AtsConfigWizard extends Wizard implements INewWizard {
       }
       return true;
    }
+
+   private static final class OpenAtsConfigEditors implements Display {
+
+      @Override
+      public void openAtsConfigurationEditors(final TeamDefinitionArtifact teamDef, final Collection<ActionableItemArtifact> aias, final WorkDefinition workDefinition) {
+         Job job = new UIJob("Open Ats Configuration Editors") {
+            @Override
+            public IStatus runInUIThread(IProgressMonitor monitor) {
+               AtsUtil.openATSAction(teamDef, AtsOpenOption.OpenAll);
+               for (ActionableItemArtifact aia : aias) {
+                  AtsUtil.openATSAction(aia, AtsOpenOption.OpenAll);
+               }
+               try {
+                  RendererManager.open(ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.WorkDefinition,
+                     workDefinition.getName(), AtsUtil.getAtsBranch()), PresentationType.SPECIALIZED_EDIT, monitor);
+               } catch (OseeCoreException ex) {
+                  OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+               }
+               return Status.OK_STATUS;
+            }
+         };
+         Jobs.startJob(job, true);
+      }
+   }
 }