diff --git a/.classpath b/.classpath index bf77390..1a8c6f1 100644 --- a/.classpath +++ b/.classpath @@ -1,11 +1,31 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.directory b/.directory index 4209d5a..7c16cdb 100644 --- a/.directory +++ b/.directory @@ -1,3 +1,6 @@ [Dolphin] -Timestamp=2016,8,15,12,18,4 -Version=3 +Timestamp=2017,7,26,17,5,28 +Version=4 + +[Settings] +HiddenFilesShown=true diff --git a/.gitignore b/.gitignore index 0cf5b30..d022a15 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,5 @@ Temporary Items .apdisk config.xml .directory +target/ diff --git a/.project b/.project index b4e5ab5..01f0bec 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - Project HomeFlix + Project-HomeFlix @@ -11,14 +11,13 @@ - org.eclipse.xtext.ui.shared.xtextBuilder + org.eclipse.m2e.core.maven2Builder - org.eclipse.xtext.ui.shared.xtextNature org.eclipse.jdt.core.javanature - org.eclipse.fx.ide.css.nature + org.eclipse.m2e.core.maven2Nature diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..839d647 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index a698e59..714351a 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,5 @@ 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=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.8 -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=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index b42b859..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/application/ diff --git a/bin/application/DBController.class b/bin/application/DBController.class deleted file mode 100644 index fe33f4a..0000000 Binary files a/bin/application/DBController.class and /dev/null differ diff --git a/bin/application/Main.class b/bin/application/Main.class deleted file mode 100644 index 7ea09ff..0000000 Binary files a/bin/application/Main.class and /dev/null differ diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml deleted file mode 100644 index 032c390..0000000 --- a/bin/application/MainWindow.fxml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class deleted file mode 100644 index 019d1fe..0000000 Binary files a/bin/application/MainWindowController$1.class and /dev/null differ diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class deleted file mode 100644 index 8f84c0c..0000000 Binary files a/bin/application/MainWindowController$2.class and /dev/null differ diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class deleted file mode 100644 index 9edde6f..0000000 Binary files a/bin/application/MainWindowController$3.class and /dev/null differ diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class deleted file mode 100644 index bcc0dea..0000000 Binary files a/bin/application/MainWindowController$4.class and /dev/null differ diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class deleted file mode 100644 index 89fdabd..0000000 Binary files a/bin/application/MainWindowController$5.class and /dev/null differ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class deleted file mode 100644 index a125619..0000000 Binary files a/bin/application/MainWindowController$6.class and /dev/null differ diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class deleted file mode 100644 index c0d7f66..0000000 Binary files a/bin/application/MainWindowController$7.class and /dev/null differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class deleted file mode 100644 index 874457b..0000000 Binary files a/bin/application/MainWindowController.class and /dev/null differ diff --git a/bin/application/apiQuery.class b/bin/application/apiQuery.class deleted file mode 100644 index 83ad53e..0000000 Binary files a/bin/application/apiQuery.class and /dev/null differ diff --git a/bin/application/tableData.class b/bin/application/tableData.class deleted file mode 100644 index 76223fc..0000000 Binary files a/bin/application/tableData.class and /dev/null differ diff --git a/bin/application/updater.class b/bin/application/updater.class deleted file mode 100644 index 53dccc4..0000000 Binary files a/bin/application/updater.class and /dev/null differ diff --git a/build.fxbuild b/build.fxbuild deleted file mode 100644 index a7511ff..0000000 --- a/build.fxbuild +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..ce3db9d --- /dev/null +++ b/pom.xml @@ -0,0 +1,92 @@ + + 4.0.0 + + org.kellerkinder + Project-HomeFlix + 0.5.2 + jar + + Project-HomeFlix + http://www.kellerkinder.xyz + + + UTF-8 + 1.8 + 1.8 + + + + + junit + junit + 3.8.1 + test + + + + commons-io + commons-io + 2.5 + + + + com.jfoenix + jfoenix + 1.6.0 + + + + com.eclipsesource.minimal-json + minimal-json + 0.9.4 + + + + org.xerial + sqlite-jdbc + 3.18.0 + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libraries/ + org.kellerkinder.Project_HomeFlix.Main + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/libraries + false + false + true + + + + + + + + + diff --git a/src/libraries/Licenses/Apache_License.txt b/src/libraries/Licenses/Apache_License.txt deleted file mode 100644 index d645695..0000000 --- a/src/libraries/Licenses/Apache_License.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/src/libraries/Licenses/MIT_License.txt b/src/libraries/Licenses/MIT_License.txt deleted file mode 100644 index 5e83ac1..0000000 --- a/src/libraries/Licenses/MIT_License.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2013, 2014 EclipseSource - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/src/libraries/commons-io-2.5.jar b/src/libraries/commons-io-2.5.jar deleted file mode 100644 index 107b061..0000000 Binary files a/src/libraries/commons-io-2.5.jar and /dev/null differ diff --git a/src/libraries/jfoenix-1.4.0.jar b/src/libraries/jfoenix-1.4.0.jar deleted file mode 100644 index 789ef3b..0000000 Binary files a/src/libraries/jfoenix-1.4.0.jar and /dev/null differ diff --git a/src/libraries/minimal-json-0.9.4.jar b/src/libraries/minimal-json-0.9.4.jar deleted file mode 100644 index 14c0633..0000000 Binary files a/src/libraries/minimal-json-0.9.4.jar and /dev/null differ diff --git a/src/libraries/sqlite-jdbc-3.18.0.jar b/src/libraries/sqlite-jdbc-3.18.0.jar deleted file mode 100644 index 8e9dce1..0000000 Binary files a/src/libraries/sqlite-jdbc-3.18.0.jar and /dev/null differ diff --git a/src/application/DBController.java b/src/main/java/org/kellerkinder/Project_HomeFlix/DBController.java similarity index 99% rename from src/application/DBController.java rename to src/main/java/org/kellerkinder/Project_HomeFlix/DBController.java index 3b841a1..6d9a943 100644 --- a/src/application/DBController.java +++ b/src/main/java/org/kellerkinder/Project_HomeFlix/DBController.java @@ -4,7 +4,7 @@ * connection is in manual commit! */ -package application; +package org.kellerkinder.Project_HomeFlix; import java.io.File; import java.io.FileNotFoundException; @@ -39,8 +39,8 @@ public class DBController { private MainWindowController mainWindowController; private Main main; private String DB_PATH = System.getProperty("user.home") + "\\Documents\\HomeFlix" + "\\" + "Homeflix.db"; //path to database file - private Image favorite_black = new Image("resources/icons/ic_favorite_black_18dp_1x.png"); - private Image favorite_border_black = new Image("resources/icons/ic_favorite_border_black_18dp_1x.png"); + private Image favorite_black = new Image("icons/ic_favorite_black_18dp_1x.png"); + private Image favorite_border_black = new Image("icons/ic_favorite_border_black_18dp_1x.png"); private List filmsdbAll = new ArrayList(); private List filmsdbLocal = new ArrayList(); private List filmsdbStream = new ArrayList(); diff --git a/src/application/Main.java b/src/main/java/org/kellerkinder/Project_HomeFlix/Main.java similarity index 90% rename from src/application/Main.java rename to src/main/java/org/kellerkinder/Project_HomeFlix/Main.java index b40c599..57d56b4 100644 --- a/src/application/Main.java +++ b/src/main/java/org/kellerkinder/Project_HomeFlix/Main.java @@ -20,7 +20,7 @@ * */ -package application; +package org.kellerkinder.Project_HomeFlix; import java.io.File; import java.io.IOException; @@ -67,13 +67,14 @@ public class Main extends Application { private void mainWindow(){ try { - FXMLLoader loader = new FXMLLoader(Main.class.getResource("MainWindow.fxml")); - AnchorPane pane = loader.load(); + FXMLLoader loader = new FXMLLoader(); + loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml")); + AnchorPane pane = (AnchorPane) loader.load(); primaryStage.setMinHeight(600.00); primaryStage.setMinWidth(900.00); primaryStage.setResizable(false); primaryStage.setTitle("Project HomeFlix"); - primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/resources/Homeflix_Icon_64x64.png"))); //adds application icon + primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/icons/Homeflix_Icon_64x64.png"))); //adds application icon mainWindowController = loader.getController(); //Link of FXMLController and controller class mainWindowController.setAutoUpdate(AUTO_UPDATE); //set auto-update @@ -128,7 +129,7 @@ public class Main extends Application { mainWindowController.addDataUI(); Scene scene = new Scene(pane); //create new scene, append pane to scene - scene.getStylesheets().add(Main.class.getResource("MainWindow.css").toExternalForm()); + scene.getStylesheets().add(getClass().getResource("/css/MainWindow.css").toExternalForm()); primaryStage.setScene(scene); //append scene to stage primaryStage.show(); //show stage } catch (IOException e) { @@ -140,11 +141,11 @@ public class Main extends Application { private String firstStart(){ MainWindowController.firststart = true; switch(System.getProperty("user.language")+"_"+System.getProperty("user.country")){ - case "en_US": bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.US); //us_english + case "en_US": bundle = ResourceBundle.getBundle("locals.HomeFlix-Local", Locale.US); //us_english break; - case "de_DE": bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.GERMAN); //German + case "de_DE": bundle = ResourceBundle.getBundle("locals.HomeFlix-Local", Locale.GERMAN); //German break; - default: bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.US); //default local + default: bundle = ResourceBundle.getBundle("locals.HomeFlix-Local", Locale.US); //default local break; } diff --git a/src/application/MainWindowController.java b/src/main/java/org/kellerkinder/Project_HomeFlix/MainWindowController.java similarity index 97% rename from src/application/MainWindowController.java rename to src/main/java/org/kellerkinder/Project_HomeFlix/MainWindowController.java index 9331187..e8caaaf 100644 --- a/src/application/MainWindowController.java +++ b/src/main/java/org/kellerkinder/Project_HomeFlix/MainWindowController.java @@ -19,7 +19,7 @@ * MA 02110-1301, USA. * */ -package application; +package org.kellerkinder.Project_HomeFlix; import java.awt.Desktop; import java.io.BufferedReader; @@ -249,12 +249,12 @@ public class MainWindowController { ObservableList localFilms = FXCollections.observableArrayList(); ObservableList streamingFilms = FXCollections.observableArrayList(); ObservableList streamingData = FXCollections.observableArrayList(); - private ImageView skip_previous_white = new ImageView(new Image("resources/icons/ic_skip_previous_white_18dp_1x.png")); - private ImageView skip_previous_black = new ImageView(new Image("resources/icons/ic_skip_previous_black_18dp_1x.png")); - private ImageView skip_next_white = new ImageView(new Image("resources/icons/ic_skip_next_white_18dp_1x.png")); - private ImageView skip_next_black = new ImageView(new Image("resources/icons/ic_skip_next_black_18dp_1x.png")); - private ImageView play_arrow_white = new ImageView(new Image("resources/icons/ic_play_arrow_white_18dp_1x.png")); - private ImageView play_arrow_black = new ImageView(new Image("resources/icons/ic_play_arrow_black_18dp_1x.png")); + private ImageView skip_previous_white = new ImageView(new Image("icons/ic_skip_previous_white_18dp_1x.png")); + private ImageView skip_previous_black = new ImageView(new Image("icons/ic_skip_previous_black_18dp_1x.png")); + private ImageView skip_next_white = new ImageView(new Image("icons/ic_skip_next_white_18dp_1x.png")); + private ImageView skip_next_black = new ImageView(new Image("icons/ic_skip_next_black_18dp_1x.png")); + private ImageView play_arrow_white = new ImageView(new Image("icons/ic_play_arrow_white_18dp_1x.png")); + private ImageView play_arrow_black = new ImageView(new Image("icons/ic_play_arrow_black_18dp_1x.png")); private DirectoryChooser directoryChooser = new DirectoryChooser(); private MenuItem like = new MenuItem("like"); private MenuItem dislike = new MenuItem("dislike"); //TODO one option (like or dislike) @@ -636,7 +636,8 @@ public class MainWindowController { }); cbLocal.getSelectionModel().selectedIndexProperty().addListener(new ChangeListener() { - public void changed(ObservableValue ov, Number value, Number new_value) { + @Override + public void changed(ObservableValue ov, Number value, Number new_value) { String local = cbLocal.getItems().get((int) new_value).toString(); local = local.substring(local.length()-6,local.length()-1); //reading only en_US from English (en_US) setLocal(local); @@ -937,15 +938,15 @@ public class MainWindowController { void setLocalUI(){ switch(getLocal()){ case "en_US": - bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.US); //us_English + bundle = ResourceBundle.getBundle("locals.HomeFlix-Local", Locale.US); //us_English cbLocal.getSelectionModel().select(0); break; case "de_DE": - bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.GERMAN); //German + bundle = ResourceBundle.getBundle("locals.HomeFlix-Local", Locale.GERMAN); //German cbLocal.getSelectionModel().select(1); break; default: - bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.US); //default local + bundle = ResourceBundle.getBundle("locals.HomeFlix-Local", Locale.US); //default local cbLocal.getSelectionModel().select(0); break; } diff --git a/src/application/apiQuery.java b/src/main/java/org/kellerkinder/Project_HomeFlix/apiQuery.java similarity index 99% rename from src/application/apiQuery.java rename to src/main/java/org/kellerkinder/Project_HomeFlix/apiQuery.java index 545ca89..cfeb617 100644 --- a/src/application/apiQuery.java +++ b/src/main/java/org/kellerkinder/Project_HomeFlix/apiQuery.java @@ -2,7 +2,7 @@ * apiQuery for Project HomeFlix * sends a query to the omdb api */ -package application; +package org.kellerkinder.Project_HomeFlix; import java.awt.Graphics2D; import java.awt.image.BufferedImage; diff --git a/src/application/tableData.java b/src/main/java/org/kellerkinder/Project_HomeFlix/tableData.java similarity index 98% rename from src/application/tableData.java rename to src/main/java/org/kellerkinder/Project_HomeFlix/tableData.java index ac8fd49..efded1c 100644 --- a/src/application/tableData.java +++ b/src/main/java/org/kellerkinder/Project_HomeFlix/tableData.java @@ -1,4 +1,4 @@ -package application; +package org.kellerkinder.Project_HomeFlix; import javafx.beans.property.BooleanProperty; import javafx.beans.property.DoubleProperty; diff --git a/src/application/updater.java b/src/main/java/org/kellerkinder/Project_HomeFlix/updater.java similarity index 98% rename from src/application/updater.java rename to src/main/java/org/kellerkinder/Project_HomeFlix/updater.java index 755a2a6..207d08d 100644 --- a/src/application/updater.java +++ b/src/main/java/org/kellerkinder/Project_HomeFlix/updater.java @@ -2,7 +2,7 @@ * updater for Project HomeFlix * checks for Updates and downloads it in case there is one */ -package application; +package org.kellerkinder.Project_HomeFlix; import java.io.BufferedReader; import java.io.File; diff --git a/src/application/MainWindow.css b/src/main/resources/css/MainWindow.css similarity index 100% rename from src/application/MainWindow.css rename to src/main/resources/css/MainWindow.css diff --git a/src/application/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml similarity index 98% rename from src/application/MainWindow.fxml rename to src/main/resources/fxml/MainWindow.fxml index 032c390..6a989be 100644 --- a/src/application/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/bin/resources/Homeflix_Icon_64x64.png b/src/main/resources/icons/Homeflix_Icon_64x64.png similarity index 100% rename from bin/resources/Homeflix_Icon_64x64.png rename to src/main/resources/icons/Homeflix_Icon_64x64.png diff --git a/bin/resources/Homeflix_Poster.png b/src/main/resources/icons/Homeflix_Poster.png similarity index 100% rename from bin/resources/Homeflix_Poster.png rename to src/main/resources/icons/Homeflix_Poster.png diff --git a/bin/resources/icons/close_black_2048x2048.png b/src/main/resources/icons/close_black_2048x2048.png similarity index 100% rename from bin/resources/icons/close_black_2048x2048.png rename to src/main/resources/icons/close_black_2048x2048.png diff --git a/bin/resources/icons/ic_favorite_black_18dp_1x.png b/src/main/resources/icons/ic_favorite_black_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_favorite_black_18dp_1x.png rename to src/main/resources/icons/ic_favorite_black_18dp_1x.png diff --git a/bin/resources/icons/ic_favorite_border_black_18dp_1x.png b/src/main/resources/icons/ic_favorite_border_black_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_favorite_border_black_18dp_1x.png rename to src/main/resources/icons/ic_favorite_border_black_18dp_1x.png diff --git a/bin/resources/icons/ic_play_arrow_black_18dp_1x.png b/src/main/resources/icons/ic_play_arrow_black_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_play_arrow_black_18dp_1x.png rename to src/main/resources/icons/ic_play_arrow_black_18dp_1x.png diff --git a/bin/resources/icons/ic_play_arrow_white_18dp_1x.png b/src/main/resources/icons/ic_play_arrow_white_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_play_arrow_white_18dp_1x.png rename to src/main/resources/icons/ic_play_arrow_white_18dp_1x.png diff --git a/bin/resources/icons/ic_search_black_18dp_1x.png b/src/main/resources/icons/ic_search_black_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_search_black_18dp_1x.png rename to src/main/resources/icons/ic_search_black_18dp_1x.png diff --git a/bin/resources/icons/ic_skip_next_black_18dp_1x.png b/src/main/resources/icons/ic_skip_next_black_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_skip_next_black_18dp_1x.png rename to src/main/resources/icons/ic_skip_next_black_18dp_1x.png diff --git a/bin/resources/icons/ic_skip_next_white_18dp_1x.png b/src/main/resources/icons/ic_skip_next_white_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_skip_next_white_18dp_1x.png rename to src/main/resources/icons/ic_skip_next_white_18dp_1x.png diff --git a/bin/resources/icons/ic_skip_previous_black_18dp_1x.png b/src/main/resources/icons/ic_skip_previous_black_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_skip_previous_black_18dp_1x.png rename to src/main/resources/icons/ic_skip_previous_black_18dp_1x.png diff --git a/bin/resources/icons/ic_skip_previous_white_18dp_1x.png b/src/main/resources/icons/ic_skip_previous_white_18dp_1x.png similarity index 100% rename from bin/resources/icons/ic_skip_previous_white_18dp_1x.png rename to src/main/resources/icons/ic_skip_previous_white_18dp_1x.png diff --git a/bin/libraries/Licenses/Apache_License.txt b/src/main/resources/libraries/Licenses/Apache_License.txt similarity index 100% rename from bin/libraries/Licenses/Apache_License.txt rename to src/main/resources/libraries/Licenses/Apache_License.txt diff --git a/bin/libraries/Licenses/MIT_License.txt b/src/main/resources/libraries/Licenses/MIT_License.txt similarity index 100% rename from bin/libraries/Licenses/MIT_License.txt rename to src/main/resources/libraries/Licenses/MIT_License.txt diff --git a/bin/libraries/commons-io-2.5.jar b/src/main/resources/libraries/commons-io-2.5.jar similarity index 100% rename from bin/libraries/commons-io-2.5.jar rename to src/main/resources/libraries/commons-io-2.5.jar diff --git a/bin/libraries/jfoenix-1.4.0.jar b/src/main/resources/libraries/jfoenix-1.6.0.jar similarity index 85% rename from bin/libraries/jfoenix-1.4.0.jar rename to src/main/resources/libraries/jfoenix-1.6.0.jar index 789ef3b..57617d8 100644 Binary files a/bin/libraries/jfoenix-1.4.0.jar and b/src/main/resources/libraries/jfoenix-1.6.0.jar differ diff --git a/bin/libraries/minimal-json-0.9.4.jar b/src/main/resources/libraries/minimal-json-0.9.4.jar similarity index 100% rename from bin/libraries/minimal-json-0.9.4.jar rename to src/main/resources/libraries/minimal-json-0.9.4.jar diff --git a/bin/libraries/sqlite-jdbc-3.18.0.jar b/src/main/resources/libraries/sqlite-jdbc-3.18.0.jar similarity index 100% rename from bin/libraries/sqlite-jdbc-3.18.0.jar rename to src/main/resources/libraries/sqlite-jdbc-3.18.0.jar diff --git a/bin/resources/HomeFlix-Local_de_DE.properties b/src/main/resources/locals/HomeFlix-Local_de_DE.properties similarity index 100% rename from bin/resources/HomeFlix-Local_de_DE.properties rename to src/main/resources/locals/HomeFlix-Local_de_DE.properties diff --git a/bin/resources/HomeFlix-Local_en_US.properties b/src/main/resources/locals/HomeFlix-Local_en_US.properties similarity index 100% rename from bin/resources/HomeFlix-Local_en_US.properties rename to src/main/resources/locals/HomeFlix-Local_en_US.properties diff --git a/src/resources/HomeFlix-Local_de_DE.properties b/src/resources/HomeFlix-Local_de_DE.properties deleted file mode 100644 index aa9c214..0000000 --- a/src/resources/HomeFlix-Local_de_DE.properties +++ /dev/null @@ -1,63 +0,0 @@ -#HomeFlix-Local_de_DE.properties German Local - -#main window translations -info = Info -settings = Einstellungen -streamingSettings = Stream Einst. -tfSearch = Suche... -openFolder = Ordner \u00F6ffnen - -#settings translations -settingsHead1Label = HomeFlix Einstellungen -tfPath = Pfad... -chooseFolder = Ordner ausw\u00E4hlen -mainColorLabel = Hauptfarbe: -fontsizeLabel = Schriftgr\u00F6\u00DFe: -localLabel = Sprache: -checkUpdates = Auf Update pr\u00FCfen -checkingUpdates = Es wird nach Updates gesucht... -updateBtnavail = Update verf\u00FCgbar -updateBtnNotavail = Kein Update verf\u00FCgbar -autoUpdateLabel = beim Start nach Updates suchen: -version = Version: - -#column translations -columnName = Name -columnRating = Bewertung -columnStreamUrl = Datei Name -columnResolution = Aufl\u00F6sung -columnSeason = Staffel -columnYear = Jahr - -#error translations -errorUpdateV = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not check update version (nvc)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz -errorUpdateD = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not download update files (ndf)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz -errorPlay = Beim \u00F6ffnen der Datei ist ein Fehler aufgetreten! \nError: could not open file (nof) \nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz -errorMode = Oh, da lief etwas falsch! Da hat jemand einen falschen Modus verwendet. \nError: mode unknow (muk)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz -errorOpenStream = Beim \u00F6ffnen des Streams ist ein Fehler aufgetreten! -errorLoad = Beim laden der Einstellungen ist ein Fehler aufgetreten! -errorSave = Beim speichern der Einstellungen ist ein Fehler aufgetreten! -noFilmFound = Kein Film mit diesem Titel gefunden! -vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt! -infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016-2017 Kellerkinder www.kellerkinder.xyz - -#textFlow translations -title = Titel -year = Jahr -rating = Einstufung -publishedOn = Ver\u00F6ffentlicht am -duration = Laufzeit -genre = Gener -director = Regisseur -writer = Autor -actors = Schauspieler -plot = Beschreibung -language = Original Sprache -country = Produktionsland -awards = Auszeichnungen -metascore = Metascore -imdbRating = IMDB-Bewertung -type = Type - -firstStartHeader = Es ist kein Stammverzeichnis f\u00FCr Filme angegeben! -firstStartContent = Stammverzeichniss angeben? diff --git a/src/resources/HomeFlix-Local_en_US.properties b/src/resources/HomeFlix-Local_en_US.properties deleted file mode 100644 index d166f04..0000000 --- a/src/resources/HomeFlix-Local_en_US.properties +++ /dev/null @@ -1,63 +0,0 @@ -#HomeFlix-Local_en_US.properties US-English Local and default - -#main window translations -info = Info -settings = Settings -streamingSettings = Stream Settings -tfSearch = Search... -openFolder = open Folder - -#settings translations -settingsHead1Label = HomeFlix Settings -tfPath = Path... -chooseFolder = choose Directory -mainColorLabel = main color: -fontsizeLabel = font size: -localLabel = local: -checkUpdates = check for updates -checkingUpdates = checking for updates... -updateBtnavail = update available -updateBtnNotavail = no update available -autoUpdateLabel = check at startup for updates: -version = Version: - -#column translations -columnName = Name -columnRating = Rating -columnStreamUrl = File Name -columnResolution = Resolution -columnSeason = Season -columnYear = Year - -#error translations -errorUpdateV = An error has occurred during update! \nError: could not check update version (nvc) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz -errorUpdateD = An error has occurred during update! \nError: could not download update files (ndf) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz -errorPlay = An error has occurred during opening the file! \nError: could not open file (nof) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz -errorMode = Oh, something went wrong! It seems someone has used a wrong mode. \nError: mode unknow (muk) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz -errorOpenStream = An error has occurred during opening the stream! -errorLoad = An error occurred while loading the settings! -errorSave = An error occurred while saving the settings! -noFilmFound = No film with this title found! -vlcNotInstalled = VLC Media Player is required to play a movie! -infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016-2017 Kellerkinder www.kellerkinder.xyz - -#textFlow translations -title = Title -year = Year -rating = Rating -publishedOn = published on -duration = Duration -genre = Gener -director = Director -writer = Writer -actors = Actors -plot = Plot -language = Language -country = Country -awards = Awards -metascore = Metascore -imdbRating = IMDB-Rating -type = Type - -firstStartHeader = There is no root directory for movies! -firstStartContent = Specify a root directory? diff --git a/src/resources/Homeflix_Icon_64x64.png b/src/resources/Homeflix_Icon_64x64.png deleted file mode 100644 index 64787d6..0000000 Binary files a/src/resources/Homeflix_Icon_64x64.png and /dev/null differ diff --git a/src/resources/Homeflix_Poster.png b/src/resources/Homeflix_Poster.png deleted file mode 100644 index 9f2aa98..0000000 Binary files a/src/resources/Homeflix_Poster.png and /dev/null differ diff --git a/src/resources/icons/close_black_2048x2048.png b/src/resources/icons/close_black_2048x2048.png deleted file mode 100644 index 2d0397b..0000000 Binary files a/src/resources/icons/close_black_2048x2048.png and /dev/null differ diff --git a/src/resources/icons/ic_favorite_black_18dp_1x.png b/src/resources/icons/ic_favorite_black_18dp_1x.png deleted file mode 100644 index 69be1f5..0000000 Binary files a/src/resources/icons/ic_favorite_black_18dp_1x.png and /dev/null differ diff --git a/src/resources/icons/ic_favorite_border_black_18dp_1x.png b/src/resources/icons/ic_favorite_border_black_18dp_1x.png deleted file mode 100644 index 7edb675..0000000 Binary files a/src/resources/icons/ic_favorite_border_black_18dp_1x.png and /dev/null differ diff --git a/src/resources/icons/ic_play_arrow_black_18dp_1x.png b/src/resources/icons/ic_play_arrow_black_18dp_1x.png deleted file mode 100644 index 96021dc..0000000 Binary files a/src/resources/icons/ic_play_arrow_black_18dp_1x.png and /dev/null differ diff --git a/src/resources/icons/ic_play_arrow_white_18dp_1x.png b/src/resources/icons/ic_play_arrow_white_18dp_1x.png deleted file mode 100644 index cae85ab..0000000 Binary files a/src/resources/icons/ic_play_arrow_white_18dp_1x.png and /dev/null differ diff --git a/src/resources/icons/ic_search_black_18dp_1x.png b/src/resources/icons/ic_search_black_18dp_1x.png deleted file mode 100644 index f0d4e97..0000000 Binary files a/src/resources/icons/ic_search_black_18dp_1x.png and /dev/null differ diff --git a/src/resources/icons/ic_skip_next_black_18dp_1x.png b/src/resources/icons/ic_skip_next_black_18dp_1x.png deleted file mode 100644 index 327fd8d..0000000 Binary files a/src/resources/icons/ic_skip_next_black_18dp_1x.png and /dev/null differ diff --git a/src/resources/icons/ic_skip_next_white_18dp_1x.png b/src/resources/icons/ic_skip_next_white_18dp_1x.png deleted file mode 100644 index 26434a0..0000000 Binary files a/src/resources/icons/ic_skip_next_white_18dp_1x.png and /dev/null differ diff --git a/src/resources/icons/ic_skip_previous_black_18dp_1x.png b/src/resources/icons/ic_skip_previous_black_18dp_1x.png deleted file mode 100644 index 34c528d..0000000 Binary files a/src/resources/icons/ic_skip_previous_black_18dp_1x.png and /dev/null differ diff --git a/src/resources/icons/ic_skip_previous_white_18dp_1x.png b/src/resources/icons/ic_skip_previous_white_18dp_1x.png deleted file mode 100644 index e7d7643..0000000 Binary files a/src/resources/icons/ic_skip_previous_white_18dp_1x.png and /dev/null differ diff --git a/src/test/java/org/kellerkinder/Project_HomeFlix/AppTest.java b/src/test/java/org/kellerkinder/Project_HomeFlix/AppTest.java new file mode 100644 index 0000000..12afbc3 --- /dev/null +++ b/src/test/java/org/kellerkinder/Project_HomeFlix/AppTest.java @@ -0,0 +1,38 @@ +package org.kellerkinder.Project_HomeFlix; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/updates/ProjectHomeFlix.jar b/updates/ProjectHomeFlix.jar deleted file mode 100644 index 31122e3..0000000 Binary files a/updates/ProjectHomeFlix.jar and /dev/null differ diff --git a/updates/buildNumber.txt b/updates/buildNumber.txt deleted file mode 100644 index c75acbe..0000000 --- a/updates/buildNumber.txt +++ /dev/null @@ -1 +0,0 @@ -127 diff --git a/updates/downloadLink.txt b/updates/downloadLink.txt deleted file mode 100644 index 61d3ac5..0000000 --- a/updates/downloadLink.txt +++ /dev/null @@ -1 +0,0 @@ -https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/ProjectHomeFlix.jar \ No newline at end of file diff --git a/updates/version.txt b/updates/version.txt deleted file mode 100644 index 1d0ba9e..0000000 --- a/updates/version.txt +++ /dev/null @@ -1 +0,0 @@ -0.4.0