feature: WorkDef - Removed legacy WorkItemDefinition code

5 files changed, 81 insertions, 44 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 baf62a86b9c..6e492f188bb 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
@@ -83,7 +83,6 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
 import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportOperationFactory;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
 import org.eclipse.osee.framework.ui.swt.Displays;
 import org.eclipse.osee.support.test.util.DemoArtifactTypes;
 import org.eclipse.osee.support.test.util.DemoSawBuilds;
@@ -151,7 +150,6 @@ public class PopulateDemoActions extends XNavigateItemAction {
          OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Populate Demo Database");
 
          AtsBulkLoad.reloadConfig(true);
-         WorkItemDefinitionFactory.loadDefinitions(true);
 
          SevereLoggingMonitor monitorLog = TestUtil.severeLoggingStart();
 
@@ -366,8 +364,8 @@ public class PopulateDemoActions extends XNavigateItemAction {
    private void importRequirements(IOseeBranch branch, String rootArtifactName, IArtifactType requirementType, String filename) throws Exception {
 
       if (DEBUG) {
-         OseeLog.logf(OseeAtsConfigDemoActivator.class, Level.INFO,
-            "Importing \"%s\" requirements on branch \"%s\"", rootArtifactName, branch);
+         OseeLog.logf(OseeAtsConfigDemoActivator.class, Level.INFO, "Importing \"%s\" requirements on branch \"%s\"",
+            rootArtifactName, branch);
       }
       Artifact systemReq = ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.Folder, rootArtifactName, branch);
 
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java
index aae10232228..03550edfa78 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java
@@ -63,10 +63,18 @@ public class PopulateSawBuild2Actions {
       SkynetTransaction transaction =
          new SkynetTransaction(AtsUtil.getAtsBranch(), "Populate Demo DB - PopulateSawBuild2Actions");
 
-      ActionArtifact committedAction = createCommittedAction(transaction);
-      ActionArtifact unCommittedAction = createUnCommittedAction(transaction);
-      createNoBranchAction(transaction);
-      ActionArtifact conflictedAction = createUnCommittedConflictedAction(transaction);
+      // SawBuild2Action1
+      ActionArtifact committedAction = sawBuild2Action1_createCommittedAction(transaction);
+
+      // SawBuild2Action2
+      ActionArtifact unCommittedAction = sawBuild2Action2_createUnCommittedAction(transaction);
+
+      // SawBuild2Action3
+      sawBuild2Action3_createNoBranchAction(transaction);
+
+      // SawBuild2Action4
+      ActionArtifact conflictedAction = sawBuild2Action4_createUnCommittedConflictedAction(transaction);
+
       transaction.execute();
 
       // Sleep to wait for the persist of the actions
@@ -83,7 +91,7 @@ public class PopulateSawBuild2Actions {
 
    }
 
-   private static ActionArtifact createUnCommittedConflictedAction(SkynetTransaction transaction) throws OseeCoreException {
+   private static ActionArtifact sawBuild2Action4_createUnCommittedConflictedAction(SkynetTransaction transaction) throws OseeCoreException {
       String title = "SAW (uncommitted-conflicted) More Requirement Changes for Diagram View";
       Collection<ActionableItemArtifact> aias =
          DemoDbUtil.getActionableItems(new String[] {DemoDbAIs.SAW_Requirements.getAIName()});
@@ -121,7 +129,7 @@ public class PopulateSawBuild2Actions {
       return actionArt;
    }
 
-   private static ActionArtifact createNoBranchAction(SkynetTransaction transaction) throws OseeCoreException {
+   private static ActionArtifact sawBuild2Action3_createNoBranchAction(SkynetTransaction transaction) throws OseeCoreException {
       String title = "SAW (no-branch) Even More Requirement Changes for Diagram View";
       Collection<ActionableItemArtifact> aias =
          DemoDbUtil.getActionableItems(new String[] {
@@ -149,6 +157,10 @@ public class PopulateSawBuild2Actions {
                throw new OseeCoreException("Error transitioning [%s] to Analyze state: [%s]", teamWf.toStringWithId(),
                   toState.getPageName(), result.getText());
             }
+            if (ReviewManager.getReviews(teamWf).size() != 1) {
+               throw new OseeCoreException(
+                  "Error, 1 review should have been created instead of " + ReviewManager.getReviews(teamWf).size());
+            }
             // set reviews to non-blocking
             for (AbstractReviewArtifact reviewArt : ReviewManager.getReviews(teamWf)) {
                reviewArt.setSoleAttributeValue(AtsAttributeTypes.ReviewBlocks, ReviewBlockType.None.name());
@@ -160,6 +172,11 @@ public class PopulateSawBuild2Actions {
                throw new OseeCoreException("Error transitioning [%s] to Authorize state: [%s]",
                   teamWf.toStringWithId(), toState.getPageName(), result.getText());
             }
+            if (ReviewManager.getReviews(teamWf).size() != 2) {
+               throw new OseeCoreException("Error, 2 reviews should exist instead of " + ReviewManager.getReviews(
+                  teamWf).size());
+            }
+
             // set reviews to non-blocking
             for (AbstractReviewArtifact reviewArt : ReviewManager.getReviews(teamWf)) {
                reviewArt.setSoleAttributeValue(AtsAttributeTypes.ReviewBlocks, ReviewBlockType.None.name());
@@ -186,7 +203,7 @@ public class PopulateSawBuild2Actions {
       return actionArt;
    }
 
-   private static ActionArtifact createUnCommittedAction(SkynetTransaction transaction) throws OseeCoreException {
+   private static ActionArtifact sawBuild2Action2_createUnCommittedAction(SkynetTransaction transaction) throws OseeCoreException {
       String title = "SAW (uncommitted) More Reqt Changes for Diagram View";
       Collection<ActionableItemArtifact> aias =
          DemoDbUtil.getActionableItems(new String[] {
@@ -215,6 +232,10 @@ public class PopulateSawBuild2Actions {
                throw new OseeCoreException("Error transitioning [%s] to Analyze state: [%s]", teamWf.toStringWithId(),
                   toState.getPageName(), result.getText());
             }
+            if (ReviewManager.getReviews(teamWf).size() != 1) {
+               throw new OseeCoreException(
+                  "Error, 1 review should have been created instead of " + ReviewManager.getReviews(teamWf).size());
+            }
             // set reviews to non-blocking
             for (AbstractReviewArtifact reviewArt : ReviewManager.getReviews(teamWf)) {
                reviewArt.setSoleAttributeValue(AtsAttributeTypes.ReviewBlocks, ReviewBlockType.None.name());
@@ -226,6 +247,11 @@ public class PopulateSawBuild2Actions {
                throw new OseeCoreException("Error transitioning [%s] to Authorize state: [%s]",
                   teamWf.toStringWithId(), toState.getPageName(), result.getText());
             }
+            if (ReviewManager.getReviews(teamWf).size() != 2) {
+               throw new OseeCoreException("Error, 2 reviews should exist instead of " + ReviewManager.getReviews(
+                  teamWf).size());
+            }
+
             // set reviews to non-blocking
             for (AbstractReviewArtifact reviewArt : ReviewManager.getReviews(teamWf)) {
                reviewArt.setSoleAttributeValue(AtsAttributeTypes.ReviewBlocks, ReviewBlockType.None.name());
@@ -254,7 +280,7 @@ public class PopulateSawBuild2Actions {
       return actionArt;
    }
 
-   private static ActionArtifact createCommittedAction(SkynetTransaction transaction) throws OseeCoreException {
+   private static ActionArtifact sawBuild2Action1_createCommittedAction(SkynetTransaction transaction) throws OseeCoreException {
       String title = "SAW (committed) Reqt Changes for Diagram View";
       Collection<ActionableItemArtifact> aias =
          DemoDbUtil.getActionableItems(new String[] {
@@ -270,6 +296,24 @@ public class PopulateSawBuild2Actions {
             null, aias, createdDate, createdBy, null, transaction);
       for (TeamWorkFlowArtifact teamWf : ActionManager.getTeams(actionArt)) {
 
+         if (teamWf.getTeamDefinition().getName().contains("Req") && !teamWf.getWorkDefinition().getName().equals(
+            "WorkDef_Team_Demo_Req")) {
+            throw new OseeCoreException("Req workflow expected work def [WorkDef_Team_Demo_Req] actual [%s]",
+               teamWf.getWorkDefinition().getName());
+         } else if (teamWf.getTeamDefinition().getName().contains("Code") && !teamWf.getWorkDefinition().getName().equals(
+            "WorkDef_Team_Demo_Code")) {
+            throw new OseeCoreException("Code workflow expected work def [WorkDef_Team_Demo_Code] actual [%s]",
+               teamWf.getWorkDefinition().getName());
+         } else if (teamWf.getTeamDefinition().getName().contains("Test") && !teamWf.getWorkDefinition().getName().equals(
+            "WorkDef_Team_Demo_Test")) {
+            throw new OseeCoreException("Test workflow expected work def [WorkDef_Team_Demo_Test] actual [%s]",
+               teamWf.getWorkDefinition().getName());
+         } else if (teamWf.getTeamDefinition().getName().contains("Design") && !teamWf.getWorkDefinition().getName().equals(
+            "WorkDef_Team_Demo_SwDesign")) {
+            throw new OseeCoreException("SwDesign workflow expected work def [WorkDef_Team_Demo_SwDesign] actual [%s]",
+               teamWf.getWorkDefinition().getName());
+         }
+
          TeamWorkFlowManager dtwm =
             new TeamWorkFlowManager(teamWf, TransitionOption.OverrideAssigneeCheck,
                TransitionOption.OverrideTransitionValidityCheck);
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java
index 1963da8c8d7..8c7e6e861a8 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java
@@ -18,7 +18,7 @@ import java.util.Set;
 import org.eclipse.osee.ats.core.config.ActionableItemArtifact;
 import org.eclipse.osee.ats.core.team.TeamState;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.UserCommunity;
+import org.eclipse.osee.framework.ui.skynet.widgets.util.UserCommunity;
 
 /**
  * @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoWorkDefinitionSheetProvider.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoWorkDefinitionSheetProvider.java
index b808d992acd..9ef82327a9c 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoWorkDefinitionSheetProvider.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoWorkDefinitionSheetProvider.java
@@ -23,21 +23,16 @@ public class DemoWorkDefinitionSheetProvider implements IAtsWorkDefinitionSheetP
    @Override
    public Collection<WorkDefinitionSheet> getWorkDefinitionSheets() {
       List<WorkDefinitionSheet> sheets = new ArrayList<WorkDefinitionSheet>();
-      sheets.add(new WorkDefinitionSheet("WorkDef_Demo_AIs_And_Team_Definitions", "",
-         AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
-            "support/WorkDef_Demo_AIs_And_Team_Definitions.ats")));
-      sheets.add(new WorkDefinitionSheet("WorkDef_Team_Demo_Code", "demo.code",
-         AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
-            "support/WorkDef_Team_Demo_Code.ats")));
-      sheets.add(new WorkDefinitionSheet("WorkDef_Team_Demo_Req", "demo.req",
-         AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
-            "support/WorkDef_Team_Demo_Req.ats")));
-      sheets.add(new WorkDefinitionSheet("WorkDef_Team_Demo_Test", "demo.test",
-         AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
-            "support/WorkDef_Team_Demo_Test.ats")));
-      sheets.add(new WorkDefinitionSheet("WorkDef_Team_Demo_SwDesign", "demo.swdesign",
-         AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
-            "support/WorkDef_Team_Demo_SwDesign.ats")));
+      sheets.add(new WorkDefinitionSheet("WorkDef_Demo_AIs_And_Team_Definitions", AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
+         "support/WorkDef_Demo_AIs_And_Team_Definitions.ats")));
+      sheets.add(new WorkDefinitionSheet("WorkDef_Team_Demo_Code", AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
+         "support/WorkDef_Team_Demo_Code.ats")));
+      sheets.add(new WorkDefinitionSheet("WorkDef_Team_Demo_Req", AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
+         "support/WorkDef_Team_Demo_Req.ats")));
+      sheets.add(new WorkDefinitionSheet("WorkDef_Team_Demo_Test", AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
+         "support/WorkDef_Team_Demo_Test.ats")));
+      sheets.add(new WorkDefinitionSheet("WorkDef_Team_Demo_SwDesign", AtsWorkDefinitionSheetProviders.getSupportFile(OseeAtsConfigDemoActivator.PLUGIN_ID,
+         "support/WorkDef_Team_Demo_SwDesign.ats")));
       return sheets;
    }
 }
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats b/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
index 4cd8576933d..727adc323a3 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
+++ b/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
@@ -33,7 +33,7 @@ teamDefinition "Teams" GetOrCreate {
 			member named "Steven Kohn"
 			member named "Maichael Johnson"
 			member named "Kay Jason"
-			workDefinition "osee.ats.teamWorkflow"
+			workDefinition "WorkDef_Team_Default"
 			version "CIS_Bld_1" {
 				staticId "cis.teamDefHoldingVersions"
 				released True
@@ -53,7 +53,7 @@ teamDefinition "Teams" GetOrCreate {
 					staticId "cis.code"
 					lead named "Jason Michael"
 					member named "Jason Michael"
-					workDefinition "demo.code"
+					workDefinition "WorkDef_Team_Demo_Code"
 				}
 
 				teamDefinition "CIS Requirements" {
@@ -61,7 +61,7 @@ teamDefinition "Teams" GetOrCreate {
 					staticId "cis.requirements"
 					lead named "Joe Smith"
 					member named "Joe Smith"
-					workDefinition "demo.req"
+					workDefinition "WorkDef_Team_Demo_Req"
 				}
 
 				teamDefinition "CIS SW Design" {
@@ -69,7 +69,7 @@ teamDefinition "Teams" GetOrCreate {
 					staticId "cis.sw_design"
 					lead named "Kay Jones"
 					member named "Kay Jones"
-					workDefinition "demo.swdesign"
+					workDefinition "WorkDef_Team_Demo_SwDesign"
 				}
 
 				teamDefinition "CIS Test" {
@@ -77,7 +77,7 @@ teamDefinition "Teams" GetOrCreate {
 					staticId "cis.test"
 					lead named "Kay Jones"
 					member named "Kay Jones"
-					workDefinition "demo.test"
+					workDefinition "WorkDef_Team_Demo_Test"
 				}
 			}
 		}
@@ -88,7 +88,7 @@ teamDefinition "Teams" GetOrCreate {
 			member named "Steven Michael"
 			member named "Michael John"
 			member named "Jason Stevens"
-			workDefinition "osee.ats.simpleTeamWorkflow"
+			workDefinition "WorkDef_Team_Simple"
 			children {
 
 				teamDefinition "IT Team" {
@@ -97,7 +97,7 @@ teamDefinition "Teams" GetOrCreate {
 					member named "Michael John"
 					member named "Jason Stevens"
 					member named "Kay Wheeler"
-					workDefinition "osee.ats.simpleTeamWorkflow"
+					workDefinition "WorkDef_Team_Simple"
 				}
 			}
 		}
@@ -108,7 +108,7 @@ teamDefinition "Teams" GetOrCreate {
 			member named "Michael Alex"
 			member named "Janice Michael"
 			member named "Alex Kay"
-			workDefinition "osee.ats.teamWorkflow"
+			workDefinition "WorkDef_Team_Default"
 		}
 
 		teamDefinition "SAW SW" {
@@ -117,7 +117,7 @@ teamDefinition "Teams" GetOrCreate {
 			member named "Maichael Johnson"
 			member named "Steven Kohn"
 			member named "Kay Jason"
-			workDefinition "osee.ats.teamWorkflow"
+			workDefinition "WorkDef_Team_Default"
 			version "SAW_Bld_1" {
 				staticId "saw.teamDefHoldingVersions"
 				released True
@@ -138,14 +138,14 @@ teamDefinition "Teams" GetOrCreate {
 					staticId "saw.code"
 					lead named "Joe Smith"
 					member named "Joe Smith"
-					workDefinition "demo.code"
+					workDefinition "WorkDef_Team_Demo_Code"
 				}
 
 				teamDefinition "SAW HW" {
 					usesVersions True
 					lead named "Jason Michael"
 					member named "Jason Michael"
-					workDefinition "osee.ats.teamWorkflow"
+					workDefinition "WorkDef_Team_Default"
 				}
 
 				teamDefinition "SAW Requirements" {
@@ -153,7 +153,7 @@ teamDefinition "Teams" GetOrCreate {
 					staticId "saw.requirements"
 					lead named "Joe Smith"
 					member named "Joe Smith"
-					workDefinition "demo.req"
+					workDefinition "WorkDef_Team_Demo_Req"
 				}
 
 				teamDefinition "SAW SW Design" {
@@ -161,7 +161,7 @@ teamDefinition "Teams" GetOrCreate {
 					staticId "saw.sw_design"
 					lead named "Kay Jones"
 					member named "Kay Jones"
-					workDefinition "demo.swdesign"
+					workDefinition "WorkDef_Team_Demo_SwDesign"
 				}
 
 				teamDefinition "SAW Test" {
@@ -169,7 +169,7 @@ teamDefinition "Teams" GetOrCreate {
 					staticId "saw.test"
 					lead named "Kay Jones"
 					member named "Kay Jones" priviledged named "Joe Smith"
-					workDefinition "demo.test"
+					workDefinition "WorkDef_Team_Demo_Test"
 				}
 			}
 		}
@@ -178,7 +178,7 @@ teamDefinition "Teams" GetOrCreate {
 			lead named "Jeffery Kay"
 			member named "Jeffery Kay"
 			member named "Roland Stevens"
-			workDefinition "osee.ats.teamWorkflow"
+			workDefinition "WorkDef_Team_Default"
 			children {
 
 				teamDefinition "Web Team" {
@@ -186,7 +186,7 @@ teamDefinition "Teams" GetOrCreate {
 					member named "Jeffery Kay"
 					member named "Karmen John"
 					member named "Roland Stevens"
-					workDefinition "osee.ats.simpleTeamWorkflow"
+					workDefinition "WorkDef_Team_Simple"
 				}
 			}
 		}