Projects >> mifosx >>10fd3be477f1a968254afed5725aa7bdd9a965af

Chunk
Conflicting content 
        return this.entityName.equalsIgnoreCase("CACHE");
    }

<<<<<<< HEAD
    // Begin - Deposit product
    public boolean isFixedDepositProductResource() {
        return this.entityName.equalsIgnoreCase("FIXEDDEPOSITPRODUCT");
    }

    public boolean isRecurringDepositProductResource() {
        return this.entityName.equalsIgnoreCase("RECURRINGDEPOSITPRODUCT");
    }

    // End - Deposit product

    // Begin - Deposit accounts
    public boolean isDepositAccountResource() {
        return isFixedDepositAccountResource() || isRecurringDepositAccountResource();
    }

    public boolean isFixedDepositAccountResource() {
        return this.entityName.equalsIgnoreCase("FIXEDDEPOSITACCOUNT");
    }

    public boolean isRecurringDepositAccountResource() {
        return this.entityName.equalsIgnoreCase("RECURRINGDEPOSITACCOUNT");
    }

    public boolean isFixedDepositAccountCreate() {
        return isCreate() && isFixedDepositAccountResource();
    }

    public boolean isRecurringDepositAccountCreate() {
        return isCreate() && isRecurringDepositAccountResource();
    }

    public boolean isFixedDepositAccountUpdate() {
        return isUpdate() && isFixedDepositAccountResource();
    }

    public boolean isRecurringDepositAccountUpdate() {
        return isUpdate() && isRecurringDepositAccountResource();
    }

    public boolean isFixedDepositAccountDelete() {
        return isDelete() && isFixedDepositAccountResource();
    }

    public boolean isRecurringDepositAccountDelete() {
        return isDelete() && isRecurringDepositAccountResource();
    }

    public boolean isRejectionOfFixedDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("REJECT") && isFixedDepositAccountResource();
    }

    public boolean isRejectionOfRecurringDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("REJECT") && isRecurringDepositAccountResource();
    }

    public boolean isWithdrawFixedDepositAccountApplicationByApplicant() {
        return this.actionName.equalsIgnoreCase("WITHDRAW") && isFixedDepositAccountResource();
    }

    public boolean isWithdrawRecurringDepositAccountApplicationByApplicant() {
        return this.actionName.equalsIgnoreCase("WITHDRAW") && isRecurringDepositAccountResource();
    }

    public boolean isApprovalOfFixedDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("APPROVE") && isFixedDepositAccountResource();
    }

    public boolean isApprovalOfRecurringDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("APPROVE") && isRecurringDepositAccountResource();
    }

    public boolean isUndoApprovalOfFixedDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("APPROVALUNDO") && isFixedDepositAccountResource();
    }

    public boolean isUndoApprovalOfRecurringDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("APPROVALUNDO") && isRecurringDepositAccountResource();
    }

    // Account transaction actions

    public boolean isDeposit() {
        return this.actionName.equalsIgnoreCase("DEPOSIT");
    }

    public boolean isWithdrawal() {
        return this.actionName.equalsIgnoreCase("WITHDRAWAL");
    }

    public boolean isActivation() {
        return this.actionName.equalsIgnoreCase("ACTIVATE");
    }

    public boolean isInterestCalculation() {
        return this.actionName.equalsIgnoreCase("CALCULATEINTEREST");
    }

    public boolean isInterestPosting() {
        return this.actionName.equalsIgnoreCase("POSTINTEREST");
    }

    public boolean isUndoTransaction() {
        return this.actionName.equalsIgnoreCase("UNDOTRANSACTION");
    }

    public boolean isAdjustTransaction() {
        return this.actionName.equalsIgnoreCase("ADJUSTTRANSACTION");
    }

    public boolean isDepositAccountClose() {
        return this.actionName.equalsIgnoreCase("CLOSE") && isDepositAccountResource();
    }

    public boolean isDepositAccountPrematureClose() {
        return this.actionName.equalsIgnoreCase("PREMATURECLOSE") && isDepositAccountResource();
    }

    // End - Deposit accounts

    public boolean isOfficeToGLAccountMapping() {
        return this.entityName.equalsIgnoreCase("OFFICEGLACCOUNT");
    }
=======
    public boolean isLikelihoodResource() {
        return this.entityName.equalsIgnoreCase("Likelihood");
    }
    public boolean isSurveyResource() {

        return this.href.startsWith("/survey/");

    }
    public boolean isUpdateLikelihood() {
        return this.actionName.equalsIgnoreCase("UPDATE");
    }
    public boolean isRegisterSurvey() {
        return this.actionName.equalsIgnoreCase("REGISTER");
    }
    public boolean isFullFilSurvey() {
        return this.actionName.equalsIgnoreCase("CREATE");
    }


>>>>>>> 1ca510b0ca6bde3705811e03756fe23f56b00042
}
Solution content 
    }
        return this.entityName.equalsIgnoreCase("CACHE");
    }

    // Begin - Deposit product
    public boolean isFixedDepositProductResource() {
        return this.entityName.equalsIgnoreCase("FIXEDDEPOSITPRODUCT");
    }

    public boolean isRecurringDepositProductResource() {
        return this.entityName.equalsIgnoreCase("RECURRINGDEPOSITPRODUCT");
    }

    // End - Deposit product

    // Begin - Deposit accounts
    public boolean isDepositAccountResource() {
        return isFixedDepositAccountResource() || isRecurringDepositAccountResource();
    }

    public boolean isFixedDepositAccountResource() {
        return this.entityName.equalsIgnoreCase("FIXEDDEPOSITACCOUNT");
    }

    public boolean isRecurringDepositAccountResource() {
        return this.entityName.equalsIgnoreCase("RECURRINGDEPOSITACCOUNT");
    }


    public boolean isFixedDepositAccountCreate() {
        return isCreate() && isFixedDepositAccountResource();
    }

    public boolean isRecurringDepositAccountCreate() {
        return isCreate() && isRecurringDepositAccountResource();
    }

    public boolean isFixedDepositAccountUpdate() {
        return isUpdate() && isFixedDepositAccountResource();
    }

    public boolean isRecurringDepositAccountUpdate() {
        return isUpdate() && isRecurringDepositAccountResource();
    }

    public boolean isFixedDepositAccountDelete() {
        return isDelete() && isFixedDepositAccountResource();
    }

    public boolean isRecurringDepositAccountDelete() {
        return isDelete() && isRecurringDepositAccountResource();
    }

    public boolean isRejectionOfFixedDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("REJECT") && isFixedDepositAccountResource();
    }

    public boolean isRejectionOfRecurringDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("REJECT") && isRecurringDepositAccountResource();
    }

    public boolean isWithdrawFixedDepositAccountApplicationByApplicant() {
        return this.actionName.equalsIgnoreCase("WITHDRAW") && isFixedDepositAccountResource();
    }

    public boolean isWithdrawRecurringDepositAccountApplicationByApplicant() {
        return this.actionName.equalsIgnoreCase("WITHDRAW") && isRecurringDepositAccountResource();
    }

    public boolean isApprovalOfFixedDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("APPROVE") && isFixedDepositAccountResource();
    }

    public boolean isApprovalOfRecurringDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("APPROVE") && isRecurringDepositAccountResource();
    }

    public boolean isUndoApprovalOfFixedDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("APPROVALUNDO") && isFixedDepositAccountResource();
    }

    public boolean isUndoApprovalOfRecurringDepositAccountApplication() {
        return this.actionName.equalsIgnoreCase("APPROVALUNDO") && isRecurringDepositAccountResource();
    }

    // Account transaction actions

    public boolean isDeposit() {
        return this.actionName.equalsIgnoreCase("DEPOSIT");
    }

    public boolean isWithdrawal() {
        return this.actionName.equalsIgnoreCase("WITHDRAWAL");
    }

    public boolean isActivation() {
        return this.actionName.equalsIgnoreCase("ACTIVATE");
    }

    public boolean isInterestCalculation() {
        return this.actionName.equalsIgnoreCase("CALCULATEINTEREST");
    }

    public boolean isInterestPosting() {
        return this.actionName.equalsIgnoreCase("POSTINTEREST");
    }

    public boolean isUndoTransaction() {
        return this.actionName.equalsIgnoreCase("UNDOTRANSACTION");
    }

    public boolean isAdjustTransaction() {
        return this.actionName.equalsIgnoreCase("ADJUSTTRANSACTION");
    }

    public boolean isDepositAccountClose() {
        return this.actionName.equalsIgnoreCase("CLOSE") && isDepositAccountResource();
    }

    public boolean isDepositAccountPrematureClose() {
        return this.actionName.equalsIgnoreCase("PREMATURECLOSE") && isDepositAccountResource();
    }

    // End - Deposit accounts

    public boolean isOfficeToGLAccountMapping() {
        return this.entityName.equalsIgnoreCase("OFFICEGLACCOUNT");
    public boolean isRegisterDatatable() {
        return this.actionName.equalsIgnoreCase("REGISTER") && this.href.startsWith("/datatables/") && this.entityId == null;
    }

    public boolean isLikelihoodResource() {
        return this.entityName.equalsIgnoreCase("Likelihood");
    }

    public boolean isSurveyResource() {

        return this.href.startsWith("/survey/");

    }

    public boolean isUpdateLikelihood() {
        return this.actionName.equalsIgnoreCase("UPDATE");
    }

    public boolean isRegisterSurvey() {
        return this.actionName.equalsIgnoreCase("REGISTER");
    }

    public boolean isFullFilSurvey() {
        return this.actionName.equalsIgnoreCase("CREATE");
    }

}
File
CommandWrapper.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    /**
    }
        return this;
    }

<<<<<<< HEAD
     * Deposit account mappings
     */

    public CommandWrapperBuilder createFixedDepositAccount() {
        this.actionName = "CREATE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = null;
        this.href = "/fixeddepositaccounts/template";
        return this;
    }

    public CommandWrapperBuilder updateFixedDepositAccount(final Long accountId) {
        this.actionName = "UPDATE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId;
        return this;
    }

    public CommandWrapperBuilder deleteFixedDepositAccount(final Long accountId) {
        this.actionName = "DELETE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId;
        return this;
    }

    public CommandWrapperBuilder rejectFixedDepositAccountApplication(final Long accountId) {
        this.actionName = "REJECT";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=reject";
        return this;
    }

    public CommandWrapperBuilder withdrawFixedDepositAccountApplication(final Long accountId) {
        this.actionName = "WITHDRAW";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=withdrawnByApplicant";
        return this;
    }

    public CommandWrapperBuilder approveFixedDepositAccountApplication(final Long accountId) {
        this.actionName = "APPROVE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=approve";
        return this;
    }

    public CommandWrapperBuilder undoFixedDepositAccountApplication(final Long accountId) {
        this.actionName = "APPROVALUNDO";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=undoapproval";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountActivation(final Long accountId) {
        this.actionName = "ACTIVATE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=activate";
        return this;
    }

    public CommandWrapperBuilder closeFixedDepositAccount(final Long accountId) {
        this.actionName = "CLOSE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=close";
        return this;
    }

    public CommandWrapperBuilder prematureCloseFixedDepositAccount(final Long accountId) {
        this.actionName = "PREMATURECLOSE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=prematureClose";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountInterestCalculation(final Long accountId) {
        this.actionName = "CALCULATEINTEREST";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=calculateInterest";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountInterestPosting(final Long accountId) {
        this.actionName = "POSTINTEREST";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=postInterest";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountDeposit(final Long accountId) {
        this.actionName = "DEPOSIT";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "/transactions?command=deposit";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountWithdrawal(final Long accountId) {
        this.actionName = "WITHDRAWAL";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "/transactions?command=withdrawal";
        return this;
    }

    public CommandWrapperBuilder createRecurringDepositAccount() {
        this.actionName = "CREATE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = null;
        this.href = "/recurringdepositaccounts/template";
        return this;
    }

    public CommandWrapperBuilder updateRecurringDepositAccount(final Long accountId) {
        this.actionName = "UPDATE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId;
        return this;
    }

    public CommandWrapperBuilder recurringAccountDeposit(final Long accountId) {
        this.actionName = "DEPOSIT";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "/transactions?command=deposit";
        return this;
    }

    public CommandWrapperBuilder recurringAccountWithdrawal(final Long accountId) {
        this.actionName = "WITHDRAWAL";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "/transactions?command=withdrawal";
        return this;
    }

    public CommandWrapperBuilder adjustRecurringAccountTransaction(final Long accountId, final Long transactionId) {
        this.actionName = "ADJUSTTRANSACTION";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.subentityId = transactionId;
        this.transactionId = transactionId.toString();
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "/transactions/" + transactionId + "?command=modify";
        return this;
    }

    public CommandWrapperBuilder undoRecurringAccountTransaction(final Long accountId, final Long transactionId) {
        this.actionName = "UNDOTRANSACTION";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.subentityId = transactionId;
        this.transactionId = transactionId.toString();
        this.href = "/recurringdepositaccounts/" + accountId + "/transactions/" + transactionId + "?command=undo";
        return this;
    }

    public CommandWrapperBuilder deleteRecurringDepositAccount(final Long accountId) {
        this.actionName = "DELETE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId;
        return this;
    }

    public CommandWrapperBuilder rejectRecurringDepositAccountApplication(final Long accountId) {
        this.actionName = "REJECT";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=reject";
        return this;
    }

    public CommandWrapperBuilder withdrawRecurringDepositAccountApplication(final Long accountId) {
        this.actionName = "WITHDRAW";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=withdrawnByApplicant";
        return this;
    }

    public CommandWrapperBuilder approveRecurringDepositAccountApplication(final Long accountId) {
        this.actionName = "APPROVE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=approve";
        return this;
    }

    public CommandWrapperBuilder undoRecurringDepositAccountApplication(final Long accountId) {
        this.actionName = "APPROVALUNDO";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=undoapproval";
        return this;
    }

    public CommandWrapperBuilder recurringDepositAccountActivation(final Long accountId) {
        this.actionName = "ACTIVATE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=activate";
        return this;
    }

    public CommandWrapperBuilder closeRecurringDepositAccount(final Long accountId) {
        this.actionName = "CLOSE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=close";
        return this;
    }

    public CommandWrapperBuilder prematureCloseRecurringDepositAccount(final Long accountId) {
        this.actionName = "PREMATURECLOSE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=prematureClose";
        return this;
    }

    public CommandWrapperBuilder recurringDepositAccountInterestCalculation(final Long accountId) {
        this.actionName = "CALCULATEINTEREST";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=calculateInterest";
        return this;
    }

    public CommandWrapperBuilder recurringDepositAccountInterestPosting(final Long accountId) {
        this.actionName = "POSTINTEREST";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=postInterest";
        return this;
    }

    public CommandWrapperBuilder createOfficeToGLAccountMapping() {
        this.actionName = "CREATE";
        this.entityName = "OFFICEGLACCOUNT";
        this.entityId = null;
        this.href = "/organizationglaccounts/template";
        return this;

    public CommandWrapperBuilder updateOfficeToGLAccountMapping(final Long mappingId) {
        this.actionName = "UPDATE";
        this.entityName = "OFFICEGLACCOUNT";
        this.entityId = mappingId;
        this.href = "/organizationglaccounts/" + mappingId;
        return this;
    }

    public CommandWrapperBuilder deleteOfficeToGLAccountMapping(final Long mappingId) {
        this.actionName = "DELETE";
        this.entityName = "OFFICEGLACCOUNT";
        this.entityId = mappingId;
        this.href = "/organizationglaccounts/" + mappingId;
        return this;
    }

=======
    public CommandWrapperBuilder updateLikelihood(final Long entityId) {
        this.actionName = "UPDATE";
        this.entityName = "LIKELIHOOD";
        this.href = "/likelihood/"+entityId;
        this.entityId = entityId;
        return this;
    }
>>>>>>> 1ca510b0ca6bde3705811e03756fe23f56b00042
}
Solution content 
        return this;
        return this;
    }

    /**
     * Deposit account mappings
     */

    public CommandWrapperBuilder createFixedDepositAccount() {
        this.actionName = "CREATE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = null;
        this.href = "/fixeddepositaccounts/template";
        return this;
    }

    public CommandWrapperBuilder updateFixedDepositAccount(final Long accountId) {
        this.actionName = "UPDATE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId;
        return this;
    }

    public CommandWrapperBuilder deleteFixedDepositAccount(final Long accountId) {
        this.actionName = "DELETE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId;
    }

    public CommandWrapperBuilder rejectFixedDepositAccountApplication(final Long accountId) {
        this.actionName = "REJECT";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=reject";
        return this;
    }

    public CommandWrapperBuilder withdrawFixedDepositAccountApplication(final Long accountId) {
        this.actionName = "WITHDRAW";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=withdrawnByApplicant";
        return this;
    }

    public CommandWrapperBuilder approveFixedDepositAccountApplication(final Long accountId) {
        this.actionName = "APPROVE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=approve";
        return this;
    }

    public CommandWrapperBuilder undoFixedDepositAccountApplication(final Long accountId) {
        this.actionName = "APPROVALUNDO";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=undoapproval";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountActivation(final Long accountId) {
        this.actionName = "ACTIVATE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=activate";
        return this;
    }

    public CommandWrapperBuilder closeFixedDepositAccount(final Long accountId) {
        this.actionName = "CLOSE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=close";
        return this;
    }

    public CommandWrapperBuilder prematureCloseFixedDepositAccount(final Long accountId) {
        this.actionName = "PREMATURECLOSE";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=prematureClose";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountInterestCalculation(final Long accountId) {
        this.actionName = "CALCULATEINTEREST";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=calculateInterest";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountInterestPosting(final Long accountId) {
        this.actionName = "POSTINTEREST";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "?command=postInterest";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountDeposit(final Long accountId) {
        this.actionName = "DEPOSIT";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "/transactions?command=deposit";
        return this;
    }

    public CommandWrapperBuilder fixedDepositAccountWithdrawal(final Long accountId) {
        this.actionName = "WITHDRAWAL";
        this.entityName = "FIXEDDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/fixeddepositaccounts/" + accountId + "/transactions?command=withdrawal";
        return this;
    }

    public CommandWrapperBuilder createRecurringDepositAccount() {
        this.actionName = "CREATE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = null;
        this.href = "/recurringdepositaccounts/template";
        return this;
    }

    public CommandWrapperBuilder updateRecurringDepositAccount(final Long accountId) {
        this.actionName = "UPDATE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId;
        return this;
    }

    public CommandWrapperBuilder recurringAccountDeposit(final Long accountId) {
        this.actionName = "DEPOSIT";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "/transactions?command=deposit";
        return this;
    }

    public CommandWrapperBuilder recurringAccountWithdrawal(final Long accountId) {
        this.actionName = "WITHDRAWAL";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "/transactions?command=withdrawal";
        return this;
    }

    public CommandWrapperBuilder adjustRecurringAccountTransaction(final Long accountId, final Long transactionId) {
        this.actionName = "ADJUSTTRANSACTION";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.subentityId = transactionId;
        this.transactionId = transactionId.toString();
        this.href = "/recurringdepositaccounts/" + accountId + "/transactions/" + transactionId + "?command=modify";
        return this;
    }

    public CommandWrapperBuilder undoRecurringAccountTransaction(final Long accountId, final Long transactionId) {
        this.actionName = "UNDOTRANSACTION";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.subentityId = transactionId;
        this.transactionId = transactionId.toString();
        this.href = "/recurringdepositaccounts/" + accountId + "/transactions/" + transactionId + "?command=undo";
        return this;
    }

    public CommandWrapperBuilder deleteRecurringDepositAccount(final Long accountId) {
        this.actionName = "DELETE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId;
        return this;
    }

    public CommandWrapperBuilder rejectRecurringDepositAccountApplication(final Long accountId) {
        this.actionName = "REJECT";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=reject";
        return this;
    }

    public CommandWrapperBuilder withdrawRecurringDepositAccountApplication(final Long accountId) {
        this.actionName = "WITHDRAW";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=withdrawnByApplicant";
        return this;
    }

    public CommandWrapperBuilder approveRecurringDepositAccountApplication(final Long accountId) {
        this.actionName = "APPROVE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=approve";
        return this;
    }

    public CommandWrapperBuilder undoRecurringDepositAccountApplication(final Long accountId) {
        this.actionName = "APPROVALUNDO";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=undoapproval";
        return this;
    }

    public CommandWrapperBuilder recurringDepositAccountActivation(final Long accountId) {
        this.actionName = "ACTIVATE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=activate";
        return this;
    }

    public CommandWrapperBuilder closeRecurringDepositAccount(final Long accountId) {
        this.actionName = "CLOSE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=close";
        return this;
    }

    public CommandWrapperBuilder prematureCloseRecurringDepositAccount(final Long accountId) {
        this.actionName = "PREMATURECLOSE";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.entityId = accountId;
        this.savingsId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=prematureClose";
        return this;
    }

    public CommandWrapperBuilder recurringDepositAccountInterestCalculation(final Long accountId) {
        this.actionName = "CALCULATEINTEREST";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=calculateInterest";
        return this;
    }

    public CommandWrapperBuilder recurringDepositAccountInterestPosting(final Long accountId) {
        this.actionName = "POSTINTEREST";
        this.entityName = "RECURRINGDEPOSITACCOUNT";
        this.savingsId = accountId;
        this.entityId = accountId;
        this.href = "/recurringdepositaccounts/" + accountId + "?command=postInterest";
        return this;
    }

    public CommandWrapperBuilder createOfficeToGLAccountMapping() {
        this.actionName = "CREATE";
        this.entityName = "OFFICEGLACCOUNT";
        this.entityId = null;
        this.href = "/organizationglaccounts/template";
        return this;
    }

    public CommandWrapperBuilder updateOfficeToGLAccountMapping(final Long mappingId) {
        this.actionName = "UPDATE";
        this.entityName = "OFFICEGLACCOUNT";
        this.entityId = mappingId;
        this.href = "/organizationglaccounts/" + mappingId;
        return this;
    }

    public CommandWrapperBuilder deleteOfficeToGLAccountMapping(final Long mappingId) {
        this.actionName = "DELETE";
        this.entityName = "OFFICEGLACCOUNT";
        this.entityId = mappingId;
        this.href = "/organizationglaccounts/" + mappingId;
        return this;
    }

    public CommandWrapperBuilder registerDBDatatable(final String datatable, final String apptable) {
        this.actionName = "REGISTER";
        this.entityName = "DATATABLE";
        this.entityId = null;
        this.href = "/datatables/register/" + datatable + "/" + apptable;
        return this;
    }

    public CommandWrapperBuilder registerSurvey(final String datatable, final String apptable) {
        this.actionName = "REGISTER";
        this.entityName = "SURVEY";
        this.entityId = null;
        this.href = "/survey/register/" + datatable + "/" + apptable;
        return this;
    }

    public CommandWrapperBuilder fullFilSurvey(final String datatable, final Long apptableId) {
        this.entityName = datatable;
        this.entityId = apptableId;
        this.actionName = "CREATE";
        this.href = "/survey/" + datatable + "/" + apptableId;
        return this;
    }

    public CommandWrapperBuilder updateLikelihood(final Long entityId) {
        this.actionName = "UPDATE";
        this.entityName = "LIKELIHOOD";
        this.href = "/likelihood/" + entityId;
        this.entityId = entityId;
        return this;
    }

}
File
CommandWrapperBuilder.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
 */
package org.mifosplatform.commands.service;

<<<<<<< HEAD
=======
import java.util.Map;

import com.jcraft.jsch.Logger;
>>>>>>> 1ca510b0ca6bde3705811e03756fe23f56b00042
import org.joda.time.DateTime;
import org.mifosplatform.commands.domain.CommandSource;
import org.mifosplatform.commands.domain.CommandSourceRepository;
Solution content 
 */
package org.mifosplatform.commands.service;

import java.util.Map;

import org.joda.time.DateTime;
import org.mifosplatform.commands.domain.CommandSource;
import org.mifosplatform.commands.domain.CommandSourceRepository;
File
SynchronousCommandProcessingService.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
                throw new UnsupportedCommandException(wrapper.commandName());
            }

<<<<<<< HEAD
        } else if (wrapper.isStandingInstruction()) {
            if (wrapper.isCreate()) {
                handler = this.applicationContext.getBean("createStandingInstructionCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updateStandingInstructionCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isDelete()) {
                handler = this.applicationContext.getBean("deleteStandingInstructionCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }

        } else if (wrapper.isOfficeToGLAccountMapping()) {
            if (wrapper.isCreate()) {
                handler = this.applicationContext.getBean("createOfficeToGLAccountMappingHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updateOfficeToGLAccountMappingCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isDelete()) {
                handler = this.applicationContext.getBean("deleteOfficeToGLAccountMappingCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        } else {
=======


        }else if (wrapper.isLikelihoodResource()) {
            if (wrapper.isUpdateLikelihood()) {
                handler = this.applicationContext.getBean("updateLikelihoodCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        }else if (wrapper.isSurveyResource()) {
            if (wrapper.isRegisterSurvey()) {
                handler = this.applicationContext.getBean("registerSurveyCommandHandler", NewCommandSourceHandler.class);
            } else if(wrapper.isFullFilSurvey())
            {
                handler = this.applicationContext.getBean("fullFilSurveyCommandHandler", NewCommandSourceHandler.class);
            }
            else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        }
        else {
>>>>>>> 1ca510b0ca6bde3705811e03756fe23f56b00042

            throw new UnsupportedCommandException(wrapper.commandName());
        }
Solution content 
            } else if (wrapper.isDelete()) {
                throw new UnsupportedCommandException(wrapper.commandName());
            }

        } else if (wrapper.isStandingInstruction()) {
            if (wrapper.isCreate()) {
                handler = this.applicationContext.getBean("createStandingInstructionCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updateStandingInstructionCommandHandler", NewCommandSourceHandler.class);
                handler = this.applicationContext.getBean("deleteStandingInstructionCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }

        } else if (wrapper.isOfficeToGLAccountMapping()) {
            if (wrapper.isCreate()) {
                handler = this.applicationContext.getBean("createOfficeToGLAccountMappingHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isUpdate()) {
                handler = this.applicationContext.getBean("updateOfficeToGLAccountMappingCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isDelete()) {
                handler = this.applicationContext.getBean("deleteOfficeToGLAccountMappingCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        } else if (wrapper.isLikelihoodResource()) {
            if (wrapper.isUpdateLikelihood()) {
                handler = this.applicationContext.getBean("updateLikelihoodCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        } else if (wrapper.isSurveyResource()) {
            if (wrapper.isRegisterSurvey()) {
                handler = this.applicationContext.getBean("registerSurveyCommandHandler", NewCommandSourceHandler.class);
            } else if (wrapper.isFullFilSurvey()) {
                handler = this.applicationContext.getBean("fullFilSurveyCommandHandler", NewCommandSourceHandler.class);
            } else {
                throw new UnsupportedCommandException(wrapper.commandName());
            }
        } else {

            throw new UnsupportedCommandException(wrapper.commandName());
        }
File
SynchronousCommandProcessingService.java
Developer's decision
Manual
Kind of conflict
If statement
Chunk
Conflicting content 
public interface ConfigurationReadPlatformService {

<<<<<<< HEAD
    GlobalConfigurationData retrieveGlobalConfiguration();
    
    GlobalConfigurationPropertyData retrieveGlobalConfiguration(Long configId);
=======
    //GlobalConfigurationData retrieveGlobalConfiguration();
    GlobalConfigurationData retrieveGlobalConfiguration(boolean survey);

   // GlobalConfigurationData retrieveGlobalConfiguration(List configurationName);
>>>>>>> 1ca510b0ca6bde3705811e03756fe23f56b00042

}
Solution content 
public interface ConfigurationReadPlatformService {

    GlobalConfigurationPropertyData retrieveGlobalConfiguration(Long configId);

    GlobalConfigurationData retrieveGlobalConfiguration(boolean survey);

}
File
ConfigurationReadPlatformService.java
Developer's decision
Combination
Kind of conflict
Comment
Method interface