Projects >> plugin-paymentview >>aa87c7d3b67939a56109ae910f09de8da57ef757

Chunk
Conflicting content 
						incomingPayment.getAccount().getAccountNumber());
						incomingPayment.getPhoneNumber(),
						PaymentViewCsvUtils.MARKER_AMOUNT_PAID,
						incomingPayment.getAmountPaid().toString(),
<<<<<<< HEAD
						PaymentViewCsvUtils.MARKER_INCOMING_TIME_PAID,
						PvUtils.formatDate(incomingPayment.getTimePaid()),
						PaymentViewCsvUtils.MARKER_INCOMING_ACCOUNT,
=======
						PaymentViewCsvUtils.MARKER_TIME_PAID,
						Long.toString(incomingPayment.getTimePaid()),
						PaymentViewCsvUtils.MARKER_PAYMENT_ID,
						incomingPayment.getPaymentId(),
						PaymentViewCsvUtils.MARKER_NOTES,
						incomingPayment.getNotes());
>>>>>>> 7c6124b53233de428045b9b7e260695e812e2643

			}
		} finally {
Solution content 
						incomingPayment.getPhoneNumber(),
						PaymentViewCsvUtils.MARKER_AMOUNT_PAID,
						incomingPayment.getAmountPaid().toString(),
						PaymentViewCsvUtils.MARKER_TIME_PAID,
						PvUtils.formatDate(incomingPayment.getTimePaid()),
						PaymentViewCsvUtils.MARKER_PAYMENT_ID,
						incomingPayment.getPaymentId(),
						PaymentViewCsvUtils.MARKER_NOTES,
						incomingPayment.getNotes());

			}
		} finally {
File
PaymentViewCsvExporter.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
	private Object clientTableHolder;
	private BaseClientTable clientTableHandler;
	private final PaymentViewPluginController pluginController;
<<<<<<< HEAD
	
=======
	private Object incomingPaymentsDialog;

>>>>>>> 7c6124b53233de428045b9b7e260695e812e2643
	public ClientsTabHandler(UiGeneratorController ui,
			final PaymentViewPluginController pluginController) {
		this.ui = ui;
Solution content 
	private Object clientTableHolder;
	private BaseClientTable clientTableHandler;
	private final PaymentViewPluginController pluginController;
	private Object incomingPaymentsDialog;
	
	public ClientsTabHandler(UiGeneratorController ui,
			final PaymentViewPluginController pluginController) {
		this.ui = ui;
File
ClientsTabHandler.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
	private Object pnlIncomingPaymentsTableComponent;
	private PaymentViewPluginController pluginController;
	private Object dialogConfirmation;
<<<<<<< HEAD:src/main/java/org/creditsms/plugins/paymentview/ui/handler/IncomingPaymentsTabHandler.java
	private ClientDao clientDao;
=======
	private Object fldStartDate;
	private Object fldEndDate;
	private Date startDate;
	private Date endDate;
	protected int totalItemCount = 0;
>>>>>>> 7c6124b53233de428045b9b7e260695e812e2643:src/main/java/org/creditsms/plugins/paymentview/ui/handler/tabincomingpayments/IncomingPaymentsTabHandler.java


	public IncomingPaymentsTabHandler(UiGeneratorController ui,
Solution content 
	private Object pnlIncomingPaymentsTableComponent;
	private PaymentViewPluginController pluginController;
	private Object dialogConfirmation;
	private Object fldStartDate;
	private Object fldEndDate;
	private Date startDate;
	private Date endDate;
	protected int totalItemCount = 0;


	public IncomingPaymentsTabHandler(UiGeneratorController ui,
File
IncomingPaymentsTabHandler.java
Developer's decision
Version 2
Kind of conflict
Attribute