diff options
| author | Morgan E. Cook | 2016-09-24 00:09:44 +0000 |
|---|---|---|
| committer | Megumi Telles | 2016-09-28 14:06:11 +0000 |
| commit | 5afef5cf1a2b3e97455578ceaeeab38c29117d4f (patch) | |
| tree | a838417b07a291f78b7f834e066c599fef9f3ab3 /plugins | |
| parent | b23d7432549b5ff58c3770f31206a65996fa982c (diff) | |
| download | org.eclipse.osee-5afef5cf1a2b3e97455578ceaeeab38c29117d4f.tar.gz org.eclipse.osee-5afef5cf1a2b3e97455578ceaeeab38c29117d4f.tar.xz org.eclipse.osee-5afef5cf1a2b3e97455578ceaeeab38c29117d4f.zip | |
bug[ats_ATS316906]: Update Change Report to compare head and base tx
Signed-off-by: Morgan E. Cook <Morgan.e.cook@boeing.com>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java index 1de467e9048..09f5606131a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.TransactionToken; +import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -72,8 +73,17 @@ public final class ChangeUiUtil { } public static ChangeReportEditorInput createInput(BranchId branch, boolean loadOnOpen) throws OseeCoreException { - BranchId parentBranch = BranchManager.getParentBranch(branch); - return createInput(branch, parentBranch, loadOnOpen); + if (BranchManager.isArchived(branch) || BranchManager.getState(branch).equals(BranchState.COMMITTED)) { + TransactionToken startTx = BranchManager.getBaseTransaction(branch); + TransactionToken endTx = TransactionManager.getHeadTransaction(branch); + TransactionDelta txDelta = new TransactionDelta(startTx, endTx); + ChangeReportEditorInput input = createInput(CompareType.COMPARE_BASE_TO_HEAD, txDelta, loadOnOpen); + input.setBranch(branch); + return input; + } else { + BranchId parentBranch = BranchManager.getParentBranch(branch); + return createInput(branch, parentBranch, loadOnOpen); + } } public static ChangeReportEditorInput createInput(BranchId branch, BranchId parentBranch, boolean loadOnOpen) throws OseeCoreException { |