Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjphillips2011-09-22 12:12:57 -0400
committerRyan D. Brooks2011-09-22 12:12:57 -0400
commit7089f8c6be5fe0c98c63c48ed51286d01151474b (patch)
treed924ab455230112403f0710337753c9b2eb9e86b /plugins/org.eclipse.osee.framework.core.message/src/org
parentb451dbfcf43e229c1e34974a88b3fd7e27c55c10 (diff)
downloadorg.eclipse.osee-7089f8c6be5fe0c98c63c48ed51286d01151474b.tar.gz
org.eclipse.osee-7089f8c6be5fe0c98c63c48ed51286d01151474b.tar.xz
org.eclipse.osee-7089f8c6be5fe0c98c63c48ed51286d01151474b.zip
bug: Fix issue with replace with version still showing up after destination branch changed
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.message/src/org')
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeItemUtil.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeItemUtil.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeItemUtil.java
index 2ff6a1ea8e..a20a09e517 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeItemUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeItemUtil.java
@@ -79,6 +79,12 @@ public final class ChangeItemUtil {
return wasNewOnSource(changeItem) || wasIntroducedOnSource(changeItem);
}
+ public static boolean hasBeenReplacedWithVersion(ChangeItem changeItem) {
+ boolean results = areGammasEqual(changeItem.getCurrentVersion(), changeItem.getBaselineVersion()) && //
+ !isDeleted(changeItem.getCurrentVersion());
+ return results;
+ }
+
public static boolean isAlreadyOnDestination(ChangeItem changeItem) {
return areGammasEqual(changeItem.getCurrentVersion(), changeItem.getDestinationVersion()) && //
isDeleted(changeItem.getCurrentVersion()) == isDeleted(changeItem.getDestinationVersion());
@@ -104,7 +110,8 @@ public final class ChangeItemUtil {
isAlreadyOnDestination(changeItem) || //
isDeletedAndDoesNotExistInDestination(changeItem) || //
hasBeenDeletedInDestination(changeItem) || //
- isDestinationEqualOrNewerThanCurrent(changeItem);
+ isDestinationEqualOrNewerThanCurrent(changeItem) || //
+ hasBeenReplacedWithVersion(changeItem);
}
public static boolean wasCreatedAndDeleted(ChangeItem changeItem) {

Back to the top