Projects >> plugin-paymentview >>db9bd8a93a65481ff45f5dfe25085409b28bf2af

Chunk
Conflicting content 
	// > CONSTANTS
	/** Filename and path of the XML for the PaymentView tab */
<<<<<<< HEAD
	private static final String XML_PAYMENT_VIEW_TAB = "/ui/plugins/paymentview/paymentViewTab.xml";
	
	/** DAO for accounts */
	private AccountDao accountDao;
	private AnalyticsTabHandler analyticsTab;
	// > INSTANCE PROPERTIES
	/** DAO for clients */
	private ClientDao clientDao;
	// > THE OFFICIAL TABS FOR PAYMENTVIEW
	private ClientsTabHandler clientsTab;
	/** DAO for custom fields */
	private CustomFieldDao customFieldDao;
	/** DAO for quick dial codes (USSD requests) */
	private CustomValueDao customValueDao;
=======
>>>>>>> 5b872c95400c78c41ac0b409b35d476f37ee5391

	/** DAO for accounts */
	private FrontlineSMS frontlineController;
Solution content 
	// > CONSTANTS
	/** Filename and path of the XML for the PaymentView tab */
	

	/** DAO for accounts */
	private FrontlineSMS frontlineController;
File
PaymentViewPluginController.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
	private OutgoingPaymentDao outgoingPaymentDao;
	private ServiceItemDao serviceItemDao;
	private TargetDao targetDao;
<<<<<<< HEAD
	private ConnectedDeviceThinletTabController connectedDeviceThinletTabController;
=======
	private AccountDao accountDao;

	private PaymentViewThinletTabController tabController;
>>>>>>> 5b872c95400c78c41ac0b409b35d476f37ee5391

	/**
	 * @see net.frontlinesms.plugins.PluginController#deinit()
Solution content 
	private OutgoingPaymentDao outgoingPaymentDao;
	private ServiceItemDao serviceItemDao;
	private TargetDao targetDao;
	private ConnectedDeviceThinletTabController connectedDeviceThinletTabController;

	private PaymentViewThinletTabController tabController;

	/**
	 * @see net.frontlinesms.plugins.PluginController#deinit()
File
PaymentViewPluginController.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
		tabController.setTabComponent(targetDao);

		tabController.refresh();
<<<<<<< HEAD

		mainPane = uiController.find(paymentViewTab, TABP_MAIN_PANE);

		clientsTab = new ClientsTabHandler(uiController, clientDao, accountDao,
				customFieldDao, customValueDao);
		clientsTab.refresh();
		uiController.add(mainPane, clientsTab.getTab());

		incomingPayTab = new IncomingPaymentsTabHandler(uiController,
				incomingPaymentDao);
		incomingPayTab.refresh();
		uiController.add(mainPane, incomingPayTab.getTab());

		outgoingPayTab = new OutgoingPaymentsTabHandler(uiController,
				outgoingPaymentDao, clientDao);
		outgoingPayTab.refresh();
		uiController.add(mainPane, outgoingPayTab.getTab());

		exportTab = new ExportTabHandler(uiController, clientDao,
				incomingPaymentDao, outgoingPaymentDao);
		exportTab.refresh();
		uiController.add(mainPane, exportTab.getTab());

		analyticsTab = new AnalyticsTabHandler(uiController, clientDao,
				accountDao, incomingPaymentDao, outgoingPaymentDao,
				serviceItemDao, targetDao);

		analyticsTab.refresh();
		uiController.add(mainPane, analyticsTab.getTab());

		settingsTab = new SettingsTabHandler(uiController, incomingPaymentDao,
				outgoingPaymentDao, accountDao, clientDao);
		settingsTab.refresh();
		uiController.add(mainPane, settingsTab.getTab());
		
		ConnectedDeviceThinletTabController cdtController = new ConnectedDeviceThinletTabController(uiController);
		uiController.add(mainPane, cdtController.getTab());

		return paymentViewTab;
=======
		
		//Just after setting the DAOs
		tabController.initTabs();
		
		return tabController.getPaymentViewTab();
>>>>>>> 5b872c95400c78c41ac0b409b35d476f37ee5391
	}
}
Solution content 
		tabController.setTabComponent(targetDao);

		tabController.refresh();
		
		//Just after setting the DAOs
		tabController.initTabs();
		
		ConnectedDeviceThinletTabController cdtController = new ConnectedDeviceThinletTabController(uiController);
		uiController.add(mainPane, cdtController.getTab());
		
		return tabController.getPaymentViewTab();
	}
}
File
PaymentViewPluginController.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Method invocation
Return statement
Variable