From d16e724cce6663abf56b3d9d8a4453011a77a1d5 Mon Sep 17 00:00:00 2001 From: Jannik Date: Sun, 22 Jul 2018 23:30:52 +0200 Subject: [PATCH] documentation improvements --- .classpath | 1 + .settings/org.eclipse.jdt.core.prefs | 1 + pom.xml | 4 +- .../application/MainWindowController.java | 71 +++++++++++-------- .../controller/OMDbAPIController.java | 7 +- 5 files changed, 51 insertions(+), 33 deletions(-) diff --git a/.classpath b/.classpath index 430e97d..7e55b77 100644 --- a/.classpath +++ b/.classpath @@ -10,6 +10,7 @@ + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6f1d295..2978067 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -10,4 +10,5 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=9 diff --git a/pom.xml b/pom.xml index 7980eb8..cda8a69 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ jar Project-HomeFlix - http://www.kellerkinder.xyz + http://www.mosad.xyz UTF-8 @@ -32,7 +32,7 @@ com.jfoenix jfoenix - 9.0.4 + 9.0.5 diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index 2ddfcdb..ce82cf4 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -259,7 +259,7 @@ public class MainWindowController { dbController.init(); } - // Initialize UI elements + // Initialize general UI elements private void initUI() { versionLbl.setText("Version: " + version + " (Build: " + buildNumber + ")"); fontsizeSlider.setValue(getFontSize()); @@ -281,7 +281,10 @@ public class MainWindowController { applyColor(); } - // Initialize the tables (treeTableViewfilm and sourcesTable) + /** + * Initialize the tables (treeTableViewfilm and sourcesTable) + * only needed for Tabel-Mode + */ private void initTabel() { // film Table @@ -323,6 +326,7 @@ public class MainWindowController { // Initializing the actions private void initActions() { + // general actions HamburgerBackArrowBasicTransition burgerTask = new HamburgerBackArrowBasicTransition(menuHam); menuHam.addEventHandler(MouseEvent.MOUSE_PRESSED, (e) -> { if (menuTrue) { @@ -343,32 +347,6 @@ public class MainWindowController { settingsTrue = false; } }); - - searchTextField.textProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - ObservableList helpData; - filterData.clear(); - filmRoot.getChildren().clear(); - - helpData = filmsList; - - for (int i = 0; i < helpData.size(); i++) { - if (helpData.get(i).getTitle().toLowerCase().contains(searchTextField.getText().toLowerCase())) { - filterData.add(helpData.get(i)); // add data from newDaten to filteredData where title contains search input - } - } - - for (int i = 0; i < filterData.size(); i++) { - filmRoot.getChildren().add(new TreeItem(filterData.get(i))); // add filtered data to root node after search - } - if (searchTextField.getText().hashCode() == hashA) { - setColor("000000"); - colorPicker.setValue(new Color(0, 0, 0, 1)); - applyColor(); - } - } - }); languageChoisBox.getSelectionModel().selectedIndexProperty().addListener(new ChangeListener() { @Override @@ -404,6 +382,33 @@ public class MainWindowController { } }); + // Table-Mode actions + searchTextField.textProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, String oldValue, String newValue) { + ObservableList helpData; + filterData.clear(); + filmRoot.getChildren().clear(); + + helpData = filmsList; + + for (int i = 0; i < helpData.size(); i++) { + if (helpData.get(i).getTitle().toLowerCase().contains(searchTextField.getText().toLowerCase())) { + filterData.add(helpData.get(i)); // add data from newDaten to filteredData where title contains search input + } + } + + for (int i = 0; i < filterData.size(); i++) { + filmRoot.getChildren().add(new TreeItem(filterData.get(i))); // add filtered data to root node after search + } + if (searchTextField.getText().hashCode() == hashA) { + setColor("000000"); + colorPicker.setValue(new Color(0, 0, 0, 1)); + applyColor(); + } + } + }); + like.setOnAction(new EventHandler() { @Override public void handle(ActionEvent event) { @@ -485,8 +490,11 @@ public class MainWindowController { } } }); + + // Poster-Mode actions } + // Table-Mode fxml actions @FXML private void playbtnclicked() { if (currentTableFilm.getStreamUrl().contains("_rootNode")) { @@ -558,6 +566,7 @@ public class MainWindowController { filmsTreeTable.getSelectionModel().select(next); } + // general fxml actions @FXML private void aboutBtnAction() { String bodyText = "cemu_UI by @Seil0 \nVersion: " + version + " (Build: " + buildNumber + ") \"" @@ -674,7 +683,11 @@ public class MainWindowController { sourceRoot.getChildren().add(new TreeItem(sourcesList.get(sourcesList.size() - 1))); // adds data to root-node } - // add a source to the newsources list + /** + * add a source to the newsources list + * @param path to the source + * @param mode of the source (local or streaming) + */ public void addSource(String path, String mode) { JsonObject source = null; JsonArray newsources = null; diff --git a/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java b/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java index de203c7..8e0f419 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java @@ -60,8 +60,6 @@ public class OMDbAPIController implements Runnable { this.mainWindowController = mainWindowController; this.dbController = dbController; this.main = main; - - } @Override @@ -135,6 +133,11 @@ public class OMDbAPIController implements Runnable { return; } + /** + * get a movie/series by its title + * @param title of the movie/series + * @return a jsonObject of the API answer + */ private JsonObject getByTitle(String title) { String output = null; URL apiUrl;