public static void loadFromCache(AbstractBranchCacheMessage message, Collection<Branch> types) throws OseeCoreException { for (Branch br : types) { Integer branchId = br.getId(); message .getBranchRows() .add( new BranchRow( br.getId(), br.getGuid(), br.getName(), br.getBranchType(), br.getBranchState(), br.getArchiveState(), br.getStorageState())); if (br.hasParentBranch()) { message.getChildToParent().put(branchId, br.getParentBranch().getId()); } addTxRecord(message.getBranchToBaseTx(), branchId, br.getBaseTransaction()); addTxRecord(message.getBranchToSourceTx(), branchId, br.getSourceTransaction()); addAssocArtifact(message.getBranchToAssocArt(), branchId, br.getAssociatedArtifactId()); if (br.getBranchType().isMergeBranch()) { addMergeBranches(message.getMergeBranches(), (MergeBranch) br); } } }
public static boolean handleCommitInProgressPostPrompt( final ConflictManagerExternal conflictManager, int userOption, boolean skipPrompts) throws OseeCoreException { boolean toReturn = false; Branch sourceBranch = conflictManager.getSourceBranch(); Branch destinationBranch = conflictManager.getDestinationBranch(); if (userOption == COMMIT) { // Commit BranchManager.commitBranch(null, conflictManager, archiveBranch, false); toReturn = true; } else if (userOption == LAUNCH_MERGE_VIEW) { // Launch Merge MergeView.openView(sourceBranch, destinationBranch, sourceBranch.getBaseTransaction()); } else if (userOption == DELETE_MERGE) { // Delete Merge deleteSingleMergeBranches(sourceBranch, destinationBranch, skipPrompts); } else if (userOption == FORCE_COMMIT) { // Force Commit, admin only BranchManager.commitBranch(null, conflictManager, archiveBranch, true); toReturn = true; } else if (userOption == CANCEL) { // do nothing } return toReturn; }