diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java')
-rw-r--r-- | plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java index dbe8fcf7036..3c5b2db30fc 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java @@ -14,8 +14,6 @@ import java.util.List; import java.util.concurrent.Callable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.osee.framework.core.data.ITransaction; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreTranslatorId; import org.eclipse.osee.framework.core.message.ChangeReportRequest; import org.eclipse.osee.framework.core.message.ChangeReportResponse; @@ -23,6 +21,8 @@ import org.eclipse.osee.framework.core.model.change.ChangeItem; import org.eclipse.osee.framework.core.translation.IDataTranslationService; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; +import org.eclipse.osee.orcs.data.TransactionReadable; +import org.eclipse.osee.orcs.search.QueryFactory; /** * @author Roberto E. Escobar @@ -36,8 +36,11 @@ public class CompareBranchCallable extends AbstractBranchCallable<ChangeReportRe @Override protected ChangeReportResponse executeCall(ChangeReportRequest request) throws Exception { - ITransaction sourceTx = TokenFactory.createTransaction(request.getSourceTx()); - ITransaction destinationTx = TokenFactory.createTransaction(request.getDestinationTx()); + QueryFactory queryFactory = getQueryFactory(); + TransactionReadable sourceTx = + queryFactory.transactionQuery().andTxId(request.getSourceTx()).getResults().getExactlyOne(); + TransactionReadable destinationTx = + queryFactory.transactionQuery().andTxId(request.getDestinationTx()).getResults().getExactlyOne(); Callable<List<ChangeItem>> callable = getBranchOps().compareBranch(sourceTx, destinationTx); List<ChangeItem> items = callAndCheckForCancel(callable); |