bug[ats_XX8TJ]: False detection of pre-modified artifacts on sibling branches

This change is based on some analysis previously done to just check that
the branch_type is working branch instead of not archieved.

Change-Id: If232928067cf31ee1fdfc75bb8b55fb70ad6af3f

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java
index 359c6f5069f..16f3c0c1b48 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java
@@ -14,7 +14,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
+import org.eclipse.osee.framework.core.enums.BranchType;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.util.Conditions;
@@ -33,7 +33,7 @@ public final class ArtifactGuis {
    }
 
    private static final String OTHER_EDIT_SQL =
-      "select br.branch_id, att.gamma_id, att.attr_id from osee_attribute att, osee_txs txs, osee_branch br where att.art_id = ? and att.gamma_id = txs.gamma_id and txs.branch_id = br.branch_id and txs.transaction_id <> br.baseline_transaction_id and br.branch_id <> ? and br.parent_branch_id = ? and br.archived = ?";
+      "select br.branch_id, att.gamma_id, att.attr_id from osee_attribute att, osee_txs txs, osee_branch br where att.art_id = ? and att.gamma_id = txs.gamma_id and txs.branch_id = br.branch_id and txs.transaction_id <> br.baseline_transaction_id and br.branch_id <> ? and br.parent_branch_id = ? and br.branch_type = ?";
 
    private static final String EDIT_MESSAGE =
       "%d of the %d artifacts about to be edited have already been modified on the following branches:%s\n\nDo you still wish to proceed?";
@@ -87,7 +87,7 @@ public final class ArtifactGuis {
          try {
             Branch branch = artifact.getFullBranch();
             chStmt.runPreparedQuery(OTHER_EDIT_SQL, artifact.getArtId(), branch.getId(),
-               branch.getParentBranch().getId(), BranchArchivedState.UNARCHIVED.getValue());
+               branch.getParentBranch().getId(), BranchType.WORKING.getValue());
 
             while (chStmt.next()) {
                int modifiedAttrId = chStmt.getInt("attr_id");