Update architecture

src/main/java/presenters/NavPresenter.java

@@ -1,9 +1,11 @@
 package presenters;
 
 import app.INavigator;
+import app.state.AppState;
 import com.google.inject.Inject;
 import domain.common.Mode;
 import domain.image.GrayScaleMatrix;
+import domain.image.Image;
 import services.ImageService;
 import services.ModeService;
 import ui.abstractions.INavBar;
@@ -11,19 +13,17 @@ import ui.abstractions.INavBar;
 import java.io.File;
 import java.io.IOException;
 
-/**
- * @author Laurent Crema
- */
 public class NavPresenter {
-
     private INavBar navBar;
-    private INavigator navigator;
+    private final INavigator navigator;
+    private final AppState appState;
     private final ImageService imageService;
     private final ModeService modeService;
 
     @Inject
-    public NavPresenter(INavigator navigator, ImageService imageService, ModeService modeService) {
+    public NavPresenter(INavigator navigator, AppState appState, ImageService imageService, ModeService modeService) {
         this.navigator = navigator;
+        this.appState = appState;
         this.imageService = imageService;
         this.modeService = modeService;
     }
@@ -33,27 +33,28 @@ public class NavPresenter {
     }
 
     public void createImage(int red, int green, int blue, int height, int width) {
-        imageService.createImage(red, green, blue, height, width);
+        Image image = imageService.createImage(red, green, blue, height, width);
+        appState.setImage(image);
     }
 
-    public void loadImage(File f) throws IOException {
-        imageService.loadImage(f);
+    public void loadImage(File file) throws IOException {
+        Image image = imageService.loadImage(file);
+        appState.setImage(image);
     }
 
-    public void goToFourier(){
+    public void goToFourier() {
         navigator.showFourier();
     }
 
-    public void goToFiltering(){
+    public void goToFiltering() {
         navigator.showFiltering();
     }
 
     public GrayScaleMatrix getImageGrayMatrix() {
-        //return ((CImageNG)appState.getImage()).getMatrice();
-        return imageService.getImage().toGrayScale();
+        return appState.getImage().toGrayScale();
     }
 
     public void setMode(Mode mode) {
         modeService.setMode(mode);
     }
-}
+}