Adjust namespaces

14 files changed, 33 insertions, 39 deletions

diff --git a/src/MVPtoMVVM.mvp/Bootstrap.cs b/src/MVPtoMVVM.mvp/Bootstrap.cs
index 7ac8745..96ba3e5 100755
--- a/src/MVPtoMVVM.mvp/Bootstrap.cs
+++ b/src/MVPtoMVVM.mvp/Bootstrap.cs
@@ -1,5 +1,5 @@
 using MVPtoMVVM.domain;

-using MVPtoMVVM.presenters;

+using MVPtoMVVM.mvp.presenters;

 using StructureMap;

 

 namespace MVPtoMVVM.mvp

diff --git a/src/MVPtoMVVM.mvp/MvpWindow.xaml.cs b/src/MVPtoMVVM.mvp/MvpWindow.xaml.cs
index dc9f420..aa64809 100755
--- a/src/MVPtoMVVM.mvp/MvpWindow.xaml.cs
+++ b/src/MVPtoMVVM.mvp/MvpWindow.xaml.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;

 using System.Linq;

-using MVPtoMVVM.presenters;

-using MVPtoMVVM.views;

+using MVPtoMVVM.mvp.presenters;

+using MVPtoMVVM.mvp.views;

 using StructureMap;

 

 namespace MVPtoMVVM.mvp

diff --git a/src/MVPtoMVVM.mvp/TodoItemView.xaml.cs b/src/MVPtoMVVM.mvp/TodoItemView.xaml.cs
index e030379..662eef7 100755
--- a/src/MVPtoMVVM.mvp/TodoItemView.xaml.cs
+++ b/src/MVPtoMVVM.mvp/TodoItemView.xaml.cs
@@ -1,8 +1,8 @@
 using System;

 using System.Windows;

 using System.Windows.Media;

-using MVPtoMVVM.presenters;

-using MVPtoMVVM.views;

+using MVPtoMVVM.mvp.presenters;

+using MVPtoMVVM.mvp.views;

 

 namespace MVPtoMVVM.mvp

 {

diff --git a/src/MVPtoMVVM.mvp/mappers/ITodoItemMapper.cs b/src/MVPtoMVVM.mvp/mappers/ITodoItemMapper.cs
index dc6d15f..165a8ac 100644
--- a/src/MVPtoMVVM.mvp/mappers/ITodoItemMapper.cs
+++ b/src/MVPtoMVVM.mvp/mappers/ITodoItemMapper.cs
@@ -1,7 +1,7 @@
 using MVPtoMVVM.domain;

-using MVPtoMVVM.presenters;

+using MVPtoMVVM.mvp.presenters;

 

-namespace MVPtoMVVM.mappers

+namespace MVPtoMVVM.mvp.mappers

 {

     public interface ITodoItemMapper

     {

diff --git a/src/MVPtoMVVM.mvp/mappers/ITodoItemPresenterMapper.cs b/src/MVPtoMVVM.mvp/mappers/ITodoItemPresenterMapper.cs
index 904444c..5471240 100644
--- a/src/MVPtoMVVM.mvp/mappers/ITodoItemPresenterMapper.cs
+++ b/src/MVPtoMVVM.mvp/mappers/ITodoItemPresenterMapper.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;

 using MVPtoMVVM.domain;

-using MVPtoMVVM.presenters;

-using MVPtoMVVM.views;

+using MVPtoMVVM.mvp.presenters;

 

-namespace MVPtoMVVM.mappers

+namespace MVPtoMVVM.mvp.mappers

 {

     public interface ITodoItemPresenterMapper

     {

diff --git a/src/MVPtoMVVM.mvp/mappers/TodoItemMapper.cs b/src/MVPtoMVVM.mvp/mappers/TodoItemMapper.cs
index 98b3cc1..77fe55d 100644
--- a/src/MVPtoMVVM.mvp/mappers/TodoItemMapper.cs
+++ b/src/MVPtoMVVM.mvp/mappers/TodoItemMapper.cs
@@ -1,8 +1,7 @@
-using System;

-using MVPtoMVVM.domain;

-using MVPtoMVVM.presenters;

+using MVPtoMVVM.domain;

+using MVPtoMVVM.mvp.presenters;

 

-namespace MVPtoMVVM.mappers

+namespace MVPtoMVVM.mvp.mappers

 {

     public class TodoItemMapper : ITodoItemMapper

     {

diff --git a/src/MVPtoMVVM.mvp/mappers/TodoItemPresenterMapper.cs b/src/MVPtoMVVM.mvp/mappers/TodoItemPresenterMapper.cs
index 69d56c5..64525d5 100644
--- a/src/MVPtoMVVM.mvp/mappers/TodoItemPresenterMapper.cs
+++ b/src/MVPtoMVVM.mvp/mappers/TodoItemPresenterMapper.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;

 using System.Linq;

 using MVPtoMVVM.domain;

-using MVPtoMVVM.presenters;

+using MVPtoMVVM.mvp.presenters;

 using StructureMap;

 

-namespace MVPtoMVVM.mappers

+namespace MVPtoMVVM.mvp.mappers

 {

     public class TodoItemPresenterMapper : ITodoItemPresenterMapper

     {

diff --git a/src/MVPtoMVVM.mvp/presenters/IMvpPresenter.cs b/src/MVPtoMVVM.mvp/presenters/IMvpPresenter.cs
index 24dc65b..2c488c7 100644
--- a/src/MVPtoMVVM.mvp/presenters/IMvpPresenter.cs
+++ b/src/MVPtoMVVM.mvp/presenters/IMvpPresenter.cs
@@ -1,6 +1,6 @@
-using MVPtoMVVM.views;

+using MVPtoMVVM.mvp.views;

 

-namespace MVPtoMVVM.presenters

+namespace MVPtoMVVM.mvp.presenters

 {

     public interface IMvpPresenter

     {

diff --git a/src/MVPtoMVVM.mvp/presenters/ITodoItemPresenter.cs b/src/MVPtoMVVM.mvp/presenters/ITodoItemPresenter.cs
index 5866786..8ded370 100644
--- a/src/MVPtoMVVM.mvp/presenters/ITodoItemPresenter.cs
+++ b/src/MVPtoMVVM.mvp/presenters/ITodoItemPresenter.cs
@@ -1,8 +1,7 @@
 using System;

-using MVPtoMVVM.domain;

-using MVPtoMVVM.views;

+using MVPtoMVVM.mvp.views;

 

-namespace MVPtoMVVM.presenters

+namespace MVPtoMVVM.mvp.presenters

 {

     public interface ITodoItemPresenter

     {

diff --git a/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs b/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs
index e4e19ee..d117799 100644
--- a/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs
+++ b/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs
@@ -1,12 +1,12 @@
 using System;

 using System.Collections.Generic;

 using MVPtoMVVM.domain;

-using MVPtoMVVM.mappers;

+using MVPtoMVVM.mvp.mappers;

+using MVPtoMVVM.mvp.views;

 using MVPtoMVVM.repositories;

-using MVPtoMVVM.views;

 using System.Linq;

 

-namespace MVPtoMVVM.presenters

+namespace MVPtoMVVM.mvp.presenters

 {

     public class MvpPresenter : IMvpPresenter

     {

diff --git a/src/MVPtoMVVM.mvp/presenters/TodoItemPresenter.cs b/src/MVPtoMVVM.mvp/presenters/TodoItemPresenter.cs
index 7e1d6d5..2e95e53 100644
--- a/src/MVPtoMVVM.mvp/presenters/TodoItemPresenter.cs
+++ b/src/MVPtoMVVM.mvp/presenters/TodoItemPresenter.cs
@@ -1,10 +1,10 @@
 using System;

 using MVPtoMVVM.domain;

-using MVPtoMVVM.mappers;

+using MVPtoMVVM.mvp.mappers;

+using MVPtoMVVM.mvp.views;

 using MVPtoMVVM.repositories;

-using MVPtoMVVM.views;

 

-namespace MVPtoMVVM.presenters

+namespace MVPtoMVVM.mvp.presenters

 {

     public class TodoItemPresenter : ITodoItemPresenter

     {

diff --git a/src/MVPtoMVVM.mvp/views/IMvpView.cs b/src/MVPtoMVVM.mvp/views/IMvpView.cs
index e3f3d4e..768f3fe 100644
--- a/src/MVPtoMVVM.mvp/views/IMvpView.cs
+++ b/src/MVPtoMVVM.mvp/views/IMvpView.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;

-using MVPtoMVVM.presenters;

+using MVPtoMVVM.mvp.presenters;

 

-namespace MVPtoMVVM.views

+namespace MVPtoMVVM.mvp.views

 {

     public interface IMvpView

     {

diff --git a/src/MVPtoMVVM.mvp/views/ITodoItemView.cs b/src/MVPtoMVVM.mvp/views/ITodoItemView.cs
index 14e4100..d550b4e 100644
--- a/src/MVPtoMVVM.mvp/views/ITodoItemView.cs
+++ b/src/MVPtoMVVM.mvp/views/ITodoItemView.cs
@@ -1,8 +1,7 @@
 using System;

-using MVPtoMVVM.domain;

-using MVPtoMVVM.presenters;

+using MVPtoMVVM.mvp.presenters;

 

-namespace MVPtoMVVM.views

+namespace MVPtoMVVM.mvp.views

 {

     public interface ITodoItemView

     {

diff --git a/src/MVPtoMVVM.mvvm/viewmodels/MainWindowViewModel.cs b/src/MVPtoMVVM.mvvm/viewmodels/MainWindowViewModel.cs
index 51e2adf..65144ed 100644
--- a/src/MVPtoMVVM.mvvm/viewmodels/MainWindowViewModel.cs
+++ b/src/MVPtoMVVM.mvvm/viewmodels/MainWindowViewModel.cs
@@ -20,7 +20,7 @@ namespace MVPtoMVVM.mvvm.viewmodels
             this.todoItemRepository = todoItemRepository;

             AddNewItemCommand = new SimpleCommand(AddNewItem);

             CancelChangesCommand = new SimpleCommand(RefreshChanges);

-            updater = new Synchronizer<MainWindowViewModel>(this.PropertyChanged);

+            updater = new Synchronizer<MainWindowViewModel>(PropertyChanged);

             TodoItems = new ObservableCollection<TodoItemViewModel>();

             RefreshChanges();

         }

@@ -32,8 +32,6 @@ namespace MVPtoMVVM.mvvm.viewmodels
             {

                 TodoItems.Add(item);

             }

-            

-            updater.Update(x => x.TodoItems);

         }

 

         private void AddNewItem()

@@ -41,13 +39,13 @@ namespace MVPtoMVVM.mvvm.viewmodels
             TodoItems.Add(new TodoItemViewModel(todoItemRepository){Parent =  this, DueDate = DateTime.Today, Description = string.Empty});

         }

 

-        private TodoItemViewModel MapFrom(TodoItem x)

+        private TodoItemViewModel MapFrom(TodoItem item)

         {

             return new TodoItemViewModel(todoItemRepository)

                        {

-                           Id = x.Id,

-                           Description =  x.Description,

-                           DueDate = x.DueDate,                                                                        

+                           Id = item.Id,

+                           Description =  item.Description,

+                           DueDate = item.DueDate,                                                                        

                            Parent = this,

                        };

         }