Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2013-08-28 19:00:01 -0400
committerGerrit Code Review @ Eclipse.org2013-08-30 09:16:36 -0400
commit6ab5659055a78bc24ba1cdf7eb1596fdd1743da7 (patch)
tree042ceaa66cfcdb6025f8249e92c9c4026d022f9d
parent42c9eceabfbdd1f90ff27ecabcd0d9de3616606c (diff)
downloadorg.eclipse.osee-6ab5659055a78bc24ba1cdf7eb1596fdd1743da7.tar.gz
org.eclipse.osee-6ab5659055a78bc24ba1cdf7eb1596fdd1743da7.tar.xz
org.eclipse.osee-6ab5659055a78bc24ba1cdf7eb1596fdd1743da7.zip
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
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java6
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 359c6f5069..16f3c0c1b4 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");

Back to the top