Merge pull request #7 from Seil0/dev

updated to 0.5.0 "plasma cow"

.classpath

@@ -3,7 +3,10 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/jfoenix.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/minimal-json-0.9.4.jar"/>
+	<classpathentry kind="lib" path="src/libraries/minimal-json-0.9.4.jar"/>
+	<classpathentry kind="lib" path="src/libraries/commons-lang3-3.5.jar"/>
+	<classpathentry kind="lib" path="src/libraries/jfoenix-1.1.0.jar"/>
+	<classpathentry kind="lib" path="src/libraries/sqlite-jdbc-3.16.1.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Jannik/Downloads/flow-8.0.7.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.directory

@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2016,8,15,12,18,4
+Version=3

.gitignore

@@ -45,7 +45,5 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
-jfoenix.jar
-minimal-json-0.9.4.jar
 config.xml
 

.project

@@ -19,5 +19,6 @@
 	<natures>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.fx.ide.css.nature</nature>
 	</natures>
 </projectDescription>

README.md

@@ -1,24 +1,18 @@
 # Project-HomeFlix
 
-Project HomeFlix is a Kellerkinder Project. More Information soon ...     
+
+Project HomeFlix is a Kellerkinder Project, that alowes you to sort all your local saved movies in clean UI.     
+This is the master branch, it is **only merged** with dev if a **new release** is out.     
 
 Librarys used in this Project:  
-JFoenix  https://github.com/jfoenixadmin/JFoenix   
-minimal-json  https://github.com/ralfstx/minimal-json
+JFoenix: https://github.com/jfoenixadmin/JFoenix   
+minimal-json: https://github.com/ralfstx/minimal-json   
+Commons Lang: https://commons.apache.org/proper/commons-lang/      
+sqlite-jdbc: https://github.com/xerial/sqlite-jdbc
 
 ## Installation
 
-download compiled .jar
+[wiki](https://github.com/Seil0/Project-HomeFlix/wiki) 
 
-##FAQ    
-- HomeFlix isn't starting after update    
-  - delete the config.xml file and start HomeFlix again
-- can't choos a main color
-  - restart HomeFlix
-- HomeFlix hangs or dosen't responde
-  - try restarting it and check the movie names  
-- cann't start HomeFlix under Linux
-  - check your Java version. Java 8 update 91 is required
-
-Project HomeFlix © 2016 Software Development Kellerkinder (SDK)     
+Project HomeFlix © 2016-2017 Software Development Kellerkinder (SDK)     
 www.kellerkinder.xyz

bin/application/HomeFlix-Local_de_DE.properties

@@ -1,16 +0,0 @@
-# HomeFlix-Local_de_DE.properties German Local
-info = Info
-settings = Einstellungen
-play = play
-openFolder = Ordner \u00F6ffnen
-chooseFolder = Ordner ausw\u00E4hlen
-fontSize = Schriftgr\u00F6\u00DFe:
-checkUpdates = Auf Update pr\u00FCfen
-autoUpdate = beim Start nach Updates suchen:
-version = Version:
-columnName = Name
-columnRating = Bewertung
-columnDatName = Datei Name
-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
-infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz

bin/application/HomeFlix-Local_en_US.properties

@@ -1,16 +0,0 @@
-#  HomeFlix-Local_en_US.properties US-English Local and default
-info = Info
-settings = Settings
-play = play
-openFolder = open Folder
-chooseFolder = choose Directory
-fontSize = font size:
-checkUpdates = check for updates
-autoUpdate = check at startup for updates:
-version = Version:
-columnName = Name
-columnRating = Rating
-columnDatName = File Name
-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
-infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz

bin/application/MainWindow.fxml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXColorPicker?>
+<?import com.jfoenix.controls.JFXSlider?>
 <?import com.jfoenix.controls.JFXTextArea?>
 <?import com.jfoenix.controls.JFXTextField?>
+<?import com.jfoenix.controls.JFXToggleButton?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TreeTableView?>
+<?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
+<?import javafx.scene.text.TextFlow?>
 
-<AnchorPane fx:id="anpane" prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.MainWindowController">
+<AnchorPane fx:id="anpane" prefHeight="600.0" prefWidth="950.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.MainWindowController">
 	<children>
-		<VBox fx:id="topVBox" prefHeight="32.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-			<children>
-				<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="67.0" text="Menu" />
-			</children>
-		</VBox>
-		<TreeTableView fx:id="treeTableViewfilm" layoutX="14.0" layoutY="88.0" prefHeight="400.0" prefWidth="360.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.topAnchor="88.0" />
-		<JFXTextArea fx:id="ta1" layoutX="385.0" layoutY="42.0" maxWidth="503.0" minWidth="275.0" prefHeight="546.0" prefWidth="293.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="385.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0" />
-		<JFXButton fx:id="playbtn" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" text="play" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0">
+		<TreeTableView fx:id="treeTableViewfilm" layoutX="14.0" layoutY="88.0" prefHeight="400.0" prefWidth="360.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="553.0" AnchorPane.topAnchor="88.0" />
+		<JFXTextArea fx:id="ta1" layoutX="385.0" layoutY="42.0" maxWidth="503.0" minWidth="275.0" prefHeight="546.0" prefWidth="293.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="410.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0" />
+      <TextFlow fx:id="textFlow" layoutX="496.0" layoutY="131.0" prefHeight="200.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="15.0" AnchorPane.leftAnchor="410.0" AnchorPane.rightAnchor="220.0" AnchorPane.topAnchor="44.0" />
+		<JFXButton fx:id="playbtn" contentDisplay="CENTER" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0">
          <font>
             <Font name="System Bold" size="14.0" />
          </font></JFXButton>
@@ -26,12 +31,69 @@
          <font>
             <Font name="System Bold" size="14.0" />
          </font></JFXButton>
-		<JFXTextField fx:id="tfsearch" layoutX="12.0" layoutY="44.0" maxWidth="477.0" minWidth="359.0" prefHeight="31.0" prefWidth="359.0" promptText="Suche ..." AnchorPane.leftAnchor="12.0" AnchorPane.topAnchor="44.0">
+		<JFXTextField fx:id="tfsearch" layoutX="12.0" layoutY="44.0" maxWidth="477.0" minWidth="359.0" prefHeight="31.0" prefWidth="359.0" promptText="Suche ..." AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="553.0" AnchorPane.topAnchor="44.0">
          <font>
             <Font name="Arial" size="12.0" />
          </font></JFXTextField>
-      <ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0" />
-      <JFXButton fx:id="returnBtn" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" text="&lt;&lt;" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" />
-      <JFXButton fx:id="forwardBtn" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" text="&gt;&gt;" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" />
+      <ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0">
+         <image>
+            <Image url="@../recources/Homeflix_Poster.png" />
+         </image></ImageView>
+      <JFXButton fx:id="returnBtn" contentDisplay="CENTER" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" />
+      <JFXButton fx:id="forwardBtn" contentDisplay="CENTER" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" />
+      <HBox fx:id="topHBox" layoutY="12.0" prefHeight="32.0" prefWidth="900.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+				<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="32.0" />
+         </children>
+      </HBox>
+      <VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="660.0" prefWidth="150.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXButton fx:id="infoBtn" onAction="#infoBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="settingsBtn" onAction="#settingsBtnclicked" prefHeight="37.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="streamingSettingsBtn" onAction="#streamingSettingsBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="switchBtn" onAction="#switchBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="debugBtn" onAction="#debugBtnclicked" prefHeight="32.0" prefWidth="150.0" text="debugging" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+         </children>
+      </VBox>
+      <AnchorPane fx:id="streamingSettingsAnchor" layoutX="138.0" layoutY="33.0" prefHeight="566.0" prefWidth="760.0" style="-fx-background-color: #FFFFFF;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXTextField fx:id="tfStreamingPath" layoutX="14.0" layoutY="14.0" onAction="#tfStreamingPathAction" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0" />
+            <JFXButton fx:id="streamingDirectoryBtn" layoutX="263.0" layoutY="2.0" onAction="#streamingDirectoryBtnAction" AnchorPane.leftAnchor="260.0" AnchorPane.topAnchor="5.0" />
+            <TableView fx:id="tableViewStreamingdata" layoutX="14.0" layoutY="44.0" prefHeight="200.0" prefWidth="300.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="40.0" />
+         </children></AnchorPane>
+      <AnchorPane fx:id="settingsAnchor" layoutX="160.0" layoutY="44.0" prefHeight="566.0" prefWidth="760.0" style="-fx-background-color: #FFFFFF;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXTextField fx:id="tfPath" layoutX="14.0" layoutY="14.0" onAction="#tfPathAction" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0" />
+            <JFXButton fx:id="directoryBtn" layoutX="255.0" layoutY="8.0" onAction="#directoryBtnAction" prefHeight="25.0" AnchorPane.leftAnchor="260.0" />
+            <JFXColorPicker fx:id="mainColor" layoutX="14.0" layoutY="45.0" onAction="#mainColorAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="40.0" />
+            <Label fx:id="sizelbl" layoutY="73.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="75.0" />
+            <JFXSlider fx:id="sliderFontSize" layoutX="10.0" layoutY="99.0" max="48.0" min="2.0" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="110.0" />
+            <ChoiceBox fx:id="cbLocal" layoutX="14.0" layoutY="131.0" prefWidth="150.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="145.0" />
+            <JFXButton fx:id="updateBtn" layoutX="7.0" layoutY="177.0" onAction="#updateBtnAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="180.0" />
+            <Label fx:id="aulbl" layoutX="43.0" layoutY="219.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="215.0" />
+            <JFXToggleButton fx:id="autoupdateBtn" layoutX="19.0" layoutY="215.0" onAction="#autoupdateBtnAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="230.0" />
+            <Label fx:id="versionlbl" layoutX="29.0" layoutY="297.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="280.0" />
+         </children>
+      </AnchorPane>
 	</children>
 </AnchorPane>

bin/libraries/Licenses/Apache_License.txt

@@ -0,0 +1,202 @@
+
+                                 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.

bin/libraries/Licenses/MIT_License.txt

@@ -0,0 +1,19 @@
+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.

bin/recources/HomeFlix-Local_de_DE.properties

@@ -0,0 +1,49 @@
+# HomeFlix-Local_de_DE.properties German Local
+info = Info
+settings = Einstellungen
+streamingSettings = Stream Einst.
+tfPath = Pfad...
+tfSearch = Suche...
+openFolder = Ordner \u00F6ffnen
+chooseFolder = Ordner ausw\u00E4hlen
+fontSize = Schriftgr\u00F6\u00DFe:
+checkUpdates = Auf Update pr\u00FCfen
+updateBtnavail = Update verf\u00FCgbar
+updateBtnNotavail = Kein Update verf\u00FCgbar
+autoUpdate = beim Start nach Updates suchen:
+version = Version:
+columnName = Name
+columnRating = Bewertung
+columnStreamUrl = Datei Name
+columnResolution = Aufl\u00F6sung
+columnSeason = Staffel
+columnYear = Jahr
+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!
+linuxBug = Zurzeit werden unter Linux leider keine Dateien mit Leerzeichen unterst\u00FCtzt!
+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
+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?

bin/recources/HomeFlix-Local_en_US.properties

@@ -0,0 +1,49 @@
+#  HomeFlix-Local_en_US.properties US-English Local and default
+info = Info
+settings = Settings
+streamingSettings = Stream Settings
+tfPath = Path...
+tfSearch = Search...
+openFolder = open Folder
+chooseFolder = choose Directory
+fontSize = font size:
+checkUpdates = check for updates
+updateBtnavail = update available
+updateBtnNotavail = no update available
+autoUpdate = check at startup for updates:
+version = Version:
+columnName = Name
+columnRating = Rating
+columnStreamUrl = File Name
+columnResolution = Resolution
+columnSeason = Season
+columnYear = Year
+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!
+linuxBug = Currently no files are supported with additional space under Linux unfortunately!
+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
+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?

config.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-<comment>Project HomeFlix settings</comment>
-<entry key="autoUpdate">0</entry>
-<entry key="color">ee3523</entry>
-<entry key="local">1</entry>
-<entry key="size">12.0</entry>
-<entry key="path">C:\Users\Jannik\Videos\Beispielfilme</entry>
-</properties>

src/application/DBController.java

@@ -1,204 +1,468 @@
+/**
+ * DBController for Project HomeFlix
+ * connection is in manual commit!
+ * TODO arraylists not string -> streamUIData
+ */
+
 package application;
 
-import java.sql.Connection;  //f<>r Datenbank
-import java.sql.DriverManager; //f<>r Datenbank
-import java.sql.PreparedStatement; //f<>r Datenbank
-import java.sql.ResultSet; //f<>r Datenbank
-import java.sql.SQLException; //f<>r Datenbank
-import java.sql.Statement; //f<>r Datenbank
-import java.io.File;//f<>r Dateien einlesen
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
 
-class DBController { 
+import com.eclipsesource.json.Json;
+import com.eclipsesource.json.JsonArray;
+import com.eclipsesource.json.JsonObject;
+import com.eclipsesource.json.JsonValue;
+
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+
+public class DBController {
+
+	public DBController(MainWindowController m) {
+		mainWindowController = m;
+	}
 
-	@SuppressWarnings("unused")
 	private MainWindowController mainWindowController;
-	private static final DBController dbcontroller = new DBController(); 
-	private static Connection connection; 
-	private static final String DB_PATH = System.getProperty("user.dir") + "/" + "Homeflix.db"; // der Pfad der Datenbank-Datei
-	private String path;
-	File f; 
-	File file[]; //ArrayList f<>r die Dateien
+	private String DB_PATH = System.getProperty("user.home") + "\\Documents\\HomeFlix" + "\\" + "Homeflix.db"; //path to database file
+	private Image favorite_black = new Image("recources/icons/ic_favorite_black_18dp_1x.png");
+	private Image favorite_border_black = new Image("recources/icons/ic_favorite_border_black_18dp_1x.png");
+	private List<String> filmsdbAll = new ArrayList<String>();
+	private List<String> filmsdbLocal = new ArrayList<String>();
+	private List<String> filmsdbStream = new ArrayList<String>();
+	private List<String> filmsdbStreamURL = new ArrayList<String>();
+	private List<String> filmsAll = new ArrayList<String>();
+	private List<String> filmsDir = new ArrayList<String>();
+	private List<String> filmsStream = new ArrayList<String>();
+	private List<String> filmsStreamURL = new ArrayList<String>();	
+	private List<String> filmsStreamData = new ArrayList<String>();
+	Connection connection = null;
 
-	static { 
+	public void main() {
+		if (System.getProperty("os.name").equals("Linux")) {
+			DB_PATH = System.getProperty("user.home") + "/HomeFlix/Homeflix.db";
+		}else{
+			DB_PATH = System.getProperty("user.home") + "\\Documents\\HomeFlix" + "\\" + "Homeflix.db";
+		}
 		try {
-			Class.forName("org.sqlite.JDBC"); //Datenbanktreiber
-		} catch (ClassNotFoundException e) { 
-			System.err.println("Fehler beim Laden des JDBC-Treibers"); 
-			e.printStackTrace(); 
-		} 
-	} 
-
-	public static void main(String input) { 
-		DBController datenbank = DBController.getInstance(); //neues Datenbank-Objekt wird erstellt
-		datenbank.setPath(input); // Pfad zuweisen
-		datenbank.f = new File(datenbank.getPath()); // f<>r Datenbank-Datei einlesen
-		datenbank.file = datenbank.f.listFiles(); // f<>r Datenbank-Datei einlesen
-		datenbank.verbindeDatenbank(); 
-		datenbank.fuelleDatenbank(); 
-		//datenbank.defavorisieren("Frozen");
-		//datenbank.favorisieren("Frozen");
-		//datenbank.ausgebenTitel();
-		//System.out.println("Pfad: " + datenbank.getPfad("Frozen"));
-		//System.out.println("Bewertung: " + datenbank.getFavStatus("Frozen"));
-	} 
-
-	DBController(){ 
-	} 
-
-	private static DBController getInstance(){ 
-		return dbcontroller; 
-	} 
-// Die Datenbak wird mit Hilfe des JDBC-Treibers eingebunden
-	public void verbindeDatenbank() { 
-		try { 
-			if (connection != null) 
-				return; 
-			System.out.println("Erstelle Verbindung zur Datenbank..."); 
+			// create a database connection
 			connection = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH);
-			if (!connection.isClosed()) 
-				System.out.println("...Verbindung hergestellt"); 
+			// Statement statement = connection.createStatement();
+			// statement.setQueryTimeout(30); // set timeout to 30 sec. TODO don't know what to do with this
+
+			connection.setAutoCommit(false);	//AutoCommit to false -> manual commit is active
+//			fuelleDatenbank();
 		} catch (SQLException e) {
-			throw new RuntimeException(e); 
+			// if the error message is "out of memory", it probably means no database file is found
+			System.err.println(e.getMessage());
 		}
-
-		Runtime.getRuntime().addShutdownHook(new Thread() { 
-			public void run() { 
-				try { 
-					if (!connection.isClosed() && connection != null) { 
-						connection.close(); 
-						if (connection.isClosed()) 
-							System.out.println("Verbindung getrennt"); 
-					} 
-				} catch (SQLException e) { 
-					e.printStackTrace(); 
-				} 
-			} 
-		}); 
-	} 
-// Die Dateien werden in die Datenbank geschrieben
-	public void fuelleDatenbank() { 
-
-		try { 
-			System.out.println("Erstelle Eintr<74>ge");
-			Statement stmt = connection.createStatement(); 
-			stmt.executeUpdate("DROP TABLE IF EXISTS filme;"); 
-			stmt.executeUpdate("CREATE TABLE filme (titel, pfad, bewertung);"); // Tabelle "filme" und die Spalten "titel", "pfad", "bewertung" erstellen
-
-			PreparedStatement ps = connection.prepareStatement("INSERT INTO filme VALUES (?, ?, ?);"); // SQL Befehl
-
-			//System.out.println(file.length);
-
-			for(int i=0;i!=file.length;i++) // Geht alle Dateien im Verzeichniss durch
-			{
-				//System.out.println(file[i].getName());
-				ps.setString(1, ohneEndung(file[i].getName())); // definiert Name als String in der ersten Spalte
-				ps.setString(2,file[i].getName()); // definiert Pfad als String in der zweiten Spalte
-				ps.setInt(3, 0); // definiert Bewertung als Integer in der dritten Spalte
-				ps.addBatch(); // f<>gt den Eintrag hinzu
-			}
-
-			connection.setAutoCommit(false); 
-			ps.executeBatch();  // scheibt alle Eintr<74>ge in die Datenbank
-			connection.setAutoCommit(true); 
+//		finally {
+//			try {
+//				if (connection != null)
 //					connection.close();
-		} catch (SQLException e) { 
-			System.err.println("Konnte nicht ausgef<65>hrt werden"); 
-			e.printStackTrace(); 
-		} 
+//			} catch (SQLException e) {
+//				// connection close failed.
+//				System.err.println(e);
+//			}
+//		}
 	}
 	
-	public void ausgeben(){
-		System.out.println("Eintr<EFBFBD>ge ausgeben"); 
+	void createDatabase() { 
+		System.out.println("<==========starting loading sql==========>");
+		
+		PreparedStatement ps;
+		PreparedStatement psS;	
+	
 		try {
 			Statement stmt = connection.createStatement();
-		mainWindowController = new MainWindowController();
-			ResultSet rs = stmt.executeQuery("SELECT * FROM filme;"); 
+			stmt.executeUpdate("create table if not exists film_local (rating, titel, streamUrl, favIcon)");
+			stmt.executeUpdate("create table if not exists film_streaming (year, season, episode, rating, resolution, titel, streamUrl, favIcon)");
+			stmt.close();
+		} catch (SQLException e1) {
+			e1.printStackTrace();
+		} 
+			
+			try { 
+				Statement stmt = connection.createStatement(); 
+				ResultSet rs = stmt.executeQuery("SELECT * FROM film_local"); 
 				while (rs.next()) { 
-//				MainWindowController mainWindowController = new MainWindowController();
+					filmsdbLocal.add(rs.getString(2));
 				}
-			//rs.close(); 
-//			mainWindowController.initTabel();
+				stmt.close();
+				rs.close();
 
+				rs = stmt.executeQuery("SELECT * FROM film_streaming;"); 
+				while (rs.next()) { 
+					filmsdbStream.add(rs.getString(6));
+					filmsdbStreamURL.add(rs.getString(7));
+				}
+				stmt.close();
+				rs.close();
+			}catch (SQLException ea){
+				System.err.println("Ups! an error occured!"); 
+				ea.printStackTrace();
+			}
 			
-		} catch (SQLException e) { 
-			System.err.println("Konnte nicht ausgef<65>hrt werden"); 
+			String[] entries = new File(mainWindowController.getPath()).list();
+			if(mainWindowController.getPath().equals("") || mainWindowController.getPath() == null){
+				System.out.println("Kein Pfad angegeben");	//if path == null or ""
+			}else{
+				System.out.println(entries.length);
+				for(int i=0;i!=entries.length;i++){
+					filmsDir.add(cutOffEnd(entries[i]));
+				}
+			}
+				
+			for(int v=0; v< mainWindowController.streamingData.size(); v++){
+				String fileName = mainWindowController.getStreamingPath()+"/"+mainWindowController.streamingData.get(v).getStreamUrl();
+				try {
+					JsonObject object = Json.parse(new FileReader(fileName)).asObject();
+					JsonArray items = object.get("entries").asArray();
+					for (JsonValue item : items) {
+						filmsStream.add(item.asObject().getString("titel",""));
+						filmsStreamURL.add(item.asObject().getString("streamUrl",""));
+						filmsStreamData.add(fileName);
+					}
+				} catch (IOException e) {
 					e.printStackTrace();
 				}
+				}		
+			filmsAll.addAll(filmsDir);
+			filmsAll.addAll(filmsStream);
+			filmsdbAll.addAll(filmsdbLocal);
+			filmsdbAll.addAll(filmsdbStream);
+			System.out.println("films in directory: "+filmsAll.size());
+			System.out.println("filme in db: "+filmsdbAll.size());
 
 				
+				if(filmsdbAll.size() == 0){
+					System.out.println("creating entries ...");
+					
+					try{
+						ps = connection.prepareStatement("insert into film_local values (?, ?, ?, ?)");
+						psS = connection.prepareStatement("insert into film_streaming values (?, ?, ?, ?, ?, ?, ?, ?)");
+						
+						if(mainWindowController.getPath().equals("") || mainWindowController.getPath() == null){
+							System.out.println("Kein Pfad angegeben");	//if path == null or ""
+						}else{
+							for(int j=0;j!=entries.length;j++) //goes through all the files in the directory
+							{
+								ps.setInt(1, 0); //rating as integer 1. column
+								ps.setString(2, cutOffEnd(entries[j])); //name as String without ending 2. column
+								ps.setString(3,entries[j]); //path as String 3. column
+								ps.setString(4, "favorite_border_black");
+								ps.addBatch(); // add command to prepared statement
+							}
+						}
+					
+						if(mainWindowController.getStreamingPath().equals("")||mainWindowController.getStreamingPath().equals(null)){
+							System.out.println("Kein Pfad angegeben");	//if path == null or ""
+						}else{						
+							for(int i=0; i< mainWindowController.streamingData.size(); i++){
+							String fileNamea = mainWindowController.getStreamingPath()+"/"+mainWindowController.streamingData.get(i).getStreamUrl();
+							try {
+								JsonObject object = Json.parse(new FileReader(fileNamea)).asObject();
+								JsonArray items = object.get("entries").asArray();
+								for (JsonValue item : items) {
+									psS.setInt(1, item.asObject().getInt("year", 0));
+									psS.setInt(2, item.asObject().getInt("season", 0));
+									psS.setInt(3, item.asObject().getInt("episode", 0));
+									psS.setInt(4, 0);
+									psS.setString(5, item.asObject().getString("resolution", ""));
+									psS.setString(6, item.asObject().getString("titel",""));
+									psS.setString(7, item.asObject().getString("streamUrl", ""));
+									psS.setString(8, "favorite_border_black");
+									psS.addBatch(); // add command to prepared statement
+								}
+							} catch (IOException e) {
+								e.printStackTrace();
+							}
+						}
+						}
+						ps.executeBatch();  //execute statement to write entries into table
+						psS.executeBatch();			
+						connection.commit();
+						ps.close();
+						psS.close();
+					}catch (SQLException ea) { 
+						System.err.println("Konnte nicht ausgef<65>hrt werden"); 
+						ea.printStackTrace(); 
+					}
+				}else {
+
+					
+					try {
+						try {
+							checkAddEntry();
+						} catch (IOException e) {
+							e.printStackTrace();
+						}	//check if added a new file
+						checkRemoveEntry();	//check if removed a file
+					} catch (SQLException e) {
+						e.printStackTrace();
+					}
+				}
+	}
+	
+	//loading data from database to mainWindowController 
+	void loadData(){
+		System.out.println("loading data to mwc ..."); 
+		try { 
+			//load local Data
+			Statement stmt = connection.createStatement(); 
+			ResultSet rs = stmt.executeQuery("SELECT * FROM film_local"); 
+			while (rs.next()) {
+				if(rs.getString(4).equals("favorite_black")){
+					mainWindowController.newData.add( new streamUiData(1, 1, 1, rs.getDouble(1), "1", rs.getString(2), rs.getString(3), new ImageView(favorite_black)));
+				}else{
+					mainWindowController.newData.add( new streamUiData(1, 1, 1, rs.getDouble(1), "1", rs.getString(2), rs.getString(3), new ImageView(favorite_border_black)));
+				}
+			}
+			stmt.close();
+			rs.close();
+			
+			//load streaming Data TODO check if there are streaming data before loading -> maybe there is an issue now
+			rs = stmt.executeQuery("SELECT * FROM film_streaming;"); 
+			while (rs.next()) {
+				if(rs.getString(8).equals("favorite_black")){
+					mainWindowController.streamData.add(new streamUiData(rs.getInt(1), rs.getInt(2), rs.getInt(3), rs.getDouble(4), rs.getString(5), rs.getString(6), rs.getString(7),  new ImageView(favorite_black)));
+				}else{
+					mainWindowController.streamData.add(new streamUiData(rs.getInt(1), rs.getInt(2), rs.getInt(3), rs.getDouble(4), rs.getString(5), rs.getString(6), rs.getString(7), new ImageView(favorite_border_black)));
+				}
+			}
+			stmt.close();
+			rs.close(); 		
+		} catch (SQLException e) { 
+			System.err.println("Ups! an error occured!"); 
+			e.printStackTrace(); 
+		}
+		System.out.println("<==========finished loading sql==========>"); 
+	}
+	
+	//Refreshes the data in mainWindowController.newDaten and mainWindowController.streamData
+	//TODO it seems that there is an issue at the moment with streaming refreshing wrong entry if there is more than one with the same name
+	void refresh(String name,int i) throws SQLException{
+		System.out.println("refresh ...");
+		Statement stmt;		
+		
+		try {
+			stmt = connection.createStatement();
+			ResultSet rs = stmt.executeQuery("SELECT * FROM film_local WHERE titel = '"+name+"';" );
+			if(rs.getString(4).equals("favorite_black")){
+				mainWindowController.newData.set(i, new streamUiData(1, 1, 1, rs.getDouble(1), "1", rs.getString(2), rs.getString(3),  new ImageView(favorite_black)));
+			}else{
+				mainWindowController.newData.set(i, new streamUiData(1, 1, 1, rs.getDouble(1), "1", rs.getString(2), rs.getString(3), new ImageView(favorite_border_black)));
+			}
+			stmt.close();
+			rs.close();
+		} catch (SQLException e) {
+			try {
+				stmt = connection.createStatement();
+				ResultSet rs = stmt.executeQuery("SELECT * FROM film_streaming WHERE titel = '"+name+"';" );
+				if(rs.getString(8).equals("favorite_black")){
+					mainWindowController.streamData.set(i,new streamUiData(rs.getInt(1), rs.getInt(2), rs.getInt(3), rs.getDouble(4), rs.getString(5), rs.getString(6), rs.getString(7),  new ImageView(favorite_black)));
+				}else{
+					mainWindowController.streamData.set(i,new streamUiData(rs.getInt(1), rs.getInt(2), rs.getInt(3), rs.getDouble(4), rs.getString(5), rs.getString(6), rs.getString(7), new ImageView(favorite_border_black)));
+				}
+				stmt.close();
+				rs.close();
+			} catch (SQLException e1) {
+				System.err.println("Ups! an error occured!"); 
+				e1.printStackTrace(); 
+			} 
+		} 
+	}
+	
+	private void checkRemoveEntry() throws SQLException{
+		System.out.println("checking for entrys to remove to DB ...");
+		Statement stmt = connection.createStatement(); 
+		
+		for(int a=0; a<filmsdbLocal.size(); a++){
+			if(filmsDir.contains(filmsdbLocal.get(a))){
+			}else{
+				stmt.executeUpdate("delete from film_local where titel = '"+filmsdbLocal.get(a)+"'");
+				connection.commit();
+				stmt.close();
+				System.out.println("removed \""+filmsdbLocal.get(a)+"\" from databsae");
+			}
+		}
+		
+		for(int b=0; b<filmsdbStreamURL.size(); b++){
+			if(filmsStreamURL.contains(filmsdbStreamURL.get(b))){
+			}else{
+				stmt.executeUpdate("delete from film_streaming where titel = '"+filmsdbStream.get(b)+"'");
+				connection.commit();
+				stmt.close();
+				System.out.println("removed \""+filmsdbStream.get(b)+"\" from databsae");
+			}
+		}
+		
 	}
-// Kontroll Methode, ob ein Film wirklich in der Datenbank ist
-	public String getTitel(String name){
+	
+	private void checkAddEntry() throws SQLException, FileNotFoundException, IOException{	//TODO sort alphabetical
+		System.out.println("checking for entrys to add to DB ...");
+		String[] entries = new File(mainWindowController.getPath()).list();
+		Statement stmt = connection.createStatement();
+		PreparedStatement ps = connection.prepareStatement("insert into film_streaming values (?, ?, ?, ?, ?, ?, ?, ?)");;
+		int i=0;
+		
+		for(int a=0; a<filmsDir.size(); a++){
+			if(filmsdbLocal.contains(filmsDir.get(a))){
+			}else{			
+				stmt.executeUpdate("insert into film_local values (0, '"+cutOffEnd(entries[a])+"', '"+entries[a]+"','favorite_border_black')");
+				connection.commit();
+				stmt.close();
+				System.out.println("added \""+filmsDir.get(a)+"\" to databsae");
+			}
+		}
+		
+		for(int b=0; b<filmsStreamURL.size(); b++){
+			if(filmsdbStreamURL.contains(filmsStreamURL.get(b))){
+			}else{
+				JsonObject object = Json.parse(new FileReader(filmsStreamData.get(b))).asObject();
+				JsonArray items = object.get("entries").asArray();
+				System.out.println(items.size()+", "+i);
+					String streamURL = items.get(i).asObject().getString("streamUrl","");
+					String titel = items.get(i).asObject().getString("titel","");
+					
+					if(streamURL.equals(filmsStreamURL.get(b))){
+						System.out.println("hinzuf<EFBFBD>gen \""+titel+"\"");
+						
+						ps.setInt(1, items.get(i).asObject().getInt("year", 0));
+						ps.setInt(2, items.get(i).asObject().getInt("season", 0));
+						ps.setInt(3, items.get(i).asObject().getInt("episode", 0));
+						ps.setInt(4, 0);
+						ps.setString(5, items.get(i).asObject().getString("resolution", ""));
+						ps.setString(6, items.get(i).asObject().getString("titel",""));
+						ps.setString(7, items.get(i).asObject().getString("streamUrl", ""));
+						ps.setString(8, "favorite_border_black");
+						ps.addBatch(); // adds the entry
+						
+//						stmt.executeUpdate("insert into film_streaming values ("+items.get(i).asObject().getInt("year", 0)+", "+items.get(i).asObject().getInt("season", 0)+", "+items.get(i).asObject().getInt("episode", 0)+", 0, '"+items.get(i).asObject().getString("resolution", ""+"', '"+items.get(i).asObject().getString("titel","")+"', '"+items.get(i).asObject().getString("streamUrl", "")+"')"));
+					}
+				i++;
+			}
+		}
+		ps.executeBatch();			
+		connection.commit();
+		ps.close();
+	}
+	
+	void ausgeben(){
+	System.out.println("Eintraege ausgeben ... \n"); 
 	try { 
 		Statement stmt = connection.createStatement(); 
-			ResultSet rs = stmt.executeQuery("SELECT titel, pfad FROM filme WHERE titel = '"+name+"';" ); 
-			return rs.getString("titel"); 
+		ResultSet rs = stmt.executeQuery("SELECT * FROM film_local"); 
+		while (rs.next()) { 
+			System.out.println(rs.getString(1));
+			System.out.println(rs.getString(2));
+			System.out.println(rs.getString(3));
+			System.out.println(rs.getString(4)+"\n");
+		}
+		stmt.close();
+		rs.close();
+		
+		System.out.println("Streaming Entries: \n");
+		
+		rs = stmt.executeQuery("SELECT * FROM film_streaming;"); 
+		while (rs.next()) { 
+			System.out.println(rs.getString(1));
+			System.out.println(rs.getString(2));
+			System.out.println(rs.getString(3));
+			System.out.println(rs.getString(4));
+			System.out.println(rs.getString(5));
+			System.out.println(rs.getString(6));
+			System.out.println(rs.getString(7));
+			System.out.println(rs.getString(8)+"\n");
+		}
+		stmt.close();
+		rs.close(); 
+
 	} catch (SQLException e) { 
-			System.err.println("Konnte nicht ausgef<65>hrt werden"); 
+		System.err.println("Ups! an error occured!"); 
 		e.printStackTrace(); 
 	}
-		return "Error 404";
-	}
-// gibt den Pfad eines bestimmten Films
-	public String getPfad(String name){
-		try { 
-			Statement stmt = connection.createStatement(); 
-			ResultSet rs = stmt.executeQuery("SELECT titel, pfad FROM filme WHERE titel = '"+name+"';" ); //SQL Befehl
-			return rs.getString("pfad"); 
-		} catch (SQLException e) { 
-			System.err.println("Konnte nicht ausgef<65>hrt werden"); 
-			e.printStackTrace(); 
-		} 
-		return "Error 404";
 }
+	
 	//gibt die Favorisierung eines bestimmten Films
-	public boolean getFavStatus(String name){
+	void getFavStatus(String name){
 		try{
 			Statement stmt = connection.createStatement(); 
-			ResultSet rs = stmt.executeQuery("SELECT titel, bewertung FROM filme WHERE titel = '"+name+"';" ); //SQL Befehl
-		System.out.println(rs.getInt("bewertung"));
-			if((rs.getInt("bewertung")) == 1){
-				return true;
-			}
-			else{
-				return false;
-			}
+			ResultSet rs = stmt.executeQuery("SELECT titel, rating, favIcon FROM film_local WHERE titel = '"+name+"';" ); //SQL Befehl
+			System.out.println("local:"+rs.getString("rating")+", "+rs.getString("titel")+", "+rs.getString("favIcon"));
+			stmt.close();
+			rs.close();
 		}catch(SQLException e){
-			System.err.println("Konnte nicht ausgef<65>hrt werden"); 
-			e.printStackTrace(); 
-			return false;
+			try {
+				Statement stmtS = connection.createStatement(); 
+				ResultSet rsS = stmtS.executeQuery("SELECT titel, rating, favIcon FROM film_streaming WHERE titel = '"+name+"';" );
+				System.out.println("streaming:"+rsS.getString("rating")+", "+rsS.getString("titel")+", "+rsS.getString("favIcon"));
+				stmtS.close();
+				rsS.close();
+			} catch (SQLException e1) {
+				System.out.println("Ups! an error occured!");
+				e1.printStackTrace();
 			}
 		}
+		
+	}
 	//setzt die Defavorisierung eines bestimmten Films
-	public void defavorisieren(String name){
-		System.out.println("setze Bewertung");
+	void dislike(String name,String streamUrl){
+		System.out.println("defavorisieren ...");		
 		try{
 			Statement stmt = connection.createStatement(); 
-			String sql = ("UPDATE filme SET bewertung=0 WHERE titel='"+name+"';"); //SQL Befehl
-			stmt.executeUpdate(sql);
-			connection.setAutoCommit(false);  
-			connection.setAutoCommit(true);  
+			stmt.executeUpdate("UPDATE film_local SET rating=0,favIcon='favorite_border_black' WHERE titel='"+name+"';");
+			connection.commit();
+			stmt.close();
 		}catch(SQLException e){
-			System.err.println("Konnte nicht ausgef<65>hrt werden"); 
+			System.out.println("Ups! an error occured!");
 			e.printStackTrace();
 		}
+		try {
+			Statement stmt = connection.createStatement(); 
+			stmt.executeUpdate("UPDATE film_streaming SET rating=0,favIcon='favorite_border_black' WHERE streamUrl='"+streamUrl+"';");
+			connection.commit();
+			stmt.close();
+		} catch (SQLException e1) {
+			System.out.println("Ups! an error occured!");
+			e1.printStackTrace();
+		}
 	}
 	//setzt die Favorisierung eines bestimmten Films
-	public void favorisieren(String name){
-		System.out.println("setze Bewertung");
+	void like(String name,String streamUrl){
+		System.out.println("favorisieren ...");
 		try{
 			Statement stmt = connection.createStatement(); 
-			String sql = ("UPDATE filme SET bewertung=1 WHERE titel='"+name+"';"); //SQL Befehl
-			stmt.executeUpdate(sql);
-			connection.setAutoCommit(false);  
-			connection.setAutoCommit(true);  
+			stmt.executeUpdate("UPDATE film_local SET rating=1,favIcon='favorite_black' WHERE titel='"+name+"';");
+			connection.commit();
+			stmt.close();
 		}catch(SQLException e){
-			System.err.println("Konnte nicht ausgef<65>hrt werden"); 
+			System.out.println("Ups! an error occured!");
 			e.printStackTrace();
 		}
+		try {
+			Statement stmt = connection.createStatement(); 
+			stmt.executeUpdate("UPDATE film_streaming SET rating=1,favIcon='favorite_black' WHERE streamUrl='"+streamUrl+"';");
+			connection.commit();
+			stmt.close();
+		} catch (SQLException e1) {
+			System.out.println("Ups! an error occured!");
+			e1.printStackTrace();
 		}
-//entfernt die Endung
-	private static String ohneEndung (String str) {
+	}
+	
+//removes the ending
+	private String cutOffEnd (String str) {
 
 		if (str == null) return null;
 		int pos = str.lastIndexOf(".");
@@ -206,11 +470,5 @@ class DBController {
 		return str.substring(0, pos);
 	}
 	
-	public String getPath() {
-		return path;
 }
 
-	public void setPath(String path) {
-		this.path = path.replace("\\", "\\\\");
-	}
-}

src/application/HomeFlix-Local_de_DE.properties

@@ -1,16 +0,0 @@
-# HomeFlix-Local_de_DE.properties German Local
-info = Info
-settings = Einstellungen
-play = play
-openFolder = Ordner \u00F6ffnen
-chooseFolder = Ordner ausw\u00E4hlen
-fontSize = Schriftgr\u00F6\u00DFe:
-checkUpdates = Auf Update pr\u00FCfen
-autoUpdate = beim Start nach Updates suchen:
-version = Version:
-columnName = Name
-columnRating = Bewertung
-columnDatName = Datei Name
-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
-infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz

src/application/HomeFlix-Local_en_US.properties

@@ -1,16 +0,0 @@
-#  HomeFlix-Local_en_US.properties US-English Local and default
-info = Info
-settings = Settings
-play = play
-openFolder = open Folder
-chooseFolder = choose Directory
-fontSize = font size:
-checkUpdates = check for updates
-autoUpdate = check at startup for updates:
-version = Version:
-columnName = Name
-columnRating = Rating
-columnDatName = File Name
-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
-infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz

src/application/Main.java

@@ -1,7 +1,7 @@
 /**
  * Project HomeFlix
  * 
- * Copyright 2016  <admin@kellerkinder>
+ * Copyright 2016-2017  <admin@kellerkinder>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,11 +22,10 @@
 package application;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
+import java.util.Locale;
 import java.util.Optional;
-import java.util.Properties;
+import java.util.ResourceBundle;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -36,20 +35,26 @@ import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
 import javafx.scene.image.Image;
 import javafx.scene.layout.AnchorPane;
-import javafx.scene.paint.Color;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
 
 public class Main extends Application {
 	
-	public Stage primaryStage;
+	private Stage primaryStage;
 	private String path;
+	private String streamingPathWin = System.getProperty("user.home") + "\\Documents\\HomeFlix";
+	private String streamingPathLinux = System.getProperty("user.home") + "/HomeFlix";
 	private String color = "ee3523";
 	private String autoUpdate = "0";
+	private String mode = "local";	//local or streaming
+	private String local = System.getProperty("user.language")+"_"+System.getProperty("user.country");
 	private double size = 12;
-	private int local = 0;
-	Properties props = new Properties();
+	private ResourceBundle bundle;
 	private MainWindowController mainWindowController;
+	private File dirWin = new File(System.getProperty("user.home") + "/Documents/HomeFlix");	//Windows: C:/Users/"User"/Documents/HomeFlix
+	private File dirLinux = new File(System.getProperty("user.home") + "/HomeFlix");	//Linux: /home/"User"/HomeFlix
+	private File fileWin = new File(dirWin + "/config.xml");	//Windows: C:/Users/"User"/Documents/HomeFlix/config.xml
+	private File fileLinux = new File(dirLinux + "/config.xml");	//Linux: /home/"User"/HomeFlix/config.xml
 	
 	@Override
 	public void start(Stage primaryStage) {
@@ -57,8 +62,8 @@ public class Main extends Application {
 		mainWindow();
 	}
 	
-	public void mainWindow(){
-		File file = new File("config.xml");
+	private void mainWindow(){
+	
 		try {
 		FXMLLoader loader = new FXMLLoader(Main.class.getResource("MainWindow.fxml"));
 		AnchorPane pane = loader.load();
@@ -66,48 +71,84 @@ public class Main extends Application {
 		primaryStage.setMinWidth(900.00);
 		primaryStage.setResizable(false);
 		primaryStage.setTitle("Project HomeFlix");
-		primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/Homeflix_Icon_64x64.png"))); //f<EFBFBD>gt Anwendungsicon hinzu
+		primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/recources/Homeflix_Icon_64x64.png"))); //adds application icon
 
+		mainWindowController = loader.getController();	//Link of FXMLController and controller class
+		mainWindowController.setAutoUpdate(autoUpdate);	//set auto-update
+		mainWindowController.setMain(this);	//call setMain
 		
-		mainWindowController = loader.getController();	//verkn<6B>pfung von FXMLController und Controller Klasse
-		mainWindowController.setAutoUpdate(autoUpdate);	//setzt autoupdate
-		mainWindowController.setMain(this);	//aufruf setMain
-		
-		//pr<70>ft ob config.xml vorhanden, wenn nicht hole Pfad und schreibe Daten in Controller
-		if (file.exists() != true) {
+		//Linux					if directory exists -> check config.xml
+		if(System.getProperty("os.name").equals("Linux")){
+			if(dirLinux.exists() != true){
+				dirLinux.mkdir();
+			}else if(fileLinux.exists() != true){
 				mainWindowController.setPath(firstStart());
+				mainWindowController.setStreamingPath(streamingPathLinux);
 				mainWindowController.setColor(color);
 				mainWindowController.setSize(size);
 				mainWindowController.setAutoUpdate(autoUpdate);
-			mainWindowController.setLoaclUI(local);
+				mainWindowController.setLocal(local);
+				mainWindowController.setMode(mode);
 				mainWindowController.saveSettings();
-			Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar");	//starte neu um Bugs zu verhindern
-			System.exit(0);	//beendet sich selbst
+				Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar");	//start again (preventing Bugs)
+				System.exit(0);	//finishes itself
+			}
+		//windows
 		}else{
-			loadSettings();
+			if(dirWin.exists() != true){
+				dirWin.mkdir();
+			}else if(fileWin.exists() != true){
+				mainWindowController.setPath(firstStart());
+				mainWindowController.setStreamingPath(streamingPathWin);
+				mainWindowController.setColor(color);
+				mainWindowController.setSize(size);
+				mainWindowController.setAutoUpdate(autoUpdate);
+				mainWindowController.setLocal(local);
+				mainWindowController.setMode(mode);
+				mainWindowController.saveSettings();
+				Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar");	//start again (preventing Bugs)
+				System.exit(0);	//finishes itself
+			}	
 		}
 		
-		mainWindowController.applyColor();	//setzt die Theme Farbe
-		mainWindowController.cbLocal.getSelectionModel().select(mainWindowController.getLocal()); //setzt local
-		mainWindowController.mainColor.setValue(Color.valueOf(mainWindowController.getColor()));
-		mainWindowController.loadData();	//l<>d die Daten im Controller
+		mainWindowController.loadSettings();
+		mainWindowController.loadStreamingSettings();
+		mainWindowController.initUI();
+		mainWindowController.initActions();
+		mainWindowController.initTabel();
+		mainWindowController.setLocalUI();
+		mainWindowController.applyColor();	//set theme color
 		
-		Scene scene = new Scene(pane);	//neue Scen um inhalt der stage anzuzeigen
+		mainWindowController.dbController.main(); //initialize database controller
+		mainWindowController.dbController.createDatabase(); //creating the database
+		mainWindowController.dbController.loadData(); 	//loading data from database to mainWindowController 
+		mainWindowController.addDataUI();
 		
-		primaryStage.setScene(scene);
-		primaryStage.show();	//zeige scene
+		Scene scene = new Scene(pane);	//create new scene, append pane to scene
+		
+		primaryStage.setScene(scene);	//append scene to stage
+		primaryStage.show();	//show stage
 		} catch (IOException e) {
-			// Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
 	
-	//methode f<EFBFBD>r den erstmaligen Start
+	//Method for first Start
 	private String firstStart(){
-		Alert alert = new Alert(AlertType.CONFIRMATION);	//neuer alert mit filechooser
+		MainWindowController.firststart = true;
+		switch(System.getProperty("user.language")+"_"+System.getProperty("user.country")){
+		case "en_US":	bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US);	//us_english
+				break;
+     	case "de_DE":	bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.GERMAN);	//German
+     			break;
+     	default:		bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US);	//default local
+     			break;
+		 }
+		
+		Alert alert = new Alert(AlertType.CONFIRMATION);	//new alert with file-chooser
 		alert.setTitle("Project HomeFlix");
-		alert.setHeaderText("Es ist kein Stammverzeichniss f<>r Filme angegeben!");
-		alert.setContentText("Stammverzeichniss angeben?");
+		alert.setHeaderText(bundle.getString("firstStartHeader"));
+		alert.setContentText(bundle.getString("firstStartContent"));
 
 		Optional<ButtonType> result = alert.showAndWait();
 		if (result.get() == ButtonType.OK){
@@ -122,26 +163,6 @@ public class Main extends Application {
 		return path;
 	}
 
-	//l<>dt die einstellungen aus der XML
-	public void loadSettings(){
-		File configFile = new File("config.xml");
-		try {
-			InputStream inputStream = new FileInputStream(configFile);
-			props.loadFromXML(inputStream);
-			path = props.getProperty("path");
-			color = props.getProperty("color");
-			autoUpdate = props.getProperty("autoUpdate");
-			size = Double.parseDouble(props.getProperty("size"));
-			local = Integer.parseInt(props.getProperty("local"));
-			
-			inputStream.close();
-		} catch (IOException e) {
-			// Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-	
-	
 	public static void main(String[] args) {
 		launch(args);
 	}

src/application/MainWindow.fxml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXColorPicker?>
+<?import com.jfoenix.controls.JFXSlider?>
 <?import com.jfoenix.controls.JFXTextArea?>
 <?import com.jfoenix.controls.JFXTextField?>
+<?import com.jfoenix.controls.JFXToggleButton?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TreeTableView?>
+<?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
+<?import javafx.scene.text.TextFlow?>
 
-<AnchorPane fx:id="anpane" prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.MainWindowController">
+<AnchorPane fx:id="anpane" prefHeight="600.0" prefWidth="950.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.MainWindowController">
 	<children>
-		<VBox fx:id="topVBox" prefHeight="32.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-			<children>
-				<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="67.0" text="Menu" />
-			</children>
-		</VBox>
-		<TreeTableView fx:id="treeTableViewfilm" layoutX="14.0" layoutY="88.0" prefHeight="400.0" prefWidth="360.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.topAnchor="88.0" />
-		<JFXTextArea fx:id="ta1" layoutX="385.0" layoutY="42.0" maxWidth="503.0" minWidth="275.0" prefHeight="546.0" prefWidth="293.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="385.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0" />
-		<JFXButton fx:id="playbtn" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" text="play" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0">
+		<TreeTableView fx:id="treeTableViewfilm" layoutX="14.0" layoutY="88.0" prefHeight="400.0" prefWidth="360.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="553.0" AnchorPane.topAnchor="88.0" />
+		<JFXTextArea fx:id="ta1" layoutX="385.0" layoutY="42.0" maxWidth="503.0" minWidth="275.0" prefHeight="546.0" prefWidth="293.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="410.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0" />
+      <TextFlow fx:id="textFlow" layoutX="496.0" layoutY="131.0" prefHeight="200.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="15.0" AnchorPane.leftAnchor="410.0" AnchorPane.rightAnchor="220.0" AnchorPane.topAnchor="44.0" />
+		<JFXButton fx:id="playbtn" contentDisplay="CENTER" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0">
          <font>
             <Font name="System Bold" size="14.0" />
          </font></JFXButton>
@@ -26,12 +31,69 @@
          <font>
             <Font name="System Bold" size="14.0" />
          </font></JFXButton>
-		<JFXTextField fx:id="tfsearch" layoutX="12.0" layoutY="44.0" maxWidth="477.0" minWidth="359.0" prefHeight="31.0" prefWidth="359.0" promptText="Suche ..." AnchorPane.leftAnchor="12.0" AnchorPane.topAnchor="44.0">
+		<JFXTextField fx:id="tfsearch" layoutX="12.0" layoutY="44.0" maxWidth="477.0" minWidth="359.0" prefHeight="31.0" prefWidth="359.0" promptText="Suche ..." AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="553.0" AnchorPane.topAnchor="44.0">
          <font>
             <Font name="Arial" size="12.0" />
          </font></JFXTextField>
-      <ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0" />
-      <JFXButton fx:id="returnBtn" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" text="&lt;&lt;" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" />
-      <JFXButton fx:id="forwardBtn" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" text="&gt;&gt;" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" />
+      <ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0">
+         <image>
+            <Image url="@../recources/Homeflix_Poster.png" />
+         </image></ImageView>
+      <JFXButton fx:id="returnBtn" contentDisplay="CENTER" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" />
+      <JFXButton fx:id="forwardBtn" contentDisplay="CENTER" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" />
+      <HBox fx:id="topHBox" layoutY="12.0" prefHeight="32.0" prefWidth="900.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+				<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="32.0" />
+         </children>
+      </HBox>
+      <VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="660.0" prefWidth="150.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXButton fx:id="infoBtn" onAction="#infoBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="settingsBtn" onAction="#settingsBtnclicked" prefHeight="37.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="streamingSettingsBtn" onAction="#streamingSettingsBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="switchBtn" onAction="#switchBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="debugBtn" onAction="#debugBtnclicked" prefHeight="32.0" prefWidth="150.0" text="debugging" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+         </children>
+      </VBox>
+      <AnchorPane fx:id="streamingSettingsAnchor" layoutX="138.0" layoutY="33.0" prefHeight="566.0" prefWidth="760.0" style="-fx-background-color: #FFFFFF;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXTextField fx:id="tfStreamingPath" layoutX="14.0" layoutY="14.0" onAction="#tfStreamingPathAction" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0" />
+            <JFXButton fx:id="streamingDirectoryBtn" layoutX="263.0" layoutY="2.0" onAction="#streamingDirectoryBtnAction" AnchorPane.leftAnchor="260.0" AnchorPane.topAnchor="5.0" />
+            <TableView fx:id="tableViewStreamingdata" layoutX="14.0" layoutY="44.0" prefHeight="200.0" prefWidth="300.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="40.0" />
+         </children></AnchorPane>
+      <AnchorPane fx:id="settingsAnchor" layoutX="160.0" layoutY="44.0" prefHeight="566.0" prefWidth="760.0" style="-fx-background-color: #FFFFFF;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXTextField fx:id="tfPath" layoutX="14.0" layoutY="14.0" onAction="#tfPathAction" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0" />
+            <JFXButton fx:id="directoryBtn" layoutX="255.0" layoutY="8.0" onAction="#directoryBtnAction" prefHeight="25.0" AnchorPane.leftAnchor="260.0" />
+            <JFXColorPicker fx:id="mainColor" layoutX="14.0" layoutY="45.0" onAction="#mainColorAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="40.0" />
+            <Label fx:id="sizelbl" layoutY="73.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="75.0" />
+            <JFXSlider fx:id="sliderFontSize" layoutX="10.0" layoutY="99.0" max="48.0" min="2.0" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="110.0" />
+            <ChoiceBox fx:id="cbLocal" layoutX="14.0" layoutY="131.0" prefWidth="150.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="145.0" />
+            <JFXButton fx:id="updateBtn" layoutX="7.0" layoutY="177.0" onAction="#updateBtnAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="180.0" />
+            <Label fx:id="aulbl" layoutX="43.0" layoutY="219.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="215.0" />
+            <JFXToggleButton fx:id="autoupdateBtn" layoutX="19.0" layoutY="215.0" onAction="#autoupdateBtnAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="230.0" />
+            <Label fx:id="versionlbl" layoutX="29.0" layoutY="297.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="280.0" />
+         </children>
+      </AnchorPane>
 	</children>
 </AnchorPane>

src/application/apiQuery.java

@@ -0,0 +1,240 @@
+/**
+ * apiQuery for Project HomeFlix
+ * sends a query to the omdb api
+ * 
+ * TODO build in a caching function
+ */
+package application;
+
+import java.io.DataInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Scanner;
+
+import com.eclipsesource.json.Json;
+import com.eclipsesource.json.JsonObject;
+
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.image.Image;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;
+import javafx.scene.text.Text;
+
+public class apiQuery{
+	
+	public apiQuery(MainWindowController m){
+		mainWindowController=m;
+	}
+	
+	private MainWindowController mainWindowController;
+	private Image im;
+	private int fontSize = 20;
+	private String fontFamily = "System";
+	
+	@SuppressWarnings("deprecation") //TODO
+	void startQuery(String input){
+		URL url = null;
+		Scanner sc = null;
+		String apiurl = "https://www.omdbapi.com/?";	//API URL
+		String moviename = null;
+		String dataurl = null;
+		String retdata = null;
+		InputStream is = null;
+		DataInputStream dis = null;
+
+		try {
+
+			//get film title
+			sc = new Scanner(System.in);
+			moviename = input;
+
+			// in case of no or "" Film title
+			if (moviename == null || moviename.equals("")) {
+				System.out.println("No movie found");
+			}
+
+			//remove unwanted blank
+			moviename = moviename.trim();
+
+			//replace blank with + for api-query
+			moviename = moviename.replace(" ", "+");
+
+			//URL wird zusammengestellt abfragetypen: http,json,xml (muss json sein um späteres trennen zu ermöglichen)
+			dataurl = apiurl + "t=" + moviename + "&plot=full&r=json";
+
+			url = new URL(dataurl);
+			is = url.openStream();
+			dis = new DataInputStream(is);
+
+			// lesen der Daten aus dem Antwort Stream
+			while ((retdata = dis.readLine()) != null) {
+				//retdata in json object parsen und anschließend das json Objekt "zerschneiden"
+				System.out.println(retdata);
+				JsonObject object = Json.parse(retdata).asObject();
+				String titelV = object.getString("Title", "");
+				String yearV = object.getString("Year", "");
+				String ratedV = object.getString("Rated", "");
+				String releasedV = object.getString("Released", "");
+				String runtimeV = object.getString("Runtime", "");
+				String genreV = object.getString("Genre", "");
+				String directorV = object.getString("Director", "");
+				String writerV = object.getString("Writer", "");
+				String actorsV  = object.getString("Actors", "");
+				String plotV = object.getString("Plot", "");
+				String languageV = object.getString("Language", "");
+				String countryV = object.getString("Country", "");
+				String awardsV = object.getString("Awards", "");
+
+				String metascoreV = object.getString("Metascore", "");
+				String imdbRatingV = object.getString("imdbRating", "");
+				@SuppressWarnings("unused")
+				String imdbVotesV = object.getString("imdbVotes", "");
+				@SuppressWarnings("unused")
+				String imdbIDV = object.getString("imdbID", "");
+				String typeV = object.getString("Type", "");
+				
+				String posterURL = object.getString("Poster", "");
+				String response = object.getString("Response", "");
+				
+//				Text titelR = new Text (object.getString("Title", "")+"\n");
+//				titelR.setFont(Font.font (fontFamily, fontSize));
+//				Text yearR = new Text (object.getString("Year", "")+"\n");
+//				yearR.setFont(Font.font (fontFamily, fontSize));
+//				Text ratedR = new Text (object.getString("Rated", "")+"\n");
+//				ratedR.setFont(Font.font (fontFamily, fontSize));
+//				Text releasedR = new Text (object.getString("Released", "")+"\n");
+//				releasedR.setFont(Font.font (fontFamily, fontSize));
+//				Text runtimeR = new Text (object.getString("Runtime", "")+"\n");
+//				runtimeR.setFont(Font.font (fontFamily, fontSize));
+//				Text genreR = new Text (object.getString("Genre", ""));
+//				genreR.setFont(Font.font (fontFamily, fontSize));
+//				Text directorR = new Text (object.getString("Director", "")+"\n");
+//				directorR.setFont(Font.font (fontFamily, fontSize));
+//				Text writerR = new Text (object.getString("Writer", "")+"\n");
+//				writerR.setFont(Font.font (fontFamily, fontSize));
+//				Text actorsR  = new Text (object.getString("Actors", "")+"\n");
+//				actorsR.setFont(Font.font (fontFamily, fontSize));
+//				Text plotR = new Text (object.getString("Plot", "")+"\n");
+//				plotR.setFont(Font.font (fontFamily, fontSize));
+//				Text languageR = new Text (object.getString("Language", "")+"\n");
+//				languageR.setFont(Font.font (fontFamily, fontSize));
+//				Text countryR = new Text (object.getString("Country", "")+"\n");
+//				countryR.setFont(Font.font (fontFamily, fontSize));
+//				Text awardsR = new Text (object.getString("Awards", "")+"\n");
+//				awardsR.setFont(Font.font (fontFamily, fontSize));
+//				Text metascoreR = new Text (object.getString("Metascore", "")+"\n");
+//				metascoreR.setFont(Font.font (fontFamily, fontSize));
+//				Text imdbRatingR = new Text (object.getString("imdbRating", "")+"\n");
+//				imdbRatingR.setFont(Font.font (fontFamily, fontSize));
+//				@SuppressWarnings("unused")
+//				Text imdbVotesR = new Text (object.getString("imdbVotes", "")+"\n");
+//				imdbVotesR.setFont(Font.font (fontFamily, fontSize));
+//				@SuppressWarnings("unused")
+//				Text imdbIDR = new Text (object.getString("imdbID", "")+"\n");
+//				imdbIDR.setFont(Font.font (fontFamily, fontSize));
+//				Text typeR = new Text (object.getString("Type", "")+"\n");
+//				typeR.setFont(Font.font (fontFamily, fontSize));
+				
+				
+				if(response.equals("False")){
+					mainWindowController.ta1.appendText(mainWindowController.noFilmFound);
+					im = new Image("recources/icons/close_black_2048x2048.png");
+					mainWindowController.image1.setImage(im);
+				}else{
+				//ausgabe des Textes in ta1 in jeweils neuer Zeile 
+					mainWindowController.ta1.appendText(mainWindowController.title+": "+titelV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.year+": "+ yearV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.rating+": "+ratedV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.publishedOn+": "+releasedV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.duration+": "+runtimeV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.genre+": "+genreV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.director+": "+directorV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.writer+": "+writerV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.actors+": "+actorsV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.plot+": "+plotV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.language+": "+languageV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.country+": "+countryV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.awards+": "+awardsV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.metascore+": "+metascoreV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.imdbRating+": "+imdbRatingV+"\n");
+					mainWindowController.ta1.appendText(mainWindowController.type+": "+typeV+"\n");
+					
+//					mainWindowController.ta1.setVisible(false);
+					
+//					Text title = new Text(15, 20, mainWindowController.title+": ");
+//					title.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));		
+//					Text year = new Text(15, 20, mainWindowController.year+": ");
+//					year.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));	
+//					Text rating = new Text(15, 20, mainWindowController.rating+": ");
+//					rating.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));		
+//					Text publishedOn = new Text(15, 20, mainWindowController.publishedOn+": ");
+//					publishedOn.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));		
+//					Text duration = new Text(15, 20, mainWindowController.duration+": ");
+//					duration.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));			
+//					Text genre = new Text(15, 20, mainWindowController.genre+": ");
+//					genre.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));
+//					Text director = new Text(15, 20, mainWindowController.director+": ");
+//					director.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));			
+//					Text writer = new Text(15, 20, mainWindowController.writer+": ");
+//					writer.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));			
+//					Text actors = new Text(15, 20, mainWindowController.actors+": ");
+//					actors.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));			
+//					Text plot = new Text(15, 20, mainWindowController.plot+": ");
+//					plot.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));			
+//					Text language = new Text(15, 20, mainWindowController.language+": ");
+//					language.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));				
+//					Text country = new Text(15, 20, mainWindowController.country+": ");
+//					country.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));				
+//					Text awards = new Text(15, 20, mainWindowController.awards+": ");
+//					awards.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));		
+//					Text metascore = new Text(15, 20, mainWindowController.metascore+": ");
+//					metascore.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));
+//					Text imdbRating = new Text(15, 20, mainWindowController.imdbRating+": ");
+//					imdbRating.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));					
+//					Text type = new Text(15, 20, mainWindowController.type+": ");
+//					type.setFont(Font.font (fontFamily, FontWeight.BOLD, fontSize));
+//				
+//					mainWindowController.textFlow.getChildren().remove(0, mainWindowController.textFlow.getChildren().size());
+//					
+//					ObservableList<Node> list = mainWindowController.textFlow.getChildren();
+//					
+//					list.addAll(title,titelR,year,yearR,rating,ratedR,
+//						   publishedOn,releasedR,duration,runtimeR,genre,genreR,director,directorR,writer,writerR,
+//						   actors,actorsR,plot,plotR,language,languageR,country,countryR,awards,awardsR,metascore,
+//						   metascoreR,imdbRating,imdbRatingR,type,typeR);
+//					
+				
+					if(posterURL.equals("N/A")){
+						im = new Image("recources/icons/close_black_2048x2048.png");
+					}else{
+						im = new Image(posterURL);
+					}
+					mainWindowController.image1.setImage(im);
+				}
+			}
+
+		} catch (Exception e) {
+			mainWindowController.ta1.setText(e.toString());
+			System.out.println(e);
+		} finally {
+			//closes datainputStream, InputStream,Scanner if not already done
+			try {
+				if (dis != null) {
+					dis.close();
+				}
+
+				if (is != null) {
+					is.close();
+				}
+
+				if (sc != null) {
+					sc.close();
+				}
+			} catch (Exception e2) {
+				;
+			}
+		}
+	}
+}

src/application/streamUiData.java

@@ -0,0 +1,132 @@
+package application;
+
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.image.ImageView;
+
+public class streamUiData {
+	
+	private final IntegerProperty year = new SimpleIntegerProperty();
+	private final IntegerProperty season = new SimpleIntegerProperty();
+	private final IntegerProperty episode = new SimpleIntegerProperty();
+	private final DoubleProperty rating = new SimpleDoubleProperty();
+	private final StringProperty resolution = new SimpleStringProperty();
+	private final StringProperty titel = new SimpleStringProperty();
+	private final StringProperty streamUrl = new SimpleStringProperty();
+	private final SimpleObjectProperty<ImageView> image = new SimpleObjectProperty<>();
+	
+	//uiData ist der Typ der Daten in der TreeTabelView
+	public streamUiData (final int year, final int season, final int episode, final double rating, final String resolution, final String titel, final String streamUrl, final ImageView image) {
+		this.year.set(year);
+		this.season.set(season);
+		this.episode.set(episode);
+		this.rating.set(rating);
+		this.resolution.set(resolution);
+		this.titel.set(titel);
+		this.streamUrl.set(streamUrl);
+		this.image.set(image);
+	}
+
+	public IntegerProperty yearProperty(){
+		return year;
+	}
+	
+	public IntegerProperty seasonProperty(){
+		return season;
+	}
+	
+	public IntegerProperty episodeProperty(){
+		return episode;
+	}
+	
+	public DoubleProperty ratingProperty(){
+		return rating;
+	}
+	
+	public StringProperty resolutionProperty(){
+		return resolution;
+	}
+	
+	public StringProperty titelProperty(){
+		return titel;
+	}
+	
+	public StringProperty streamUrlProperty(){
+		return streamUrl;
+	}
+	
+	public SimpleObjectProperty<ImageView> imageProperty(){
+		return image;
+	}
+	
+	
+	public final int getYear() {
+		return yearProperty().get();
+	}
+
+	public final int getSeason() {
+		return seasonProperty().get();
+	}
+	
+	public final int getEpisode() {
+		return episodeProperty().get();
+	}
+	
+	public final double getRating() {
+		return ratingProperty().get();
+	}
+
+	public final String getResolution() {
+		return resolutionProperty().get();
+	}
+	
+	public final String getTitel() {
+		return titelProperty().get();
+	}
+	
+	public final String getStreamUrl() {
+		return streamUrlProperty().get();
+	}
+	
+	public final ImageView getImage() {
+		return imageProperty().get();
+	}
+
+
+	public final void setYear(int year) {
+		yearProperty().set(year);
+	}
+
+	public final void setSeason(int season) {
+		seasonProperty().set(season);
+	}
+	
+	public final void setEpisode(int season) {
+		episodeProperty().set(season);
+	}
+	
+	public final void setRating(int rating) {
+		ratingProperty().set(rating);
+	}
+	
+	public final void setResolution(String resolution) {
+		resolutionProperty().set(resolution);
+	}
+	
+	public final void setTitel(String titel) {
+		titelProperty().set(titel);
+	}
+
+	public final void setStreamUrl(String streamUrl) {
+		streamUrlProperty().set(streamUrl);
+	}
+	
+	public final void setImage(ImageView image) {
+		imageProperty().set(image);
+	}
+}

src/application/uiData.java

@@ -1,57 +0,0 @@
-package application;
-
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-public class uiData {
-
-	private DoubleProperty filmBewertung = new SimpleDoubleProperty();
-	private StringProperty filmName = new SimpleStringProperty();
-	private StringProperty dataName = new SimpleStringProperty();
-	
-	//uiData ist der Typ der Daten in der TreeTabelView
-	public uiData (final Double filmBewertung, final String filmName, final String dataName) {
-		this.filmBewertung.set(filmBewertung);
-		this.filmName.set(filmName);
-		this.dataName.set(dataName);
-	}
-
-	public Double getFilmBewertung() {
-		return filmBewertung.get();
-	}
-
-	public String getFilmName() {
-		return filmName.get();
-	}
-
-	public String getDataName() {
-		return dataName.get();
-	}
-
-
-	public void setFilmBewertung(Double filmBewertung) {
-		this.filmBewertung.set(filmBewertung);
-	}
-
-	public void setFilmName(String filmName) {
-		this.filmName.set(filmName);
-	}
-
-	public void setDataName(StringProperty dataName) {
-		this.dataName = dataName;
-	}
-
-	public DoubleProperty FilmBewertungProperty(){
-		return filmBewertung;
-	}
-	
-	public StringProperty FilmNameProperty(){
-		return filmName;
-	}
-	
-	public StringProperty DataNameProperty(){
-		return dataName;
-	}
-}

src/application/updater.java

@@ -0,0 +1,71 @@
+/**
+ * updater for Project HomeFlix
+ * checks for Updates and downloads it in case there is one
+ */
+package application;
+
+import java.io.BufferedReader;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+
+public class updater extends Thread{
+	
+	private MainWindowController mainWindowController;
+	private String buildURL;
+	private String downloadLink;
+	private String aktBuildNumber;
+	private String buildNumber;
+	
+	public updater(MainWindowController m, String buildURL,String downloadLink,String aktBuildNumber,String buildNumber){
+		mainWindowController=m;
+		this.buildURL=buildURL;
+		this.downloadLink=downloadLink;
+		this.aktBuildNumber=aktBuildNumber;
+		this.buildNumber=buildNumber;
+	}
+	
+	public void run(){
+		System.out.println("check for updates ...");
+		try {
+			URL url = new URL(buildURL); //URL der Datei mit aktueller Versionsnummer
+	        BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
+	        aktBuildNumber = in.readLine();	//schreibt inputstream in String
+	        in.close();
+		} catch (IOException e1) {
+			mainWindowController.showErrorMsg(mainWindowController.errorUpdateV, e1);
+		}
+		System.out.println("Build: "+buildNumber+", Update: "+aktBuildNumber);
+		
+		//vergleicht die Versionsnummern, bei aktversion > version wird ein Update durchgrf<72>hrt
+		int iversion = Integer.parseInt(buildNumber);
+		int iaktVersion = Integer.parseInt(aktBuildNumber.replace(".", ""));
+		
+		if(iversion >= iaktVersion){
+//			mainWindowController.updateBtn.setText(mainWindowController.bundle.getString("updateBtnNotavail"));
+			System.out.println("no update available");
+		}else{
+//			mainWindowController.updateBtn.setText(mainWindowController.bundle.getString("updateBtnavail"));
+			System.out.println("update available");
+			try {
+				URL website;
+				URL downloadURL = new URL(downloadLink);
+				BufferedReader in = new BufferedReader(new InputStreamReader(downloadURL.openStream()));
+				String updateDataURL = in.readLine();
+				website = new URL(updateDataURL);	//Update URL
+				ReadableByteChannel rbc = Channels.newChannel(website.openStream());	//open new Stream/Channel
+				FileOutputStream fos = new FileOutputStream("ProjectHomeFlix.jar");	//nea fileoutputstram for ProjectHomeFLix.jar
+				fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);	//gets file from 0 to max size
+				fos.close();	//close fos (extrem wichtig!)
+				Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar");	//start again
+				System.exit(0);	//finishes itself
+			} catch (IOException e) {
+				//in case there is an error
+				mainWindowController.showErrorMsg(mainWindowController.errorUpdateD, e);
+			}
+		}
+	}
+}

src/libraries/Licenses/Apache_License.txt

@@ -0,0 +1,202 @@
+
+                                 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.

src/libraries/Licenses/MIT_License.txt

@@ -0,0 +1,19 @@
+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.

src/recources/HomeFlix-Local_de_DE.properties

@@ -0,0 +1,49 @@
+# HomeFlix-Local_de_DE.properties German Local
+info = Info
+settings = Einstellungen
+streamingSettings = Stream Einst.
+tfPath = Pfad...
+tfSearch = Suche...
+openFolder = Ordner \u00F6ffnen
+chooseFolder = Ordner ausw\u00E4hlen
+fontSize = Schriftgr\u00F6\u00DFe:
+checkUpdates = Auf Update pr\u00FCfen
+updateBtnavail = Update verf\u00FCgbar
+updateBtnNotavail = Kein Update verf\u00FCgbar
+autoUpdate = beim Start nach Updates suchen:
+version = Version:
+columnName = Name
+columnRating = Bewertung
+columnStreamUrl = Datei Name
+columnResolution = Aufl\u00F6sung
+columnSeason = Staffel
+columnYear = Jahr
+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!
+linuxBug = Zurzeit werden unter Linux leider keine Dateien mit Leerzeichen unterst\u00FCtzt!
+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
+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?

src/recources/HomeFlix-Local_en_US.properties

@@ -0,0 +1,49 @@
+#  HomeFlix-Local_en_US.properties US-English Local and default
+info = Info
+settings = Settings
+streamingSettings = Stream Settings
+tfPath = Path...
+tfSearch = Search...
+openFolder = open Folder
+chooseFolder = choose Directory
+fontSize = font size:
+checkUpdates = check for updates
+updateBtnavail = update available
+updateBtnNotavail = no update available
+autoUpdate = check at startup for updates:
+version = Version:
+columnName = Name
+columnRating = Rating
+columnStreamUrl = File Name
+columnResolution = Resolution
+columnSeason = Season
+columnYear = Year
+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!
+linuxBug = Currently no files are supported with additional space under Linux unfortunately!
+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
+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?

updates/buildNumber.txt

@@ -0,0 +1 @@
+117

updates/version.txt

@@ -1 +1 @@
-0.3.5
+0.4.0