6 files changed, 8 insertions, 8 deletions

diff --git a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/impl/BranchCreation.java b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/impl/BranchCreation.java
index 38218932e91..d24d4cfe412 100644
--- a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/impl/BranchCreation.java
+++ b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/impl/BranchCreation.java
@@ -172,7 +172,7 @@ public class BranchCreation implements IBranchCreation {
 

       public CreateChildBranchTx(int parentBranchId, String childBranchShortName, String childBranchName, String creationComment, int associatedArtifactId, int authorId) {

          super(parentBranchId, childBranchShortName, childBranchName, creationComment, associatedArtifactId, authorId,

-               BranchType.STANDARD);

+               BranchType.WORKING);

       }

 

       /* (non-Javadoc)

diff --git a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/impl/CreateBranchWithFiltering.java b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/impl/CreateBranchWithFiltering.java
index ef92a6af79a..f5eb6671e1c 100644
--- a/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/impl/CreateBranchWithFiltering.java
+++ b/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/impl/CreateBranchWithFiltering.java
@@ -71,7 +71,7 @@ public class CreateBranchWithFiltering extends CreateBranchTx {
 

    public CreateBranchWithFiltering(int parentBranchId, String childBranchShortName, String childBranchName, String creationComment, int associatedArtifactId, int authorId, String[] compressArtTypeIds, String[] preserveArtTypeIds) {

       super(parentBranchId, childBranchShortName, childBranchName, creationComment, associatedArtifactId, authorId,

-            BranchType.STANDARD);

+            BranchType.WORKING);

       this.compressArtTypeIds = compressArtTypeIds;

       this.preserveArtTypeIds = preserveArtTypeIds;

    }

diff --git a/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/BranchType.java b/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/BranchType.java
index 9bd067e5e89..da5ef0c1e01 100644
--- a/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/BranchType.java
+++ b/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/BranchType.java
@@ -14,7 +14,7 @@ package org.eclipse.osee.framework.core.enums;
  * @author Ryan D. Brooks

  */

 public enum BranchType {

-   STANDARD(0), TOP_LEVEL(1), BASELINE(2), MERGE(3), SYSTEM_ROOT(4);

+   WORKING(0), TOP_LEVEL(1), BASELINE(2), MERGE(3), SYSTEM_ROOT(4);

    private final int value;

 

    BranchType(int value) {

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
index bcc6cc12698..be3d393d9e4 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
@@ -126,7 +126,7 @@ public class BranchManager {
     */

    public static List<Branch> getNormalBranches() throws OseeCoreException {

       List<Branch> branches =

-            getBranches(BranchState.ACTIVE, BranchControlled.ALL, BranchType.STANDARD, BranchType.TOP_LEVEL,

+            getBranches(BranchState.ACTIVE, BranchControlled.ALL, BranchType.WORKING, BranchType.TOP_LEVEL,

                   BranchType.BASELINE);

       Collections.sort(branches);

       return branches;

@@ -221,7 +221,7 @@ public class BranchManager {
    }

 

    public static Collection<Branch> getArchivedBranches() throws OseeCoreException {

-      return getBranches(BranchState.ARCHIVED, BranchControlled.ALL, BranchType.STANDARD, BranchType.TOP_LEVEL,

+      return getBranches(BranchState.ARCHIVED, BranchControlled.ALL, BranchType.WORKING, BranchType.TOP_LEVEL,

             BranchType.BASELINE);

    }

 

@@ -562,7 +562,7 @@ public class BranchManager {
    }

 

    public static List<Branch> getChangeManagedBranches() throws OseeCoreException {

-      return getBranches(BranchState.ACTIVE, BranchControlled.CHANGE_MANAGED, BranchType.STANDARD,

+      return getBranches(BranchState.ACTIVE, BranchControlled.CHANGE_MANAGED, BranchType.WORKING,

             BranchType.TOP_LEVEL, BranchType.BASELINE);

    }

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchContentProvider.java
index e62ff539ad7..0fc37686123 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchContentProvider.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchContentProvider.java
@@ -121,7 +121,7 @@ public class BranchContentProvider implements ITreeContentProvider, ArtifactChan
 

             if (showChildBranchesAtMainLevel) {

                branchTypes.add(BranchType.BASELINE);

-               branchTypes.add(BranchType.STANDARD);

+               branchTypes.add(BranchType.WORKING);

             }

 

             List<Branch> branches =

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java
index 1365f45e0a7..952d49f2f4d 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java
@@ -61,7 +61,7 @@ public class BranchSelectionDialog extends MessageDialog {
       try {
          if (allowOnlyWorkingBranches) {
             branches =
-                  BranchManager.getBranches(BranchState.ACTIVE, BranchControlled.CHANGE_MANAGED, BranchType.STANDARD);
+                  BranchManager.getBranches(BranchState.ACTIVE, BranchControlled.CHANGE_MANAGED, BranchType.WORKING);
          } else {
             branches = BranchManager.getNormalBranches();
          }