From 81d76d8393fdc1d34b194569d79d4069d66d3ae2 Mon Sep 17 00:00:00 2001 From: imuny <92868641+imuny0@users.noreply.github.com> Date: Thu, 2 Jun 2022 17:19:04 +0200 Subject: [PATCH] =?UTF-8?q?Fenetre=20principale=20termin=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/fr/univ_amu/iut/fp/Controller.java | 103 ++++++++++++++---- src/main/java/fr/univ_amu/iut/fp/fp.fxml | 19 ++-- src/main/java/module-info.java | 1 + 3 files changed, 91 insertions(+), 32 deletions(-) diff --git a/src/main/java/fr/univ_amu/iut/fp/Controller.java b/src/main/java/fr/univ_amu/iut/fp/Controller.java index 29085f7..624865b 100644 --- a/src/main/java/fr/univ_amu/iut/fp/Controller.java +++ b/src/main/java/fr/univ_amu/iut/fp/Controller.java @@ -1,27 +1,42 @@ package fr.univ_amu.iut.fp; -import fr.univ_amu.iut.dao.DAO; +import fr.univ_amu.iut.dao.DAORessource; +import fr.univ_amu.iut.dao.DAOThematique; +import fr.univ_amu.iut.dao.factory.DAOFactory; +import fr.univ_amu.iut.dao.factory.DAOFactoryProducer; +import fr.univ_amu.iut.dao.factory.DAOType; import fr.univ_amu.iut.model.Ressource; import fr.univ_amu.iut.model.Thematique; import fr.univ_amu.iut.view.map.France; import fr.univ_amu.iut.view.map.FranceBuilder; import javafx.fxml.FXML; import javafx.fxml.Initializable; +import javafx.geometry.Insets; import javafx.scene.control.Button; -import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.Pane; +import javafx.scene.layout.*; import javafx.scene.paint.Color; -import java.net.MalformedURLException; import java.net.URL; +import java.util.List; import java.util.ResourceBundle; public class Controller implements Initializable { France france; + + DAOFactory daoFactory; + DAORessource daoRessource; + DAOThematique daoThematique; + @FXML private Pane stackPaneFrance; + @FXML + private AnchorPane ressource; + + @FXML + private AnchorPane thematique; + private void initFrance() { france = FranceBuilder.create() .backgroundColor(Color.web("#f5f0e1")) @@ -38,29 +53,75 @@ public class Controller implements Initializable { .build(); } - /*