Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrbrooks2010-08-29 01:02:11 -0400
committerrbrooks2010-08-29 01:02:11 -0400
commit5a4058affbff23e1fad7c559eeb691161ea94b57 (patch)
tree709ca8587ec038ecdd4bfbcaff50bb6379e2fa6a /plugins/org.eclipse.osee.framework.database
parentc850774504ad977892dfece2dc330ab769b234f1 (diff)
downloadorg.eclipse.osee-5a4058affbff23e1fad7c559eeb691161ea94b57.tar.gz
org.eclipse.osee-5a4058affbff23e1fad7c559eeb691161ea94b57.tar.xz
org.eclipse.osee-5a4058affbff23e1fad7c559eeb691161ea94b57.zip
Eclipse source cleanup and format
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.java4
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 5129171647..1d67ac3da1 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 a5ab64c82e..88afb20a85 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");

Back to the top