diff --git a/src/main/java/viewer/Display.java b/src/main/java/viewer/Display.java index 1769219ead9e707913991c6195a1a5d518459f1d..377b5162a7c21a765bbb1e5c572add36e3a62c75 100644 --- a/src/main/java/viewer/Display.java +++ b/src/main/java/viewer/Display.java @@ -19,11 +19,10 @@ public class Display implements Initializable { private Canvas canvas; private Image image; - private ImageFactory imageFactory; @Override public void initialize(URL location, ResourceBundle resources) { - imageFactory = new BlankImageFactory(); + ImageFactory imageFactory = new BlankImageFactory(); // TODO : changer la fabrique d'image pour construire des images. this.image = imageFactory.makeImage(); diff --git a/src/main/java/viewer/Main.java b/src/main/java/viewer/Main.java index c6c8fed05c8ff9d4f1d53396929b8d54de27ebf8..da5c52b505bbc484ae32dff56641f069ed8c900c 100644 --- a/src/main/java/viewer/Main.java +++ b/src/main/java/viewer/Main.java @@ -7,6 +7,7 @@ import javafx.scene.Scene; import javafx.stage.Stage; import java.io.IOException; +import java.util.Objects; public class Main extends Application @@ -18,7 +19,7 @@ public class Main extends Application @Override public void start(Stage primaryStage) throws IOException { - Parent root =FXMLLoader.load(getClass().getClassLoader().getResource("fxml/Display.fxml")); + Parent root =FXMLLoader.load(Objects.requireNonNull(getClass().getClassLoader().getResource("fxml/Display.fxml"))); primaryStage.setTitle("Image display"); primaryStage.setScene(new Scene(root)); primaryStage.show();