1 files changed, 8 insertions, 6 deletions

diff --git a/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs b/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs
index d117799..9dd8f93 100644
--- a/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs
+++ b/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs
@@ -1,7 +1,6 @@
 using System;

 using System.Collections.Generic;

 using MVPtoMVVM.domain;

-using MVPtoMVVM.mvp.mappers;

 using MVPtoMVVM.mvp.views;

 using MVPtoMVVM.repositories;

 using System.Linq;

@@ -12,12 +11,10 @@ namespace MVPtoMVVM.mvp.presenters
     {

         private IMvpView view;

         private ITodoItemRepository itemRepository;

-        private ITodoItemPresenterMapper presenterMapper;

 

-        public MvpPresenter(ITodoItemRepository itemRepository, ITodoItemPresenterMapper presenterMapper)

+        public MvpPresenter(ITodoItemRepository itemRepository)

         {

             this.itemRepository = itemRepository;

-            this.presenterMapper = presenterMapper;

         }

 

         public void SetView(IMvpView view)

@@ -29,7 +26,7 @@ namespace MVPtoMVVM.mvp.presenters
         public void AddNewItem()

         {

             var items = new List<ITodoItemPresenter>(view.GetTodoItems());

-            var newItem = presenterMapper.MapFrom(new TodoItem { DueDate = DateTime.Today, Description = ""});

+            var newItem = new TodoItemPresenter(itemRepository) {Description = string.Empty, DueDate = DateTime.Today} ;

             items.Add(newItem);

             view.SetTodoItems(items);

         }

@@ -51,7 +48,12 @@ namespace MVPtoMVVM.mvp.presenters
 

         private void RefreshItems()

         {

-            view.SetTodoItems(presenterMapper.MapAll(itemRepository.GetAll()));

+            view.SetTodoItems(itemRepository.GetAll().Select(MapFrom));

+        }

+

+        private ITodoItemPresenter MapFrom(TodoItem todoItem)

+        {

+            return new TodoItemPresenter(itemRepository) { Description = todoItem.Description, DueDate = todoItem.DueDate, Id = todoItem.Id};

         }

     }

 }
\ No newline at end of file