Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-05-25 14:41:30 -0400
committerrescobar2010-05-25 14:41:30 -0400
commita4104771bf0bed51e530a14e8774b378a65bc931 (patch)
tree1028e94e5abe6b42b2cf8c58c97a97499cfc20c6 /plugins/org.eclipse.osee.framework.database
parentb7d85fa50fe23f1ec7d2c5759d39f8fba7f1a8e6 (diff)
downloadorg.eclipse.osee-a4104771bf0bed51e530a14e8774b378a65bc931.tar.gz
org.eclipse.osee-a4104771bf0bed51e530a14e8774b378a65bc931.tar.xz
org.eclipse.osee-a4104771bf0bed51e530a14e8774b378a65bc931.zip
"Team Workflow" - UQVMC - "Add 0.9.2 conversions for import/export backups"
Diffstat (limited to 'plugins/org.eclipse.osee.framework.database')
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java14
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java30
2 files changed, 22 insertions, 22 deletions
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java
index 8a65fd52ea..61d8e8abff 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java
@@ -124,29 +124,29 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation
}
private void consolidateMods(List<Address> mods) {
- ModificationType mod0 = mods.get(0).modType;
+ ModificationType mod0 = mods.get(0).getModType();
boolean knownCase = false;
if (mods.size() == 1) {
if (mod0 == ModificationType.MODIFIED) {
knownCase = true;
updateTxsCurrentModData.add(new Object[] {ModificationType.NEW.getValue(),
- mods.get(0).txCurrent.getValue(), mods.get(0).transactionId, mods.get(0).gammaId});
+ mods.get(0).getTxCurrent().getValue(), mods.get(0).getTransactionId(), mods.get(0).getGammaId()});
} else {
knownCase = true;
}
} else {
- ModificationType mod1 = mods.get(1).modType;
+ ModificationType mod1 = mods.get(1).getModType();
if (mod0.matches(ModificationType.NEW, ModificationType.INTRODUCED, ModificationType.MERGED)) {
if (mods.size() == 2 && mod1.matches(ModificationType.DELETED, ModificationType.MERGED)) {
knownCase = true;
} else if (mods.size() == 3) {
- ModificationType mod2 = mods.get(2).modType;
+ ModificationType mod2 = mods.get(2).getModType();
if (mod1 == ModificationType.DELETED && mod2 == ModificationType.DELETED) {
knownCase = true;
// must purge most recent delete and set previous one to current
- updateTxsCurrentModData.add(new Object[] {mods.get(1).modType.getValue(),
- TxChange.DELETED.getValue(), mods.get(1).transactionId, mods.get(1).gammaId});
- addressingToDelete.add(new Object[] {mods.get(2).transactionId, mods.get(2).gammaId});
+ updateTxsCurrentModData.add(new Object[] {mods.get(1).getModType().getValue(),
+ TxChange.DELETED.getValue(), mods.get(1).getTransactionId(), mods.get(1).getGammaId()});
+ addressingToDelete.add(new Object[] {mods.get(2).getTransactionId(), mods.get(2).getGammaId()});
} else if (mod1 == ModificationType.MERGED && mod2 == ModificationType.DELETED) {
knownCase = true;
}
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java
index e29c36ee6a..773157b50d 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java
@@ -63,9 +63,9 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation {
}
private void logIssue(String issue, Address address) {
- reporter.report(issue, String.valueOf(address.branchId), String.valueOf(address.itemId),
- String.valueOf(address.transactionId), String.valueOf(address.gammaId), address.modType.toString(),
- address.txCurrent.toString());
+ reporter.report(issue, String.valueOf(address.getBranchId()), String.valueOf(address.getItemId()),
+ String.valueOf(address.getTransactionId()), String.valueOf(address.getGammaId()),
+ address.getModType().toString(), address.getTxCurrent().toString());
}
private void consolidateAddressing() {
@@ -76,13 +76,13 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation {
if (issueDetected()) {
for (Address address : addresses) {
- if (address.purge) {
+ if (address.isPurge()) {
logIssue("purge", address);
- purgeData.add(new Object[] {address.transactionId, address.gammaId});
- } else if (address.correctedTxCurrent != null) {
- logIssue("corrected txCurrent: " + address.correctedTxCurrent, address);
- currentData.add(new Object[] {address.correctedTxCurrent.getValue(), address.transactionId,
- address.gammaId});
+ purgeData.add(new Object[] {address.getTransactionId(), address.getGammaId()});
+ } else if (address.getCorrectedTxCurrent() != null) {
+ logIssue("corrected txCurrent: " + address.getCorrectedTxCurrent(), address);
+ currentData.add(new Object[] {address.getCorrectedTxCurrent().getValue(), address.getTransactionId(),
+ address.getGammaId()});
} else {
System.out.println("would have fixed merge here");
}
@@ -95,8 +95,8 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation {
Address lastAddress = addresses.get(index);
if (!lastAddress.isBaselineTx()) {
for (; index > -1; index--) {
- if (!addresses.get(index).purge) {
- if (addresses.get(index).modType == ModificationType.MERGED) {
+ if (!addresses.get(index).isPurge()) {
+ if (addresses.get(index).getModType() == ModificationType.MERGED) {
logIssue("found merged mod type for item not in baseline: ", addresses.get(index));
}
return;
@@ -110,7 +110,7 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation {
for (Address address : addresses) {
if (address.hasSameGamma(previousAddress) && address.hasSameModType(previousAddress)) {
- previousAddress.purge = true;
+ previousAddress.setPurge(true);
}
previousAddress = address;
}
@@ -130,8 +130,8 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation {
for (Address address : addresses) {
if (address.isSameTransaction(previousAddress)) {
- if (address.hasSameModType(previousAddress) || !address.modType.isDeleted() && previousAddress.modType.isEdited()) {
- address.purge = true;
+ if (address.hasSameModType(previousAddress) || !address.getModType().isDeleted() && previousAddress.getModType().isEdited()) {
+ address.setPurge(true);
} else {
logIssue("multiple versions in one transaction - unknown case", address);
}
@@ -143,7 +143,7 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation {
private void checkForMultipleCurrents() {
boolean mostRecentTx = true;
for (Address address : addresses) {
- if (!address.purge) {
+ if (!address.isPurge()) {
if (mostRecentTx) {
address.ensureCorrectCurrent();
mostRecentTx = false;

Back to the top