Index: ActiviteitenOpvolging/ActiviteitenOpvolging/ActiviteitenOpvolgingForm.vb =================================================================== diff -u -r1712 -r1713 --- ActiviteitenOpvolging/ActiviteitenOpvolging/ActiviteitenOpvolgingForm.vb (.../ActiviteitenOpvolgingForm.vb) (revision 1712) +++ ActiviteitenOpvolging/ActiviteitenOpvolging/ActiviteitenOpvolgingForm.vb (.../ActiviteitenOpvolgingForm.vb) (revision 1713) @@ -4,13 +4,13 @@ Implements IMainForm Private _userControls As List(Of IDataGridUserControl) - Private _workItemManager As IWorkItemManager + Private _domainController As IDomainController Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try 'Variable initialisation, putting this in a constructor breaks 'DatagridViewControlsFlowLayoutPanel.Controls.Add' -> null reference exception. _userControls = New List(Of IDataGridUserControl) - _workItemManager = New WorkItemManager + _domainController = DomainController.GetInstance() 'Set the color of the form. BackColor = Color.White @@ -56,7 +56,7 @@ ''' Public Function GetWorkItems(gridNumber As Integer) As List(Of IWorkItem) Implements IMainForm.GetWorkItems - Return _workItemManager.GiveWorkItems(gridNumber) + Return _domainController.GiveWorkItems(gridNumber) End Function '''