From 8a747a598276312a9f9a9b98e199ffde6165d4ed Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 30 Jan 2020 23:50:14 +0100 Subject: [PATCH] add showing face and delete face --- .../ffm/app/exception/NotFoundException.java | 4 ++ .../ffm/app/face/FaceWorkspace.java | 43 +++++++++++++++++ .../ffm/app/people/PeopleWorkspace.java | 28 +++++------ .../ffm/data/database/face/FaceDAO.java | 37 +++++++++++++- .../ffm/data/database/person/PersonDAO.java | 11 +++++ .../view/workspace/MainPageController.java | 29 ++++++++++- .../view/workspace/elements/ElementsEnum.java | 3 +- .../elements/FaceContainerController.java | 48 +++++++++++++++++++ .../elements/FacePaneController.java | 44 +++++++++++++++++ .../elements/ImageContainerController.java | 10 +++- .../PeopleContainerController.java | 10 ++-- .../{people => }/PersonPaneController.java | 24 ++++++---- .../people/FaceContainerController.java | 9 ---- .../elements/people/PeopleController.java | 38 --------------- .../workspace/elements/face_container.fxml | 2 +- .../workspace/elements/face_pane.fxml | 18 +++++++ .../workspace/elements/fane_pane.fxml | 18 +++++++ .../workspace/elements/image_container.fxml | 16 ++++++- .../workspace/elements/people_container.fxml | 2 +- 19 files changed, 313 insertions(+), 81 deletions(-) create mode 100644 src/main/java/dev/mateuszkowalczyk/ffm/app/exception/NotFoundException.java create mode 100644 src/main/java/dev/mateuszkowalczyk/ffm/app/face/FaceWorkspace.java create mode 100644 src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/FaceContainerController.java create mode 100644 src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/FacePaneController.java rename src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/{people => }/PeopleContainerController.java (73%) rename src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/{people => }/PersonPaneController.java (67%) delete mode 100644 src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/FaceContainerController.java delete mode 100644 src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PeopleController.java create mode 100644 src/main/resources/templates/workspace/elements/face_pane.fxml create mode 100644 src/main/resources/templates/workspace/elements/fane_pane.fxml diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/app/exception/NotFoundException.java b/src/main/java/dev/mateuszkowalczyk/ffm/app/exception/NotFoundException.java new file mode 100644 index 0000000..5901b12 --- /dev/null +++ b/src/main/java/dev/mateuszkowalczyk/ffm/app/exception/NotFoundException.java @@ -0,0 +1,4 @@ +package dev.mateuszkowalczyk.ffm.app.exception; + +public class NotFoundException extends Exception { +} diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/app/face/FaceWorkspace.java b/src/main/java/dev/mateuszkowalczyk/ffm/app/face/FaceWorkspace.java new file mode 100644 index 0000000..2d93efc --- /dev/null +++ b/src/main/java/dev/mateuszkowalczyk/ffm/app/face/FaceWorkspace.java @@ -0,0 +1,43 @@ +package dev.mateuszkowalczyk.ffm.app.face; + +import dev.mateuszkowalczyk.ffm.app.exception.NotFoundException; +import dev.mateuszkowalczyk.ffm.data.database.face.Face; +import dev.mateuszkowalczyk.ffm.data.database.face.FaceDAO; +import dev.mateuszkowalczyk.ffm.data.database.person.Person; +import dev.mateuszkowalczyk.ffm.utils.ResourceLoader; +import dev.mateuszkowalczyk.ffm.view.workspace.MainPageController; +import dev.mateuszkowalczyk.ffm.view.workspace.elements.FaceContainerController; +import dev.mateuszkowalczyk.ffm.view.workspace.elements.FacePaneController; +import javafx.fxml.FXMLLoader; + +import java.io.IOException; +import java.util.List; + +public class FaceWorkspace { + private static FaceWorkspace instance = new FaceWorkspace(); + + public static FaceWorkspace getInstance() { + return instance; + } + + public void loadFacesForPerson(MainPageController mainPageController, FaceContainerController faceContainerController, Person person) throws NotFoundException { + List faceList = FaceDAO.getInstance().getAllForPerson(person); + var resourceLoader = ResourceLoader.getInstance(); + + if (faceList.size() == 0) { + throw new NotFoundException(); + } + + for (Face face : faceList) { + FXMLLoader fxmlLoader = new FXMLLoader(); + fxmlLoader.setLocation(resourceLoader.getResource("templates/workspace/elements/face_pane.fxml")); + fxmlLoader.setController(new FacePaneController(mainPageController, faceContainerController, face)); + + try { + faceContainerController.addFacePane(fxmlLoader.load()); + } catch (IOException e) { + e.printStackTrace(); + } + } + } +} diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/app/people/PeopleWorkspace.java b/src/main/java/dev/mateuszkowalczyk/ffm/app/people/PeopleWorkspace.java index 72d9fd8..7525b75 100644 --- a/src/main/java/dev/mateuszkowalczyk/ffm/app/people/PeopleWorkspace.java +++ b/src/main/java/dev/mateuszkowalczyk/ffm/app/people/PeopleWorkspace.java @@ -3,18 +3,16 @@ package dev.mateuszkowalczyk.ffm.app.people; import dev.mateuszkowalczyk.ffm.data.database.person.Person; import dev.mateuszkowalczyk.ffm.data.database.person.PersonDAO; import dev.mateuszkowalczyk.ffm.utils.ResourceLoader; -import dev.mateuszkowalczyk.ffm.view.workspace.elements.people.PeopleContainerController; -import dev.mateuszkowalczyk.ffm.view.workspace.elements.people.PeopleController; -import dev.mateuszkowalczyk.ffm.view.workspace.elements.people.PersonPaneController; +import dev.mateuszkowalczyk.ffm.view.workspace.MainPageController; +import dev.mateuszkowalczyk.ffm.view.workspace.elements.PeopleContainerController; +import dev.mateuszkowalczyk.ffm.view.workspace.elements.PersonPaneController; import javafx.fxml.FXMLLoader; import javafx.scene.Node; -import javafx.scene.control.Button; import java.io.IOException; public class PeopleWorkspace { private static PeopleWorkspace instance = new PeopleWorkspace(); - private PeopleContainerController peopleContainerController; private PeopleWorkspace () {} @@ -23,30 +21,32 @@ public class PeopleWorkspace { } - public void setPeopleContainerController(PeopleContainerController peopleContainerController) { - this.peopleContainerController = peopleContainerController; - } - - public void loadPeople() { + public void loadPeople(MainPageController mainPageController, PeopleContainerController peopleContainerController) { if (peopleContainerController != null) { - var list = PersonDAO.getInstance().getAll(); + var list = PersonDAO.getInstance().getAll(true); int i = 1; + Node node = null; for (Person person : list) { - Node node = null; + node = null; try { FXMLLoader fxmlLoader = new FXMLLoader(); - fxmlLoader.setController(new PersonPaneController(person)); + var controller = new PersonPaneController(mainPageController, person); + fxmlLoader.setController(controller); fxmlLoader.setLocation((ResourceLoader.getInstance().getResource("templates/workspace/elements/person_pane.fxml"))); // node = FXMLLoader.load); node = fxmlLoader.load(); + if(!controller.valid()) { + PersonDAO.getInstance().delete(person); + continue; + } // node = new Button(); } catch (IOException e) { e.printStackTrace(); } - this.peopleContainerController.addPerson(node, i++); + peopleContainerController.addPerson(node, i++); } } } diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/data/database/face/FaceDAO.java b/src/main/java/dev/mateuszkowalczyk/ffm/data/database/face/FaceDAO.java index 93aea69..6a609e2 100644 --- a/src/main/java/dev/mateuszkowalczyk/ffm/data/database/face/FaceDAO.java +++ b/src/main/java/dev/mateuszkowalczyk/ffm/data/database/face/FaceDAO.java @@ -94,11 +94,23 @@ public class FaceDAO implements Dao { @Override public void delete(Face face) { + String sql = "DELETE FROM face where id = ?"; + try { + PreparedStatement preparedStatement = this.databaseService.getConnection().prepareStatement(sql); + preparedStatement.setLong(1, face.getId()); + + preparedStatement.executeUpdate(); + + this.getAll(true); + + } catch (SQLException e) { + e.printStackTrace(); + } } public Face getFirstFace(Person person) { - String sql = "SELECT * FROM face WHERE face.personId = :personId LIMIT 1"; + String sql = "SELECT * FROM face WHERE face.personId = ? LIMIT 1"; try { PreparedStatement preparedStatement = this.databaseService.getConnection().prepareStatement(sql); @@ -118,4 +130,27 @@ public class FaceDAO implements Dao { return null; } + + public List getAllForPerson(Person person) { + List personFaceList = new ArrayList<>(); + + String sql = "SELECT * FROM face WHERE personId = ?"; + + try { + PreparedStatement preparedStatement = this.databaseService.getConnection().prepareStatement(sql); + preparedStatement.setLong(1, person.getId()); + + ResultSet resultSet = preparedStatement.executeQuery(); + + while (resultSet.next()) { + Face face = new Face(resultSet); + personFaceList.add(face); + } + + } catch (SQLException e) { + e.printStackTrace(); + } + + return personFaceList; + } } diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/data/database/person/PersonDAO.java b/src/main/java/dev/mateuszkowalczyk/ffm/data/database/person/PersonDAO.java index c61e4a7..0c0adda 100644 --- a/src/main/java/dev/mateuszkowalczyk/ffm/data/database/person/PersonDAO.java +++ b/src/main/java/dev/mateuszkowalczyk/ffm/data/database/person/PersonDAO.java @@ -39,6 +39,7 @@ public class PersonDAO implements Dao { @Override public List getAll(boolean refresh) { if (this.personList.size() == 0 || refresh) { + this.personList.clear(); String sql = "SELECT * FROM persons"; try { PreparedStatement preparedStatement = this.databaseService.getConnection().prepareStatement(sql); @@ -86,6 +87,16 @@ public class PersonDAO implements Dao { @Override public void delete(Person person) { + String sql = "DELETE FROM persons WHERE id = ?"; + try { + PreparedStatement preparedStatement = this.databaseService.getConnection().prepareStatement(sql); + preparedStatement.setLong(1, person.getId()); + + preparedStatement.executeUpdate(); + this.getAll(true); + } catch (SQLException e) { + e.printStackTrace(); + } } } diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/MainPageController.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/MainPageController.java index 0dc4d4d..38cb9d3 100644 --- a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/MainPageController.java +++ b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/MainPageController.java @@ -1,8 +1,12 @@ package dev.mateuszkowalczyk.ffm.view.workspace; import dev.mateuszkowalczyk.ffm.app.WorkspaceService; +import dev.mateuszkowalczyk.ffm.data.database.person.Person; import dev.mateuszkowalczyk.ffm.utils.ResourceLoader; import dev.mateuszkowalczyk.ffm.view.workspace.elements.ElementsEnum; +import dev.mateuszkowalczyk.ffm.view.workspace.elements.FaceContainerController; +import dev.mateuszkowalczyk.ffm.view.workspace.elements.ImageContainerController; +import dev.mateuszkowalczyk.ffm.view.workspace.elements.PeopleContainerController; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; @@ -18,6 +22,7 @@ public class MainPageController implements Initializable { @FXML private ScrollPane mainContainer; + private Person selectedPerson; public MainPageController() { this.workspaceService = WorkspaceService.getInstance(); @@ -31,7 +36,22 @@ public class MainPageController implements Initializable { public void setElement(ElementsEnum element) { try { - this.mainContainer.setContent(FXMLLoader.load(ResourceLoader.getInstance().getResource(element.getPath()))); + Object controller = null; + FXMLLoader fxmlLoader = new FXMLLoader(); + switch (element) { + case ImagesContainer: + controller = new ImageContainerController(this); + break; + case PeopleContainer: + controller = new PeopleContainerController(this); + break; + case PersonFaceContainer: + controller = new FaceContainerController(this, this.selectedPerson); + } + fxmlLoader.setLocation(ResourceLoader.getInstance().getResource(element.getPath())); + fxmlLoader.setController(controller); + + this.mainContainer.setContent(fxmlLoader.load()); } catch (IOException e) { e.printStackTrace(); } @@ -42,6 +62,11 @@ public class MainPageController implements Initializable { } public void openPeopleModule(ActionEvent actionEvent) { - this.setElement(ElementsEnum.People); + this.setElement(ElementsEnum.PeopleContainer); + } + + public void openFacesSelectedPerson(Person person) { + this.selectedPerson = person; + this.setElement(ElementsEnum.PersonFaceContainer); } } diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/ElementsEnum.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/ElementsEnum.java index b6ed871..7d64136 100644 --- a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/ElementsEnum.java +++ b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/ElementsEnum.java @@ -2,7 +2,8 @@ package dev.mateuszkowalczyk.ffm.view.workspace.elements; public enum ElementsEnum { ImagesContainer("templates/workspace/elements/image_container.fxml"), - People("templates/workspace/elements/people.fxml"); + PeopleContainer("templates/workspace/elements/people_container.fxml"), + PersonFaceContainer("templates/workspace/elements/face_container.fxml"); private String path; diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/FaceContainerController.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/FaceContainerController.java new file mode 100644 index 0000000..7912fab --- /dev/null +++ b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/FaceContainerController.java @@ -0,0 +1,48 @@ +package dev.mateuszkowalczyk.ffm.view.workspace.elements; + +import dev.mateuszkowalczyk.ffm.app.exception.NotFoundException; +import dev.mateuszkowalczyk.ffm.app.face.FaceWorkspace; +import dev.mateuszkowalczyk.ffm.data.database.face.FaceDAO; +import dev.mateuszkowalczyk.ffm.data.database.person.Person; +import dev.mateuszkowalczyk.ffm.data.database.person.PersonDAO; +import dev.mateuszkowalczyk.ffm.view.workspace.MainPageController; +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.Node; +import javafx.scene.layout.FlowPane; + +import java.net.URL; +import java.util.ResourceBundle; + +public class FaceContainerController implements Initializable { + private MainPageController mainPageController; + private Person person; + + @FXML + private FlowPane facesContainer; + + public FaceContainerController(MainPageController mainPageController, Person person) { + this.mainPageController = mainPageController; + this.person = person; + System.out.println("read face container"); + } + + public void addFacePane(Node node) { + this.facesContainer.getChildren().add(node); + } + + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + this.refresh(); + } + + public void refresh() { + this.facesContainer.getChildren().clear(); + try { + FaceWorkspace.getInstance().loadFacesForPerson(mainPageController, this, person); + } catch (NotFoundException e) { + PersonDAO.getInstance().delete(person); + this.mainPageController.setElement(ElementsEnum.PeopleContainer); + } + } +} diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/FacePaneController.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/FacePaneController.java new file mode 100644 index 0000000..8af581b --- /dev/null +++ b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/FacePaneController.java @@ -0,0 +1,44 @@ +package dev.mateuszkowalczyk.ffm.view.workspace.elements; + +import dev.mateuszkowalczyk.ffm.data.database.face.Face; +import dev.mateuszkowalczyk.ffm.data.database.face.FaceDAO; +import dev.mateuszkowalczyk.ffm.view.workspace.MainPageController; +import javafx.event.Event; +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; + +import java.net.URL; +import java.util.ResourceBundle; + +public class FacePaneController implements Initializable { + private MainPageController mainPageController; + private FaceContainerController faceContainerController; + private Face face; + + @FXML + private ImageView faceImage; + + public FacePaneController(MainPageController mainPageController, FaceContainerController faceContainerController, Face face) { + + this.mainPageController = mainPageController; + this.faceContainerController = faceContainerController; + this.face = face; + } + + public void removeThis(Event event) { + FaceDAO.getInstance().delete(this.face); + this.faceContainerController.refresh(); + } + + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + this.loadFace(); + } + + private void loadFace() { + Image image = new Image("file:" + this.face.getPath()); + this.faceImage.setImage(image); + } +} diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/ImageContainerController.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/ImageContainerController.java index 9ead15f..17f4fcd 100644 --- a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/ImageContainerController.java +++ b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/ImageContainerController.java @@ -1,6 +1,9 @@ package dev.mateuszkowalczyk.ffm.view.workspace.elements; import dev.mateuszkowalczyk.ffm.app.WorkspaceService; +import dev.mateuszkowalczyk.ffm.data.database.photo.PhotoDAO; +import dev.mateuszkowalczyk.ffm.view.workspace.MainPageController; +import javafx.event.Event; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.image.ImageView; @@ -15,7 +18,7 @@ public class ImageContainerController implements Initializable { @FXML private FlowPane imagesContainer; - public ImageContainerController() { } + public ImageContainerController(MainPageController mainPageController) { } @Override public void initialize(URL url, ResourceBundle resourceBundle) { @@ -29,6 +32,11 @@ public class ImageContainerController implements Initializable { } } + public void forceRefresh(Event event) { + PhotoDAO.getInstance().getAll(true); + this.workspaceService.loadImages(); + } + public void addImage(ImageView imageView) { this.imagesContainer.getChildren().add(imageView); } diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PeopleContainerController.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/PeopleContainerController.java similarity index 73% rename from src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PeopleContainerController.java rename to src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/PeopleContainerController.java index 35ac015..e5e2738 100644 --- a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PeopleContainerController.java +++ b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/PeopleContainerController.java @@ -1,8 +1,9 @@ -package dev.mateuszkowalczyk.ffm.view.workspace.elements.people; +package dev.mateuszkowalczyk.ffm.view.workspace.elements; import dev.mateuszkowalczyk.ffm.app.WorkspaceService; import dev.mateuszkowalczyk.ffm.app.people.PeopleWorkspace; import dev.mateuszkowalczyk.ffm.data.database.person.Person; +import dev.mateuszkowalczyk.ffm.view.workspace.MainPageController; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.Node; @@ -13,13 +14,15 @@ import java.net.URL; import java.util.ResourceBundle; public class PeopleContainerController implements Initializable { + private final MainPageController mainPageController; private PeopleWorkspace peopleWorkspace = PeopleWorkspace.getInstance(); private Integer numberOfAdded = 0; @FXML public GridPane peopleContainer; - public PeopleContainerController() { + public PeopleContainerController(MainPageController mainPageController) { + this.mainPageController = mainPageController; System.out.println("people container");; } @@ -38,7 +41,6 @@ public class PeopleContainerController implements Initializable { @Override public void initialize(URL url, ResourceBundle resourceBundle) { - this.peopleWorkspace.setPeopleContainerController(this); - this.peopleWorkspace.loadPeople(); + this.peopleWorkspace.loadPeople(mainPageController, this); } } diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PersonPaneController.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/PersonPaneController.java similarity index 67% rename from src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PersonPaneController.java rename to src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/PersonPaneController.java index cb9499f..6ee714d 100644 --- a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PersonPaneController.java +++ b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/PersonPaneController.java @@ -1,9 +1,9 @@ -package dev.mateuszkowalczyk.ffm.view.workspace.elements.people; +package dev.mateuszkowalczyk.ffm.view.workspace.elements; import dev.mateuszkowalczyk.ffm.data.database.face.Face; import dev.mateuszkowalczyk.ffm.data.database.face.FaceDAO; import dev.mateuszkowalczyk.ffm.data.database.person.Person; -import dev.mateuszkowalczyk.ffm.data.database.person.PersonDAO; +import dev.mateuszkowalczyk.ffm.view.workspace.MainPageController; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.Initializable; @@ -11,30 +11,30 @@ import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.text.Text; -import javax.imageio.ImageIO; -import java.io.File; -import java.io.IOException; import java.net.URL; import java.util.ResourceBundle; public class PersonPaneController implements Initializable { private FaceDAO faceDAO = FaceDAO.getInstance(); + private MainPageController mainPageController; private Person person; @FXML private Text personName; @FXML private ImageView faceImage; + private boolean valid = true; public PersonPaneController () { System.out.println("Hi person"); } - public PersonPaneController(Person person) { + public PersonPaneController(MainPageController mainPageController, Person person) { + this.mainPageController = mainPageController; this.person = person; } public void editPerson(ActionEvent actionEvent) { - + this.mainPageController.openFacesSelectedPerson(this.person); } @Override @@ -42,7 +42,11 @@ public class PersonPaneController implements Initializable { this.personName.setText(person.getName()); var face = this.faceDAO.getFirstFace(person); - this.setFace(face); + if (face == null) { + this.valid = false; + } else { + this.setFace(face); + } } private void setFace(Face face) { @@ -51,4 +55,8 @@ public class PersonPaneController implements Initializable { this.faceImage.setImage(image); } + + public boolean valid() { + return this.valid; + } } diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/FaceContainerController.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/FaceContainerController.java deleted file mode 100644 index 957e1fe..0000000 --- a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/FaceContainerController.java +++ /dev/null @@ -1,9 +0,0 @@ -package dev.mateuszkowalczyk.ffm.view.workspace.elements.people; - -import dev.mateuszkowalczyk.ffm.data.database.person.Person; - -public class FaceContainerController { - public FaceContainerController(Person person) { - System.out.println("read face container"); - } -} diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PeopleController.java b/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PeopleController.java deleted file mode 100644 index 92ef2f8..0000000 --- a/src/main/java/dev/mateuszkowalczyk/ffm/view/workspace/elements/people/PeopleController.java +++ /dev/null @@ -1,38 +0,0 @@ -package dev.mateuszkowalczyk.ffm.view.workspace.elements.people; - -import dev.mateuszkowalczyk.ffm.utils.ResourceLoader; -import dev.mateuszkowalczyk.ffm.view.workspace.elements.ElementsEnum; -import javafx.fxml.FXML; -import javafx.fxml.FXMLLoader; -import javafx.fxml.Initializable; -import javafx.scene.layout.BorderPane; -import jdk.swing.interop.LightweightFrameWrapper; - -import java.io.IOException; -import java.net.URL; -import java.util.ResourceBundle; - -public class PeopleController implements Initializable { - private static String FACE_CONTAINER = "templates/workspace/elements/face_container.fxml"; - private static String PEOPLE_CONTAINER = "templates/workspace/elements/people_container.fxml"; - - @FXML - private BorderPane mainContainer; - - public PeopleController() { - System.out.println("People controller"); - } - - @Override - public void initialize(URL url, ResourceBundle resourceBundle) { - this.setCenterElement(PEOPLE_CONTAINER); - } - - public void setCenterElement(String element) { - try { - this.mainContainer.setCenter(FXMLLoader.load(ResourceLoader.getInstance().getResource(element))); - } catch (IOException e) { - e.printStackTrace(); - } - } -} diff --git a/src/main/resources/templates/workspace/elements/face_container.fxml b/src/main/resources/templates/workspace/elements/face_container.fxml index 2d205d1..07e2216 100644 --- a/src/main/resources/templates/workspace/elements/face_container.fxml +++ b/src/main/resources/templates/workspace/elements/face_container.fxml @@ -3,4 +3,4 @@ - + diff --git a/src/main/resources/templates/workspace/elements/face_pane.fxml b/src/main/resources/templates/workspace/elements/face_pane.fxml new file mode 100644 index 0000000..f130f80 --- /dev/null +++ b/src/main/resources/templates/workspace/elements/face_pane.fxml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + +