diff --git a/.classpath b/.classpath
index eab655a..d9ff1e3 100644
--- a/.classpath
+++ b/.classpath
@@ -17,12 +17,13 @@
-
+
+
-
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 4a6c6b8..6f1d295 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,13 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+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.source=9
diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
index 520ec40..59f9e0b 100644
--- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
+++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
@@ -1,6 +1,6 @@
/**
* Project-HomeFlix
- *
+ *
* Copyright 2016-2018 <@Seil0>
*
* This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,6 @@ import java.io.StringWriter;
import java.io.Writer;
import java.math.BigInteger;
import java.net.URLConnection;
-import java.util.ArrayList;
import java.util.Locale;
import java.util.Properties;
import java.util.ResourceBundle;
@@ -237,8 +236,6 @@ public class MainWindowController {
private String versionName = "glowing vampire";
private String dialogBtnStyle;
private String color;
- private String title;
- private String streamUrl;
private String ratingSortType;
private String local;
private String omdbAPIKey;
@@ -256,7 +253,7 @@ public class MainWindowController {
private int indexList;
private int next;
private ResourceBundle bundle;
- private FilmTabelDataType currentFilm;
+ private FilmTabelDataType currentTableFilm = new FilmTabelDataType("", "", "", "", false, false, null);
private ObservableList languages = FXCollections.observableArrayList("English (en_US)", "Deutsch (de_DE)");
private ObservableList branches = FXCollections.observableArrayList("stable", "beta");
@@ -296,8 +293,8 @@ public class MainWindowController {
loadSettings();
checkAutoUpdate();
initTabel();
- initActions();
initUI();
+ initActions();
}
// Initialize the tables (treeTableViewfilm and sourcesTable)
@@ -415,8 +412,8 @@ public class MainWindowController {
@Override
public void changed(ObservableValue extends Number> ov, Number old_val, Number new_val) {
setSize(fontsizeSlider.getValue());
- if (title != null) {
- dbController.readCache(streamUrl);
+ if (!getCurrentTitle().isEmpty()) {
+ dbController.readCache(getCurrentStreamUrl());
}
// ta1.setFont(Font.font("System", size));
saveSettings();
@@ -426,8 +423,8 @@ public class MainWindowController {
like.setOnAction(new EventHandler() {
@Override
public void handle(ActionEvent event) {
- dbController.like(streamUrl);
- dbController.refresh(streamUrl, indexList);
+ dbController.like(getCurrentStreamUrl());
+ dbController.refresh(getCurrentStreamUrl(), indexList);
refreshTable();
}
});
@@ -435,8 +432,8 @@ public class MainWindowController {
dislike.setOnAction(new EventHandler() {
@Override
public void handle(ActionEvent event) {
- dbController.dislike(streamUrl);
- dbController.refresh(streamUrl, indexList);
+ dbController.dislike(getCurrentStreamUrl());
+ dbController.refresh(getCurrentStreamUrl(), indexList);
refreshTable();
}
});
@@ -448,45 +445,25 @@ public class MainWindowController {
columnFavorite.sortTypeProperty().addListener(new ChangeListener() {
@Override
public void changed(ObservableValue extends SortType> paramObservableValue, SortType paramT1, SortType paramT2) {
- LOGGER.info("NAME Clicked -- sortType = " + paramT1 + ", SortType=" + paramT2);
- ArrayList fav_true = new ArrayList();
- ArrayList fav_false = new ArrayList();
- ObservableList helpData;
- filterData.removeAll(filterData);
-// treeTableViewfilm.getSelectionModel().clearSelection(selected);
- filmRoot.getChildren().removeAll(filmRoot.getChildren());
-
- helpData = filmsList;
-
- for (int i = 0; i < helpData.size(); i++) {
- if (helpData.get(i).getFavorite() == true) {
- fav_true.add(i);
- } else {
- fav_false.add(i);
- }
- }
- if (paramT2.toString().equals("DESCENDING")) {
- LOGGER.info("Absteigend"); // Debug, delete?
- for (int i = 0; i < fav_true.size(); i++) {
- filterData.add(helpData.get(fav_true.get(i)));
- }
- for (int i = 0; i < fav_false.size(); i++) {
- filterData.add(helpData.get(fav_false.get(i)));
+ filmRoot.getChildren().clear();
+
+ if (paramT2.equals(SortType.DESCENDING)) {
+ for (FilmTabelDataType film : filmsList) {
+ if (film.getFavorite()) {
+ filmRoot.getChildren().add(0, new TreeItem(film));
+ } else {
+ filmRoot.getChildren().add(new TreeItem(film));
+ }
}
} else {
- for (int i = 0; i < fav_false.size(); i++) {
- filterData.add(helpData.get(fav_false.get(i)));
+ System.out.println("ascending");
+ for (FilmTabelDataType film : filmsList) {
+ if (!film.getFavorite()) {
+ filmRoot.getChildren().add(new TreeItem(film));
+ } else {
+ filmRoot.getChildren().add(new TreeItem(film));
+ }
}
- for (int i = 0; i < fav_true.size(); i++) {
- filterData.add(helpData.get(fav_true.get(i)));
- }
- }
-
- LOGGER.info(filterData.size()); // Debug, delete?
- for (int i = 0; i < filterData.size(); i++) {
-// LOGGER.info(filterData.get(i).getTitle()+"; "+filterData.get(i).getRating()); // Debugging
- // add filtered data to root node after search
- filmRoot.getChildren().add(new TreeItem(filterData.get(i)));
}
}
});
@@ -495,23 +472,16 @@ public class MainWindowController {
filmsTreeTable.getSelectionModel().selectedItemProperty().addListener(new ChangeListener