diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java index cd3d0ed..881144b 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/Main.java +++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java @@ -77,7 +77,7 @@ public class Main extends Application { primaryStage.setResizable(false); primaryStage.setTitle("Project HomeFlix"); primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/icons/Homeflix_Icon_64x64.png"))); //adds application icon - primaryStage.setOnCloseRequest(event -> System.exit(1)); + primaryStage.setOnCloseRequest(event -> System.exit(0)); // generate window scene = new Scene(pane); // create new scene, append pane to scene diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index c527baa..fc0b6bd 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -75,6 +75,7 @@ import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.FlowPane; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; @@ -159,11 +160,7 @@ public class MainWindowController { // poster-mode @FXML private ScrollPane posterModeScrollPane; - @FXML private AnchorPane posterModeAnchorPane; - - private int xPos = -200; - private int yPos = 17; - private int xNextElement = 0; + @FXML private FlowPane posterModeFlowPane; private DBController dbController; private UpdateController updateController; @@ -916,40 +913,9 @@ public class MainWindowController { posterEmenents.clear(); posterEmenents = dbController.getPosterElementsList(); // returns a list of all PosterElements stored in the database - posterModeAnchorPane.getChildren().clear(); // remove all GUIElements from the posterModeAnchorPane - - // reset the position - xPos = -200; - yPos = 17; - xNextElement = 0; - - // add all films/series as new GUIElements to the posterModeAnchorPane - for(PosterModeElement element : posterEmenents) { - generatePosition(); - element.setLayoutX(xPos); - element.setLayoutY(yPos); - posterModeAnchorPane.getChildren().add(element); - } - + posterModeFlowPane.getChildren().clear(); // remove all GUIElements from the posterModeFlowPane + posterModeFlowPane.getChildren().addAll(posterEmenents); // add all films/series as new GUIElements to the posterModeFlowPane } - - /** - * xMaxElements based on window width -36 - * calculates how many games can be displayed in one row - */ - private void generatePosition() { - int xMaxElements = (int) Math.floor((mainAnchorPane.getWidth() - 36) / 217); - - if(xNextElement >= xMaxElements){ -// oldXPosHelper = xNextElement; // only needed if window resizing is allowed - xPos = 17; - yPos = yPos + 345; - xNextElement = 1; - }else{ - xPos = xPos + 217; - xNextElement++; - } - } // getter and setter diff --git a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java index c5f8043..737e6e8 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java @@ -60,8 +60,6 @@ public class DBController { /** * constructor for DBController - * @param main the Main object - * @param mainWindowController the MainWindowController object */ public DBController() { // Auto-generated constructor stub @@ -76,10 +74,8 @@ public class DBController { } /** - * initialize the {@link DBController} - * initialize the database connection - * check if there is a need to create a new database - * refresh the database + * initialize the {@link DBController} with the database connection check if + * there is a need to create a new database refresh the database */ public void init() { initDatabaseConnection(); @@ -116,6 +112,7 @@ public class DBController { + "streamUrl, Title, Year, Rated, Released, Season, Episode ,Runtime, Genre, Director, Writer," + " Actors, Plot, Language, Country, Awards, Poster, Metascore, imdbRating, imdbVotes," + " imdbID, Type, dvd, BoxOffice, Website, Response)"); + connection.commit(); stmt.close(); } catch (SQLException e) { LOGGER.error(e); @@ -151,8 +148,7 @@ public class DBController { } /** - * load all streams from the database to a ObservableList, - * order entries by title + * load all streams from the database to a ObservableList, order entries by title * @return a ObservableList that contains all streams from the database */ public ObservableList getStreamsList() { diff --git a/src/main/java/org/kellerkinder/Alerts/JFX2BtnCancelAlert.java b/src/main/java/org/kellerkinder/Alerts/JFX2BtnCancelAlert.java index 5f471a4..9fc68d6 100644 --- a/src/main/java/org/kellerkinder/Alerts/JFX2BtnCancelAlert.java +++ b/src/main/java/org/kellerkinder/Alerts/JFX2BtnCancelAlert.java @@ -89,13 +89,8 @@ public class JFX2BtnCancelAlert { JFXButton cancelBtn = new JFXButton(); cancelBtn.setText(cancelText); - cancelBtn.setOnAction(new EventHandler() { - @Override - public void handle(ActionEvent event) { - alert.close(); - System.exit(1); - } - }); + cancelBtn.addEventHandler(ActionEvent.ACTION, (e)-> alert.close()); + cancelBtn.addEventHandler(ActionEvent.ACTION, (e)-> System.exit(0)); cancelBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED); cancelBtn.setPrefHeight(32); cancelBtn.setStyle(btnStyle); diff --git a/src/main/java/org/kellerkinder/Alerts/JFXInfoAlert.java b/src/main/java/org/kellerkinder/Alerts/JFXInfoAlert.java index 5d09315..79d045b 100644 --- a/src/main/java/org/kellerkinder/Alerts/JFXInfoAlert.java +++ b/src/main/java/org/kellerkinder/Alerts/JFXInfoAlert.java @@ -26,7 +26,6 @@ import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXDialogLayout; import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.scene.text.Text; import javafx.stage.Stage; @@ -59,12 +58,7 @@ public class JFXInfoAlert { JFXAlert alert = new JFXAlert<>(stage); JFXButton button = new JFXButton("Okay"); - button.setOnAction(new EventHandler() { - @Override - public void handle(ActionEvent event) { - alert.close(); - } - }); + button.addEventHandler(ActionEvent.ACTION, (e)-> alert.close()); button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED); button.setPrefHeight(32); button.setStyle(btnStyle); diff --git a/src/main/resources/fxml/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml index 9bd0731..c0fb05b 100644 --- a/src/main/resources/fxml/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -18,12 +18,13 @@ + - + @@ -65,13 +66,13 @@ - - + + - - + +