diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database')
2 files changed, 13 insertions, 5 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 5129171647a..1d67ac3da1d 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 @@ -128,8 +128,11 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation if (mods.size() == 1) { if (mod0 == ModificationType.MODIFIED) { knownCase = true; - updateTxsCurrentModData.add(new Object[] {ModificationType.NEW.getValue(), - mods.get(0).getTxCurrent().getValue(), mods.get(0).getTransactionId(), mods.get(0).getGammaId()}); + updateTxsCurrentModData.add(new Object[] { + ModificationType.NEW.getValue(), + mods.get(0).getTxCurrent().getValue(), + mods.get(0).getTransactionId(), + mods.get(0).getGammaId()}); } else { knownCase = true; } @@ -143,8 +146,11 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation 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).getModType().getValue(), - TxChange.DELETED.getValue(), mods.get(1).getTransactionId(), mods.get(1).getGammaId()}); + 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 a5ab64c82e7..88afb20a85f 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 @@ -81,7 +81,9 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation { 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(), + currentData.add(new Object[] { + address.getCorrectedTxCurrent().getValue(), + address.getTransactionId(), address.getGammaId()}); } else { System.out.println("would have fixed merge here"); |