diff --git a/.classpath b/.classpath
index 10ccd5b..d230797 100644
--- a/.classpath
+++ b/.classpath
@@ -1,29 +1,32 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/.gitignore b/.gitignore
index 233d01b..23e0574 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,5 @@ Temporary Items
config.xml
client_secret.json
.directory
-
+target/
+cemu_UI.jar
diff --git a/.project b/.project
index d68f086..1e652b0 100644
--- a/.project
+++ b/.project
@@ -15,8 +15,14 @@
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+ org.eclipse.m2e.core.maven2Nature
org.eclipse.xtext.ui.shared.xtextNature
org.eclipse.jdt.core.javanature
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..839d647
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding/=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index a698e59..13b3428 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/bin/.gitignore b/bin/.gitignore
deleted file mode 100644
index 25b00bb..0000000
--- a/bin/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/application/
-/cloudControllerInstances/
-/datatypes/
-/UIElements/
-/EventHandlers/
diff --git a/bin/application/CloudController$1.class b/bin/application/CloudController$1.class
deleted file mode 100644
index 85e08bc..0000000
Binary files a/bin/application/CloudController$1.class and /dev/null differ
diff --git a/bin/application/CloudController$2.class b/bin/application/CloudController$2.class
deleted file mode 100644
index d205e9f..0000000
Binary files a/bin/application/CloudController$2.class and /dev/null differ
diff --git a/bin/application/CloudController$3.class b/bin/application/CloudController$3.class
deleted file mode 100644
index b118468..0000000
Binary files a/bin/application/CloudController$3.class and /dev/null differ
diff --git a/bin/application/CloudController.class b/bin/application/CloudController.class
deleted file mode 100644
index 887d6a8..0000000
Binary files a/bin/application/CloudController.class and /dev/null differ
diff --git a/bin/application/Main$1$1.class b/bin/application/Main$1$1.class
deleted file mode 100644
index ca76911..0000000
Binary files a/bin/application/Main$1$1.class and /dev/null differ
diff --git a/bin/application/Main$1.class b/bin/application/Main$1.class
deleted file mode 100644
index 5b8ab66..0000000
Binary files a/bin/application/Main$1.class and /dev/null differ
diff --git a/bin/application/Main$2$1.class b/bin/application/Main$2$1.class
deleted file mode 100644
index 213dd2b..0000000
Binary files a/bin/application/Main$2$1.class and /dev/null differ
diff --git a/bin/application/Main$2.class b/bin/application/Main$2.class
deleted file mode 100644
index 3cb0f53..0000000
Binary files a/bin/application/Main$2.class and /dev/null differ
diff --git a/bin/application/Main$3.class b/bin/application/Main$3.class
deleted file mode 100644
index bc96d27..0000000
Binary files a/bin/application/Main$3.class and /dev/null differ
diff --git a/bin/application/Main.class b/bin/application/Main.class
deleted file mode 100644
index 035ba89..0000000
Binary files a/bin/application/Main.class and /dev/null differ
diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class
deleted file mode 100644
index 4b4825e..0000000
Binary files a/bin/application/MainWindowController$1.class and /dev/null differ
diff --git a/bin/application/MainWindowController$10.class b/bin/application/MainWindowController$10.class
deleted file mode 100644
index 4954a84..0000000
Binary files a/bin/application/MainWindowController$10.class and /dev/null differ
diff --git a/bin/application/MainWindowController$11.class b/bin/application/MainWindowController$11.class
deleted file mode 100644
index 8813356..0000000
Binary files a/bin/application/MainWindowController$11.class and /dev/null differ
diff --git a/bin/application/MainWindowController$12.class b/bin/application/MainWindowController$12.class
deleted file mode 100644
index ec49e0b..0000000
Binary files a/bin/application/MainWindowController$12.class and /dev/null differ
diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class
deleted file mode 100644
index 775e11a..0000000
Binary files a/bin/application/MainWindowController$2.class and /dev/null differ
diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class
deleted file mode 100644
index 9e71ba9..0000000
Binary files a/bin/application/MainWindowController$3.class and /dev/null differ
diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class
deleted file mode 100644
index 65c0504..0000000
Binary files a/bin/application/MainWindowController$4.class and /dev/null differ
diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class
deleted file mode 100644
index 566f2f6..0000000
Binary files a/bin/application/MainWindowController$5.class and /dev/null differ
diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class
deleted file mode 100644
index 744f32d..0000000
Binary files a/bin/application/MainWindowController$6.class and /dev/null differ
diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class
deleted file mode 100644
index a6ea230..0000000
Binary files a/bin/application/MainWindowController$7.class and /dev/null differ
diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class
deleted file mode 100644
index ad1e31a..0000000
Binary files a/bin/application/MainWindowController$8.class and /dev/null differ
diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class
deleted file mode 100644
index a817652..0000000
Binary files a/bin/application/MainWindowController$9.class and /dev/null differ
diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class
deleted file mode 100644
index c563bdb..0000000
Binary files a/bin/application/MainWindowController.class and /dev/null differ
diff --git a/bin/application/SmmdbApiQuery.class b/bin/application/SmmdbApiQuery.class
deleted file mode 100644
index fb3a921..0000000
Binary files a/bin/application/SmmdbApiQuery.class and /dev/null differ
diff --git a/bin/application/dbController.class b/bin/application/dbController.class
deleted file mode 100644
index 3d0c55b..0000000
Binary files a/bin/application/dbController.class and /dev/null differ
diff --git a/bin/application/playGame.class b/bin/application/playGame.class
deleted file mode 100644
index b645e69..0000000
Binary files a/bin/application/playGame.class and /dev/null differ
diff --git a/bin/cloudControllerInstances/GoogleDriveController.class b/bin/cloudControllerInstances/GoogleDriveController.class
deleted file mode 100644
index b71ad25..0000000
Binary files a/bin/cloudControllerInstances/GoogleDriveController.class and /dev/null differ
diff --git a/bin/datatypes/CourseTableDataType.class b/bin/datatypes/CourseTableDataType.class
deleted file mode 100644
index 137fbe5..0000000
Binary files a/bin/datatypes/CourseTableDataType.class and /dev/null differ
diff --git a/bin/datatypes/SmmdbApiDataType.class b/bin/datatypes/SmmdbApiDataType.class
deleted file mode 100644
index 770b9b8..0000000
Binary files a/bin/datatypes/SmmdbApiDataType.class and /dev/null differ
diff --git a/bin/datatypes/UIROMDataType.class b/bin/datatypes/UIROMDataType.class
deleted file mode 100644
index 2984b41..0000000
Binary files a/bin/datatypes/UIROMDataType.class and /dev/null differ
diff --git a/build.fxbuild b/build.fxbuild
deleted file mode 100644
index a28fff4..0000000
--- a/build.fxbuild
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/cemu_UI.jar b/cemu_UI.jar
deleted file mode 100644
index c29206a..0000000
Binary files a/cemu_UI.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a4ec7f3
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,222 @@
+
+ 4.0.0
+
+ com
+ cemu_UI
+ 0.2.1-SNAPSHOT
+ jar
+
+ cemu_UI
+ http://www.kellerkinder.xyz
+
+
+ UTF-8
+ 1.8
+ 1.8
+
+
+
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+
+ com.jfoenix
+ jfoenix
+ 1.9.0
+
+
+
+ com.eclipsesource.minimal-json
+ minimal-json
+ 0.9.4
+
+
+
+ org.xerial
+ sqlite-jdbc
+ 3.20.0
+
+
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.9.0
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.9.0
+
+
+
+ commons-io
+ commons-io
+ 2.5
+
+
+
+
+ org.apache.commons
+ commons-vfs2
+ 2.2
+
+
+
+
+ commons-codec
+ commons-codec
+ 1.11
+
+
+
+
+ io.datafx
+ flow
+ 8.0.1
+
+
+
+
+
+ net.lingala.zip4j
+ zip4j
+ 1.3.2
+
+
+
+
+
+ commons-logging
+ commons-logging
+ 1.1.1
+
+
+
+
+ com.google.api-client
+ google-api-client
+ 1.23.0
+
+
+
+
+ com.google.apis
+ google-api-services-drive
+ v3-rev87-1.23.0
+
+
+
+
+ com.google.http-client
+ google-http-client
+ 1.23.0
+
+
+
+
+ com.google.http-client
+ google-http-client-jackson2
+ 1.23.0
+
+
+
+
+ com.google.oauth-client
+ google-oauth-client
+ 1.23.0
+
+
+
+
+
+ com.google.oauth-client
+ google-oauth-client-java6
+ 1.23.0
+
+
+
+
+ com.google.oauth-client
+ google-oauth-client-jetty
+ 1.23.0
+
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ 2.9.2
+
+
+
+
+ javax.servlet
+ javax.servlet-api
+ 4.0.0-b01
+ provided
+
+
+
+
+ org.mortbay.jetty
+ jetty
+ 6.1.26
+
+
+
+
+ org.mortbay.jetty
+ jetty-util
+ 6.1.26
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.0.2
+
+
+
+ true
+ libraries/
+ com.cemu_UI.application.Main
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ copy-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/libraries
+ false
+ false
+ true
+
+
+
+
+
+
+
+
+
diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml
deleted file mode 100644
index 4567ada..0000000
--- a/src/application/MainWindow.fxml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/application/MainWindows.css b/src/application/MainWindows.css
deleted file mode 100644
index db8b365..0000000
--- a/src/application/MainWindows.css
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * HAMBURGER CSS
- */
-
-.jfx-hamburgerW StackPane {
- -fx-background-color: white;
- -fx-background-radius: 5px;
-}
-
-.jfx-hamburgerB StackPane {
- -fx-background-color: black;
- -fx-background-radius: 5px;
-}
-
-/*
- * TREE TABLE CSS
- */
-
-.tree-table-view {
- -fx-tree-table-color: rgba(0, 168, 204, 0.2);
- -fx-tree-table-rippler-color: rgba(0, 168, 204, 0.4);
-}
-
-.tree-table-view:focused .tree-table-row-cell:selected {
- -fx-background-color: -fx-tree-table-color;
- -fx-table-cell-border-color: -fx-tree-table-color;
- -fx-text-fill: BLACK;
-}
-
-.tree-table-view:focused .tree-table-row-cell:selected .tree-table-cell {
- -fx-text-fill: BLACK;
-}
-
-.tree-table-view .jfx-rippler {
- -jfx-rippler-fill: -fx-tree-table-rippler-color;
-}
-
-.tree-table-view .column-header,
-.tree-table-view .column-header-background,
-.tree-table-view .column-header-background .filler {
- -fx-background-color: TRANSPARENT;
-}
-
-.tree-table-view .column-header {
- -fx-border-width: 0 1 0 1;
- -fx-border-color: #F3F3F3;
-}
-
-.tree-table-view .column-header .label {
- -fx-text-fill: #949494;
- -fx-padding: 16 0 16 0;
-}
-
-.tree-table-view .column-header .arrow, .tree-table-view .column-header .sort-order-dot {
- -fx-background-color: #949494;
-}
-
-.tree-table-view .column-header:last-visible {
- -fx-border-width: 0 2 0 1;
-}
-
-.tree-table-view .column-header-background {
- -fx-border-width: 0 0.0 1 0;
- -fx-border-color: #F3F3F3;
-}
-
-.tree-table-view .tree-table-cell {
- -fx-border-width: 0 0 0 0;
- -fx-padding: 16 0 16 0;
-}
-
-.tree-table-view .column-overlay {
- -fx-background-color: -fx-tree-table-color;
-}
-
-.tree-table-view .column-resize-line, .tree-table-view .column-drag-header {
- -fx-background-color: -fx-tree-table-rippler-color;
-}
-
-.tree-table-view:focused {
- -fx-background-color: -fx-tree-table-color, -fx-box-border, -fx-control-inner-background;
- -fx-background-insets: -1.4, 0, 1;
- -fx-background-radius: 1.4, 0, 0;
- /*....*/
- -fx-padding: 1; /* 0.083333em; */
-}
\ No newline at end of file
diff --git a/src/libraries/commons-codec-1.11.jar b/src/libraries/commons-codec-1.11.jar
deleted file mode 100644
index 2245120..0000000
Binary files a/src/libraries/commons-codec-1.11.jar and /dev/null differ
diff --git a/src/libraries/commons-io-2.6.jar b/src/libraries/commons-io-2.6.jar
deleted file mode 100644
index 00556b1..0000000
Binary files a/src/libraries/commons-io-2.6.jar and /dev/null differ
diff --git a/src/libraries/commons-logging-1.1.1.jar b/src/libraries/commons-logging-1.1.1.jar
deleted file mode 100644
index 1deef14..0000000
Binary files a/src/libraries/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/src/libraries/commons-vfs2-2.1.1744488.2.jar b/src/libraries/commons-vfs2-2.1.1744488.2.jar
deleted file mode 100644
index a9887cf..0000000
Binary files a/src/libraries/commons-vfs2-2.1.1744488.2.jar and /dev/null differ
diff --git a/src/libraries/flow-8.0.1.jar b/src/libraries/flow-8.0.1.jar
deleted file mode 100644
index c1b47b1..0000000
Binary files a/src/libraries/flow-8.0.1.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/google-api-client-1.23.0.jar b/src/libraries/google_api_libraries/google-api-client-1.23.0.jar
deleted file mode 100644
index 3df306b..0000000
Binary files a/src/libraries/google_api_libraries/google-api-client-1.23.0.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/google-api-services-drive-v3-rev87-1.23.0.jar b/src/libraries/google_api_libraries/google-api-services-drive-v3-rev87-1.23.0.jar
deleted file mode 100644
index 22dc43b..0000000
Binary files a/src/libraries/google_api_libraries/google-api-services-drive-v3-rev87-1.23.0.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/google-http-client-1.23.0.jar b/src/libraries/google_api_libraries/google-http-client-1.23.0.jar
deleted file mode 100644
index 3e6667d..0000000
Binary files a/src/libraries/google_api_libraries/google-http-client-1.23.0.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/google-http-client-jackson2-1.23.0.jar b/src/libraries/google_api_libraries/google-http-client-jackson2-1.23.0.jar
deleted file mode 100644
index d898662..0000000
Binary files a/src/libraries/google_api_libraries/google-http-client-jackson2-1.23.0.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/google-oauth-client-1.23.0.jar b/src/libraries/google_api_libraries/google-oauth-client-1.23.0.jar
deleted file mode 100644
index be88de2..0000000
Binary files a/src/libraries/google_api_libraries/google-oauth-client-1.23.0.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/google-oauth-client-java6-1.23.0.jar b/src/libraries/google_api_libraries/google-oauth-client-java6-1.23.0.jar
deleted file mode 100644
index cd35b55..0000000
Binary files a/src/libraries/google_api_libraries/google-oauth-client-java6-1.23.0.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/google-oauth-client-jetty-1.23.0.jar b/src/libraries/google_api_libraries/google-oauth-client-jetty-1.23.0.jar
deleted file mode 100644
index f0d2ee3..0000000
Binary files a/src/libraries/google_api_libraries/google-oauth-client-jetty-1.23.0.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/jackson-core-2.9.2.jar b/src/libraries/google_api_libraries/jackson-core-2.9.2.jar
deleted file mode 100644
index ff26a3f..0000000
Binary files a/src/libraries/google_api_libraries/jackson-core-2.9.2.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/javax.servlet-api-4.0.0.jar b/src/libraries/google_api_libraries/javax.servlet-api-4.0.0.jar
deleted file mode 100644
index 9c9f4b7..0000000
Binary files a/src/libraries/google_api_libraries/javax.servlet-api-4.0.0.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/jetty-6.1.26.jar b/src/libraries/google_api_libraries/jetty-6.1.26.jar
deleted file mode 100644
index 2cbe07a..0000000
Binary files a/src/libraries/google_api_libraries/jetty-6.1.26.jar and /dev/null differ
diff --git a/src/libraries/google_api_libraries/jetty-util-6.1.26.jar b/src/libraries/google_api_libraries/jetty-util-6.1.26.jar
deleted file mode 100644
index cd23752..0000000
Binary files a/src/libraries/google_api_libraries/jetty-util-6.1.26.jar and /dev/null differ
diff --git a/src/libraries/jfoenix-1.9.1.jar b/src/libraries/jfoenix-1.9.1.jar
deleted file mode 100644
index c1f0147..0000000
Binary files a/src/libraries/jfoenix-1.9.1.jar and /dev/null differ
diff --git a/src/libraries/log4j-api-2.8.2.jar b/src/libraries/log4j-api-2.8.2.jar
deleted file mode 100644
index 9694c29..0000000
Binary files a/src/libraries/log4j-api-2.8.2.jar and /dev/null differ
diff --git a/src/libraries/log4j-core-2.8.2.jar b/src/libraries/log4j-core-2.8.2.jar
deleted file mode 100644
index eb658af..0000000
Binary files a/src/libraries/log4j-core-2.8.2.jar and /dev/null differ
diff --git a/src/libraries/minimal-json-0.9.4.jar b/src/libraries/minimal-json-0.9.4.jar
deleted file mode 100644
index 14c0633..0000000
Binary files a/src/libraries/minimal-json-0.9.4.jar and /dev/null differ
diff --git a/src/libraries/sqlite-jdbc-3.20.0.jar b/src/libraries/sqlite-jdbc-3.20.0.jar
deleted file mode 100644
index f6aa562..0000000
Binary files a/src/libraries/sqlite-jdbc-3.20.0.jar and /dev/null differ
diff --git a/src/libraries/zip4j-1.3.2.jar b/src/libraries/zip4j-1.3.2.jar
deleted file mode 100644
index dcdf85e..0000000
Binary files a/src/libraries/zip4j-1.3.2.jar and /dev/null differ
diff --git a/src/log4j2.xml b/src/log4j2.xml
deleted file mode 100644
index b3ad7b2..0000000
--- a/src/log4j2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/application/Main.java b/src/main/java/com/cemu_UI/application/Main.java
similarity index 94%
rename from src/application/Main.java
rename to src/main/java/com/cemu_UI/application/Main.java
index 5f0d2d1..7112a8f 100644
--- a/src/application/Main.java
+++ b/src/main/java/com/cemu_UI/application/Main.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package application;
+package com.cemu_UI.application;
import java.io.File;
import java.io.FileOutputStream;
@@ -33,6 +33,9 @@ import java.util.TimerTask;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+
+import com.cemu_UI.controller.CloudController;
+
import javafx.application.Application;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
@@ -66,16 +69,22 @@ public class Main extends Application {
@Override
public void start(Stage primaryStage) {
- this.primaryStage = primaryStage;
- cloudController = new CloudController(this);
- mainWindow();
- initActions();
+ try {
+ this.primaryStage = primaryStage;
+ cloudController = new CloudController(mainWindowController);
+ mainWindow();
+ initActions();
+ } catch (Exception e) {
+ LOGGER.error("ooooops",e);
+ }
+
}
private void mainWindow(){
try {
- FXMLLoader loader = new FXMLLoader(Main.class.getResource("MainWindow.fxml"));
- pane = loader.load();
+ FXMLLoader loader = new FXMLLoader();
+ loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml"));
+ pane = (AnchorPane) loader.load();
// primaryStage.setResizable(false);
primaryStage.setTitle("cemu_UI");
// primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/resources/Homeflix_Icon_64x64.png"))); //adds application icon
@@ -100,7 +109,7 @@ public class Main extends Application {
//startup checks
//check if client_secret.jason is present
- if (Main.class.getResourceAsStream("/resources/client_secret.json") == null) {
+ if (Main.class.getResourceAsStream("/client_secret.json") == null) {
LOGGER.error("client_secret is missing!!!!!");
Alert alert = new Alert(AlertType.ERROR);
@@ -160,7 +169,7 @@ public class Main extends Application {
mainWindowController.addUIData();
scene = new Scene(pane); //create new scene, append pane to scene
- scene.getStylesheets().add(Main.class.getResource("MainWindows.css").toExternalForm());
+ scene.getStylesheets().add(Main.class.getResource("/css/MainWindows.css").toExternalForm());
primaryStage.setScene(scene); //append scene to stage
primaryStage.show(); //show stage
} catch (IOException e) {
diff --git a/src/application/MainWindowController.java b/src/main/java/com/cemu_UI/application/MainWindowController.java
similarity index 94%
rename from src/application/MainWindowController.java
rename to src/main/java/com/cemu_UI/application/MainWindowController.java
index 6dce3a0..ca88773 100644
--- a/src/application/MainWindowController.java
+++ b/src/main/java/com/cemu_UI/application/MainWindowController.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package application;
+package com.cemu_UI.application;
import java.awt.Desktop;
import java.awt.Graphics2D;
@@ -51,8 +51,18 @@ import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import com.cemu_UI.controller.SmmdbApiQuery;
+import com.cemu_UI.controller.UpdateController;
+import com.cemu_UI.controller.dbController;
+import com.cemu_UI.datatypes.CourseTableDataType;
+import com.cemu_UI.datatypes.SmmdbApiDataType;
+import com.cemu_UI.datatypes.UIROMDataType;
+import com.cemu_UI.uiElements.JFXInfoDialog;
+import com.cemu_UI.uiElements.JFXOkayCancelDialog;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXColorPicker;
+import com.jfoenix.controls.JFXDialog;
+import com.jfoenix.controls.JFXDialogLayout;
import com.jfoenix.controls.JFXHamburger;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.controls.JFXToggleButton;
@@ -60,11 +70,6 @@ import com.jfoenix.controls.JFXTreeTableColumn;
import com.jfoenix.controls.JFXTreeTableView;
import com.jfoenix.transitions.hamburger.HamburgerBackArrowBasicTransition;
-import UIElements.JFXInfoDialog;
-import UIElements.JFXOkayCancelDialog;
-import datatypes.CourseTableDataType;
-import datatypes.SmmdbApiDataType;
-import datatypes.UIROMDataType;
import javafx.animation.FadeTransition;
import javafx.animation.ParallelTransition;
import javafx.animation.TranslateTransition;
@@ -96,6 +101,7 @@ import javafx.scene.input.MouseEvent;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
@@ -270,7 +276,7 @@ public class MainWindowController {
private String selectedGameTitle;
private String id;
private String version = "0.2.0";
- private String buildNumber = "047";
+ private String buildNumber = "053";
private String versionName = "Puzzle Plank Galaxy";
private int xPos = -200;
private int yPos = 17;
@@ -285,8 +291,8 @@ public class MainWindowController {
private File dirLinux = new File(System.getProperty("user.home") + "/cemu_UI");
private File configFileWin = new File(dirWin + "/config.xml");
private File configFileLinux = new File(dirLinux + "/config.xml");
- File pictureCacheWin = new File(dirWin+"/picture_cache");
- File pictureCacheLinux = new File(dirLinux+"/picture_cache");
+ private File pictureCacheWin = new File(dirWin+"/picture_cache");
+ private File pictureCacheLinux = new File(dirLinux+"/picture_cache");
private ObservableList branches = FXCollections.observableArrayList("stable", "beta");
private ObservableList smmIDs = FXCollections.observableArrayList("fe31b7f2", "44fc5929"); //TODO add more IDs
private ObservableList games = FXCollections.observableArrayList();
@@ -304,17 +310,17 @@ public class MainWindowController {
private ContextMenu gameContextMenu = new ContextMenu(edit, remove, update, addDLC);
private Label lastGameLabel = new Label();
- private ImageView add_circle_black = new ImageView(new Image("resources/icons/ic_add_circle_black_24dp_1x.png"));
- private ImageView info_black = new ImageView(new Image("resources/icons/ic_info_black_24dp_1x.png"));
- private ImageView settings_black = new ImageView(new Image("resources/icons/ic_settings_black_24dp_1x.png"));
- private ImageView cached_black = new ImageView(new Image("resources/icons/ic_cached_black_24dp_1x.png"));
- private ImageView smmdb_black = new ImageView(new Image("resources/icons/ic_get_app_black_24dp_1x.png"));
- private ImageView add_circle_white = new ImageView(new Image("resources/icons/ic_add_circle_white_24dp_1x.png"));
- private ImageView info_white = new ImageView(new Image("resources/icons/ic_info_white_24dp_1x.png"));
- private ImageView settings_white = new ImageView(new Image("resources/icons/ic_settings_white_24dp_1x.png"));
- private ImageView cached_white = new ImageView(new Image("resources/icons/ic_cached_white_24dp_1x.png"));
- private ImageView smmdb_white = new ImageView(new Image("resources/icons/ic_get_app_white_24dp_1x.png"));
- private Image close_black = new Image("resources/icons/close_black_2048x2048.png");
+ private ImageView add_circle_black = new ImageView(new Image("icons/ic_add_circle_black_24dp_1x.png"));
+ private ImageView info_black = new ImageView(new Image("icons/ic_info_black_24dp_1x.png"));
+ private ImageView settings_black = new ImageView(new Image("icons/ic_settings_black_24dp_1x.png"));
+ private ImageView cached_black = new ImageView(new Image("icons/ic_cached_black_24dp_1x.png"));
+ private ImageView smmdb_black = new ImageView(new Image("icons/ic_get_app_black_24dp_1x.png"));
+ private ImageView add_circle_white = new ImageView(new Image("icons/ic_add_circle_white_24dp_1x.png"));
+ private ImageView info_white = new ImageView(new Image("icons/ic_info_white_24dp_1x.png"));
+ private ImageView settings_white = new ImageView(new Image("icons/ic_settings_white_24dp_1x.png"));
+ private ImageView cached_white = new ImageView(new Image("icons/ic_cached_white_24dp_1x.png"));
+ private ImageView smmdb_white = new ImageView(new Image("icons/ic_get_app_white_24dp_1x.png"));
+ private Image close_black = new Image("icons/close_black_2048x2048.png");
public void setMain(Main main) {
this.main = main;
@@ -1089,18 +1095,37 @@ public class MainWindowController {
LOGGER.info("No parameter set!");
//addGame error dialog
- String headingText = "Error while adding a new Game!";
- String bodyText = "There was some truble adding your game."
- + "\nOne of the needed values was empty, please try again to add your game.";
- JFXInfoDialog addGameErrorDialog = new JFXInfoDialog(headingText, bodyText, dialogBtnStyle, 450, 170, main.pane);
- addGameErrorDialog.show();
+ JFXDialogLayout content= new JFXDialogLayout();
+ content.setHeading(new Text("Error while adding a new Game!"));
+ content.setBody(new Text("There was some truble adding your game."
+ + "\nOne of the needed values was empty, please try again to add your game."));
+ content.setPrefSize(450, 170);
+ StackPane stackPane = new StackPane();
+ stackPane.autosize();
+ JFXDialog errorDialog =new JFXDialog(stackPane, content, JFXDialog.DialogTransition.LEFT, true);
+ JFXButton button=new JFXButton("Okay");
+ button.setOnAction(new EventHandler(){
+ @Override
+ public void handle(ActionEvent event){
+ errorDialog.close();
+ }
+ });
+ button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
+ button.setPrefHeight(32);
+ button.setStyle(dialogBtnStyle);
+ content.setActions(button);
+ main.pane.getChildren().add(stackPane);
+ AnchorPane.setTopAnchor(stackPane, (main.pane.getHeight()-content.getPrefHeight())/2);
+ AnchorPane.setLeftAnchor(stackPane, (main.pane.getWidth()-content.getPrefWidth())/2);
+ errorDialog.show();
+
} else {
coverName = new File(coverPath).getName();
try {
if (System.getProperty("os.name").equals("Linux")) {
- pictureCache = pictureCacheLinux;
+ pictureCache = getPictureCacheLinux();
} else {
- pictureCache = pictureCacheWin;
+ pictureCache = getPictureCacheWin();
}
BufferedImage originalImage = ImageIO.read(new File(coverPath)); //load cover
@@ -1129,7 +1154,7 @@ public class MainWindowController {
* @param romPath : path to ROM file (.rpx)
* @param titleID : ROM ID
*/
- void addGame(String title, String coverPath, String romPath, String titleID){
+ public void addGame(String title, String coverPath, String romPath, String titleID){
VBox VBox = new VBox();
Label gameTitleLabel = new Label();
JFXButton gameBtn = new JFXButton();
@@ -1495,7 +1520,7 @@ public class MainWindowController {
}
}
- void saveSettings(){
+ public void saveSettings(){
LOGGER.info("saving Settings ...");
OutputStream outputStream; //new output-stream
try {
@@ -1761,6 +1786,22 @@ public class MainWindowController {
this.color = color;
}
+ public File getPictureCacheLinux() {
+ return pictureCacheLinux;
+ }
+
+ public void setPictureCacheLinux(File pictureCacheLinux) {
+ this.pictureCacheLinux = pictureCacheLinux;
+ }
+
+ public File getPictureCacheWin() {
+ return pictureCacheWin;
+ }
+
+ public void setPictureCacheWin(File pictureCacheWin) {
+ this.pictureCacheWin = pictureCacheWin;
+ }
+
public int getxPos() {
return xPos;
}
diff --git a/src/application/playGame.java b/src/main/java/com/cemu_UI/application/playGame.java
similarity index 95%
rename from src/application/playGame.java
rename to src/main/java/com/cemu_UI/application/playGame.java
index 6e7eef1..89d8474 100644
--- a/src/application/playGame.java
+++ b/src/main/java/com/cemu_UI/application/playGame.java
@@ -19,13 +19,15 @@
* MA 02110-1301, USA.
*/
-package application;
+package com.cemu_UI.application;
import java.io.IOException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import com.cemu_UI.controller.dbController;
+
import javafx.application.Platform;
public class playGame extends Thread{
@@ -34,7 +36,7 @@ public class playGame extends Thread{
dbController dbController;
private static final Logger LOGGER = LogManager.getLogger(playGame.class.getName());
- public playGame(MainWindowController m, dbController db){
+ public playGame(MainWindowController m, com.cemu_UI.controller.dbController db){
mainWindowController = m;
dbController = db;
}
diff --git a/src/application/CloudController.java b/src/main/java/com/cemu_UI/controller/CloudController.java
similarity index 85%
rename from src/application/CloudController.java
rename to src/main/java/com/cemu_UI/controller/CloudController.java
index caf4c48..e0928f1 100644
--- a/src/application/CloudController.java
+++ b/src/main/java/com/cemu_UI/controller/CloudController.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package application;
+package com.cemu_UI.controller;
import java.io.File;
import java.io.IOException;
@@ -27,20 +27,22 @@ import java.io.IOException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import cloudControllerInstances.GoogleDriveController;
+import com.cemu_UI.application.MainWindowController;
+import com.cemu_UI.vendorCloudController.GoogleDriveController;
+
import javafx.application.Platform;
public class CloudController {
- public CloudController(Main ma) {
- main = ma;
+ public CloudController(MainWindowController mwc) {
+ this.mwc = mwc;
}
- private Main main;
+ private MainWindowController mwc;
private GoogleDriveController googleDriveController = new GoogleDriveController();
private static final Logger LOGGER = LogManager.getLogger(CloudController.class.getName());
- boolean initializeConnection(String cloudService, String cemuDirectory) {
+ public boolean initializeConnection(String cloudService, String cemuDirectory) {
boolean success = false;
LOGGER.info("sartting cloud initialisation ...");
@@ -62,23 +64,23 @@ public class CloudController {
return success;
}
- void stratupCheck(String cloudService, String cemuDirectory) {
+ public void stratupCheck(String cloudService, String cemuDirectory) {
if(cloudService.equals("GoogleDrive")) {
LOGGER.info("starting startup check google drive ...");
try {
if (!googleDriveController.checkFolder()) {
googleDriveController.creatFolder();
- main.mainWindowController.saveSettings();
+ mwc.saveSettings();
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
Platform.runLater(() -> {
- main.mainWindowController.getPlayBtn().setText("syncing...");
+ mwc.getPlayBtn().setText("syncing...");
});
googleDriveController.uploadAllFiles();
Platform.runLater(() -> {
- main.mainWindowController.getPlayBtn().setText("play");
+ mwc.getPlayBtn().setText("play");
});
}
});
@@ -97,14 +99,14 @@ public class CloudController {
- void sync(String cloudService, String cemuDirectory) {
+ public void sync(String cloudService, String cemuDirectory) {
//running sync in a new thread, instead of blocking the main thread
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
Platform.runLater(() -> {
- main.mainWindowController.getPlayBtn().setText("syncing...");
+ mwc.getPlayBtn().setText("syncing...");
});
LOGGER.info("starting synchronization in new thread ...");
@@ -119,9 +121,9 @@ public class CloudController {
}
Platform.runLater(() -> {
- main.mainWindowController.getPlayBtn().setText("play");
+ mwc.getPlayBtn().setText("play");
});
- main.mainWindowController.saveSettings();
+ mwc.saveSettings();
LOGGER.info("synchronization successful!");
}
});
diff --git a/src/application/SmmdbApiQuery.java b/src/main/java/com/cemu_UI/controller/SmmdbApiQuery.java
similarity index 98%
rename from src/application/SmmdbApiQuery.java
rename to src/main/java/com/cemu_UI/controller/SmmdbApiQuery.java
index 100bafb..2392ec0 100644
--- a/src/application/SmmdbApiQuery.java
+++ b/src/main/java/com/cemu_UI/controller/SmmdbApiQuery.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package application;
+package com.cemu_UI.controller;
import java.io.BufferedReader;
import java.io.IOException;
@@ -30,12 +30,11 @@ import java.util.ArrayList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import com.cemu_UI.datatypes.SmmdbApiDataType;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonArray;
import com.eclipsesource.json.JsonValue;
-import datatypes.SmmdbApiDataType;
-
public class SmmdbApiQuery {
private String URL = "https://smmdb.ddns.net/api/getcourses?format=json";
diff --git a/src/application/UpdateController.java b/src/main/java/com/cemu_UI/controller/UpdateController.java
similarity index 98%
rename from src/application/UpdateController.java
rename to src/main/java/com/cemu_UI/controller/UpdateController.java
index 2dc312b..ef793e1 100644
--- a/src/application/UpdateController.java
+++ b/src/main/java/com/cemu_UI/controller/UpdateController.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package application;
+package com.cemu_UI.controller;
import java.io.BufferedReader;
import java.io.File;
@@ -27,6 +27,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
+
import javax.swing.ProgressMonitor;
import javax.swing.ProgressMonitorInputStream;
@@ -34,6 +35,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import com.cemu_UI.application.MainWindowController;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonArray;
import com.eclipsesource.json.JsonObject;
diff --git a/src/application/dbController.java b/src/main/java/com/cemu_UI/controller/dbController.java
similarity index 93%
rename from src/application/dbController.java
rename to src/main/java/com/cemu_UI/controller/dbController.java
index 8dc647d..9eecb5b 100644
--- a/src/application/dbController.java
+++ b/src/main/java/com/cemu_UI/controller/dbController.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package application;
+package com.cemu_UI.controller;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
@@ -45,6 +45,8 @@ import org.apache.logging.log4j.Logger;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
+import com.cemu_UI.application.MainWindowController;
+
public class dbController {
public dbController(MainWindowController m) {
@@ -134,7 +136,7 @@ public class dbController {
}
}
- void addRom(String title, String coverPath, String romPath, String titleID, String productCode, String region, String lastPlayed, String timePlayed) throws SQLException{
+ public void addRom(String title, String coverPath, String romPath, String titleID, String productCode, String region, String lastPlayed, String timePlayed) throws SQLException{
Statement stmt = connection.createStatement();
stmt.executeUpdate("insert into local_roms values ('"+title+"','"+coverPath+"','"+romPath+"','"+titleID+"',"
+ "'"+productCode+"','"+region+"','"+lastPlayed+"','"+timePlayed+"')");
@@ -143,7 +145,7 @@ public class dbController {
LOGGER.info("added \""+title+"\" to ROM database");
}
- void removeRom(String titleID) throws SQLException{
+ public void removeRom(String titleID) throws SQLException{
Statement stmt = connection.createStatement();
stmt.executeUpdate("delete from local_roms where titleID = '"+titleID+"'");
connection.commit();
@@ -168,7 +170,7 @@ public class dbController {
}
//load one single ROM after manual adding into the mainWindowController
- void loadSingleRom(String titleID){
+ public void loadSingleRom(String titleID){
LOGGER.info("loading a single ROM (ID: "+titleID+") into the mainWindowController ...");
try {
Statement stmt = connection.createStatement();
@@ -184,7 +186,7 @@ public class dbController {
}
//get all files with .rpx TODO add other formats
- void loadRomDirectory(String directory){
+ public void loadRomDirectory(String directory){
File dir = new File(directory);
File appFile;
String[] extensions = new String[] { "rpx", "jsp" };
@@ -192,9 +194,9 @@ public class dbController {
String coverPath;
if(System.getProperty("os.name").equals("Linux")){
- pictureCache = mainWindowController.pictureCacheLinux;
+ pictureCache = mainWindowController.getPictureCacheLinux();
}else{
- pictureCache = mainWindowController.pictureCacheWin;
+ pictureCache = mainWindowController.getPictureCacheWin();
}
try {
@@ -272,7 +274,7 @@ public class dbController {
* @param titleID Title-ID of the Game
* @return title, coverPath, romPath, titleID (in this order)
*/
- String[] getGameInfo(String titleID){
+ public String[] getGameInfo(String titleID){
String[] gameInfo = new String[4];
LOGGER.info("getting game info for titleID: "+titleID+" ...");
try {
@@ -292,7 +294,7 @@ public class dbController {
return gameInfo;
}
- void setGameInfo(String title, String titleID, String romPath, String coverPath){
+ public void setGameInfo(String title, String titleID, String romPath, String coverPath){
LOGGER.info("setting game info for titleID: "+titleID+" ...");
try {
Statement stmt = connection.createStatement();
@@ -305,7 +307,7 @@ public class dbController {
}
}
- void setLastPlayed(String titleID){
+ public void setLastPlayed(String titleID){
try{
Statement stmt = connection.createStatement();
stmt.executeUpdate("UPDATE local_roms SET lastPlayed=date('now') WHERE titleID = '"+titleID+"';");
@@ -316,7 +318,7 @@ public class dbController {
}
}
- String getLastPlayed(String titleID){
+ public String getLastPlayed(String titleID){
String lastPlayed = null;
try{
Statement stmt = connection.createStatement();
@@ -330,7 +332,7 @@ public class dbController {
return lastPlayed;
}
- void setTotalPlaytime(String timePlayed, String titleID){
+ public void setTotalPlaytime(String timePlayed, String titleID){
try{
Statement stmt = connection.createStatement();
stmt.executeUpdate("UPDATE local_roms SET timePlayed='"+timePlayed+"' WHERE titleID = '"+titleID+"';");
@@ -342,7 +344,7 @@ public class dbController {
}
}
- String getTotalPlaytime(String titleID){
+ public String getTotalPlaytime(String titleID){
String timePlayed = null;
try{
Statement stmt = connection.createStatement();
diff --git a/src/datatypes/CourseTableDataType.java b/src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java
similarity index 98%
rename from src/datatypes/CourseTableDataType.java
rename to src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java
index 858c6ad..81f2176 100644
--- a/src/datatypes/CourseTableDataType.java
+++ b/src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package datatypes;
+package com.cemu_UI.datatypes;
import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
diff --git a/src/datatypes/SmmdbApiDataType.java b/src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java
similarity index 99%
rename from src/datatypes/SmmdbApiDataType.java
rename to src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java
index 8ba9052..8b79697 100644
--- a/src/datatypes/SmmdbApiDataType.java
+++ b/src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package datatypes;
+package com.cemu_UI.datatypes;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/datatypes/UIROMDataType.java b/src/main/java/com/cemu_UI/datatypes/UIROMDataType.java
similarity index 99%
rename from src/datatypes/UIROMDataType.java
rename to src/main/java/com/cemu_UI/datatypes/UIROMDataType.java
index 5f4ba76..23a46f6 100644
--- a/src/datatypes/UIROMDataType.java
+++ b/src/main/java/com/cemu_UI/datatypes/UIROMDataType.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package datatypes;
+package com.cemu_UI.datatypes;
import com.jfoenix.controls.JFXButton;
diff --git a/src/UIElements/JFXInfoDialog.java b/src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java
similarity index 98%
rename from src/UIElements/JFXInfoDialog.java
rename to src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java
index a458b31..9c2b710 100644
--- a/src/UIElements/JFXInfoDialog.java
+++ b/src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package UIElements;
+package com.cemu_UI.uiElements;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXDialog;
diff --git a/src/UIElements/JFXOkayCancelDialog.java b/src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java
similarity index 99%
rename from src/UIElements/JFXOkayCancelDialog.java
rename to src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java
index 7a5c281..6c39c24 100644
--- a/src/UIElements/JFXOkayCancelDialog.java
+++ b/src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java
@@ -20,7 +20,7 @@
*/
-package UIElements;
+package com.cemu_UI.uiElements;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXDialog;
diff --git a/src/cloudControllerInstances/GoogleDriveController.java b/src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java
similarity index 99%
rename from src/cloudControllerInstances/GoogleDriveController.java
rename to src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java
index ddc3195..fc2d3bc 100644
--- a/src/cloudControllerInstances/GoogleDriveController.java
+++ b/src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java
@@ -19,7 +19,7 @@
* MA 02110-1301, USA.
*/
-package cloudControllerInstances;
+package com.cemu_UI.vendorCloudController;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -101,7 +101,7 @@ public class GoogleDriveController {
*/
public Credential authorize() throws IOException {
// Load client secrets.
- InputStream in = getClass().getClassLoader().getResourceAsStream("resources/client_secret.json");
+ InputStream in = getClass().getClassLoader().getResourceAsStream("client_secret.json");
GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in));
//FIXME Linux fails to open a new browser window, application crashes, maybe a kde only bug
diff --git a/bin/application/MainWindows.css b/src/main/resources/css/MainWindows.css
similarity index 100%
rename from bin/application/MainWindows.css
rename to src/main/resources/css/MainWindows.css
diff --git a/bin/application/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml
similarity index 98%
rename from bin/application/MainWindow.fxml
rename to src/main/resources/fxml/MainWindow.fxml
index 4567ada..c5adae0 100644
--- a/bin/application/MainWindow.fxml
+++ b/src/main/resources/fxml/MainWindow.fxml
@@ -17,7 +17,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/bin/resources/icons/close_black_2048x2048.png b/src/main/resources/icons/close_black_2048x2048.png
similarity index 100%
rename from bin/resources/icons/close_black_2048x2048.png
rename to src/main/resources/icons/close_black_2048x2048.png
diff --git a/bin/resources/icons/ic_add_circle_black_24dp_1x.png b/src/main/resources/icons/ic_add_circle_black_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_add_circle_black_24dp_1x.png
rename to src/main/resources/icons/ic_add_circle_black_24dp_1x.png
diff --git a/bin/resources/icons/ic_add_circle_white_24dp_1x.png b/src/main/resources/icons/ic_add_circle_white_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_add_circle_white_24dp_1x.png
rename to src/main/resources/icons/ic_add_circle_white_24dp_1x.png
diff --git a/bin/resources/icons/ic_cached_black_24dp_1x.png b/src/main/resources/icons/ic_cached_black_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_cached_black_24dp_1x.png
rename to src/main/resources/icons/ic_cached_black_24dp_1x.png
diff --git a/bin/resources/icons/ic_cached_white_24dp_1x.png b/src/main/resources/icons/ic_cached_white_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_cached_white_24dp_1x.png
rename to src/main/resources/icons/ic_cached_white_24dp_1x.png
diff --git a/bin/resources/icons/ic_get_app_black_24dp_1x.png b/src/main/resources/icons/ic_get_app_black_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_get_app_black_24dp_1x.png
rename to src/main/resources/icons/ic_get_app_black_24dp_1x.png
diff --git a/bin/resources/icons/ic_get_app_white_24dp_1x.png b/src/main/resources/icons/ic_get_app_white_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_get_app_white_24dp_1x.png
rename to src/main/resources/icons/ic_get_app_white_24dp_1x.png
diff --git a/bin/resources/icons/ic_info_black_24dp_1x.png b/src/main/resources/icons/ic_info_black_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_info_black_24dp_1x.png
rename to src/main/resources/icons/ic_info_black_24dp_1x.png
diff --git a/bin/resources/icons/ic_info_white_24dp_1x.png b/src/main/resources/icons/ic_info_white_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_info_white_24dp_1x.png
rename to src/main/resources/icons/ic_info_white_24dp_1x.png
diff --git a/bin/resources/icons/ic_settings_black_24dp_1x.png b/src/main/resources/icons/ic_settings_black_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_settings_black_24dp_1x.png
rename to src/main/resources/icons/ic_settings_black_24dp_1x.png
diff --git a/bin/resources/icons/ic_settings_white_24dp_1x.png b/src/main/resources/icons/ic_settings_white_24dp_1x.png
similarity index 100%
rename from bin/resources/icons/ic_settings_white_24dp_1x.png
rename to src/main/resources/icons/ic_settings_white_24dp_1x.png
diff --git a/bin/libraries/commons-codec-1.11.jar b/src/main/resources/libraries/commons-codec-1.11.jar
similarity index 100%
rename from bin/libraries/commons-codec-1.11.jar
rename to src/main/resources/libraries/commons-codec-1.11.jar
diff --git a/bin/libraries/commons-io-2.6.jar b/src/main/resources/libraries/commons-io-2.6.jar
similarity index 100%
rename from bin/libraries/commons-io-2.6.jar
rename to src/main/resources/libraries/commons-io-2.6.jar
diff --git a/bin/libraries/commons-logging-1.1.1.jar b/src/main/resources/libraries/commons-logging-1.1.1.jar
similarity index 100%
rename from bin/libraries/commons-logging-1.1.1.jar
rename to src/main/resources/libraries/commons-logging-1.1.1.jar
diff --git a/bin/libraries/commons-vfs2-2.1.1744488.2.jar b/src/main/resources/libraries/commons-vfs2-2.1.1744488.2.jar
similarity index 100%
rename from bin/libraries/commons-vfs2-2.1.1744488.2.jar
rename to src/main/resources/libraries/commons-vfs2-2.1.1744488.2.jar
diff --git a/bin/libraries/flow-8.0.1.jar b/src/main/resources/libraries/flow-8.0.1.jar
similarity index 100%
rename from bin/libraries/flow-8.0.1.jar
rename to src/main/resources/libraries/flow-8.0.1.jar
diff --git a/bin/libraries/google_api_libraries/google-api-client-1.23.0.jar b/src/main/resources/libraries/google-api-client-1.23.0.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/google-api-client-1.23.0.jar
rename to src/main/resources/libraries/google-api-client-1.23.0.jar
diff --git a/bin/libraries/google_api_libraries/google-api-services-drive-v3-rev87-1.23.0.jar b/src/main/resources/libraries/google-api-services-drive-v3-rev87-1.23.0.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/google-api-services-drive-v3-rev87-1.23.0.jar
rename to src/main/resources/libraries/google-api-services-drive-v3-rev87-1.23.0.jar
diff --git a/bin/libraries/google_api_libraries/google-http-client-1.23.0.jar b/src/main/resources/libraries/google-http-client-1.23.0.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/google-http-client-1.23.0.jar
rename to src/main/resources/libraries/google-http-client-1.23.0.jar
diff --git a/bin/libraries/google_api_libraries/google-http-client-jackson2-1.23.0.jar b/src/main/resources/libraries/google-http-client-jackson2-1.23.0.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/google-http-client-jackson2-1.23.0.jar
rename to src/main/resources/libraries/google-http-client-jackson2-1.23.0.jar
diff --git a/bin/libraries/google_api_libraries/google-oauth-client-1.23.0.jar b/src/main/resources/libraries/google-oauth-client-1.23.0.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/google-oauth-client-1.23.0.jar
rename to src/main/resources/libraries/google-oauth-client-1.23.0.jar
diff --git a/bin/libraries/google_api_libraries/google-oauth-client-java6-1.23.0.jar b/src/main/resources/libraries/google-oauth-client-java6-1.23.0.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/google-oauth-client-java6-1.23.0.jar
rename to src/main/resources/libraries/google-oauth-client-java6-1.23.0.jar
diff --git a/bin/libraries/google_api_libraries/google-oauth-client-jetty-1.23.0.jar b/src/main/resources/libraries/google-oauth-client-jetty-1.23.0.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/google-oauth-client-jetty-1.23.0.jar
rename to src/main/resources/libraries/google-oauth-client-jetty-1.23.0.jar
diff --git a/bin/libraries/google_api_libraries/jackson-core-2.9.2.jar b/src/main/resources/libraries/jackson-core-2.9.2.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/jackson-core-2.9.2.jar
rename to src/main/resources/libraries/jackson-core-2.9.2.jar
diff --git a/bin/libraries/google_api_libraries/javax.servlet-api-4.0.0.jar b/src/main/resources/libraries/javax.servlet-api-4.0.0.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/javax.servlet-api-4.0.0.jar
rename to src/main/resources/libraries/javax.servlet-api-4.0.0.jar
diff --git a/bin/libraries/google_api_libraries/jetty-6.1.26.jar b/src/main/resources/libraries/jetty-6.1.26.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/jetty-6.1.26.jar
rename to src/main/resources/libraries/jetty-6.1.26.jar
diff --git a/bin/libraries/google_api_libraries/jetty-util-6.1.26.jar b/src/main/resources/libraries/jetty-util-6.1.26.jar
similarity index 100%
rename from bin/libraries/google_api_libraries/jetty-util-6.1.26.jar
rename to src/main/resources/libraries/jetty-util-6.1.26.jar
diff --git a/bin/libraries/jfoenix-1.9.1.jar b/src/main/resources/libraries/jfoenix-1.9.1.jar
similarity index 100%
rename from bin/libraries/jfoenix-1.9.1.jar
rename to src/main/resources/libraries/jfoenix-1.9.1.jar
diff --git a/bin/libraries/log4j-api-2.8.2.jar b/src/main/resources/libraries/log4j-api-2.8.2.jar
similarity index 100%
rename from bin/libraries/log4j-api-2.8.2.jar
rename to src/main/resources/libraries/log4j-api-2.8.2.jar
diff --git a/bin/libraries/log4j-core-2.8.2.jar b/src/main/resources/libraries/log4j-core-2.8.2.jar
similarity index 100%
rename from bin/libraries/log4j-core-2.8.2.jar
rename to src/main/resources/libraries/log4j-core-2.8.2.jar
diff --git a/bin/libraries/minimal-json-0.9.4.jar b/src/main/resources/libraries/minimal-json-0.9.4.jar
similarity index 100%
rename from bin/libraries/minimal-json-0.9.4.jar
rename to src/main/resources/libraries/minimal-json-0.9.4.jar
diff --git a/bin/libraries/sqlite-jdbc-3.20.0.jar b/src/main/resources/libraries/sqlite-jdbc-3.20.0.jar
similarity index 100%
rename from bin/libraries/sqlite-jdbc-3.20.0.jar
rename to src/main/resources/libraries/sqlite-jdbc-3.20.0.jar
diff --git a/bin/libraries/zip4j-1.3.2.jar b/src/main/resources/libraries/zip4j-1.3.2.jar
similarity index 100%
rename from bin/libraries/zip4j-1.3.2.jar
rename to src/main/resources/libraries/zip4j-1.3.2.jar
diff --git a/bin/log4j2.xml b/src/main/resources/log4j2.xml
similarity index 100%
rename from bin/log4j2.xml
rename to src/main/resources/log4j2.xml
diff --git a/src/resources/icons/close_black_2048x2048.png b/src/resources/icons/close_black_2048x2048.png
deleted file mode 100644
index 2d0397b..0000000
Binary files a/src/resources/icons/close_black_2048x2048.png and /dev/null differ
diff --git a/src/resources/icons/ic_add_circle_black_24dp_1x.png b/src/resources/icons/ic_add_circle_black_24dp_1x.png
deleted file mode 100644
index ac376d0..0000000
Binary files a/src/resources/icons/ic_add_circle_black_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_add_circle_white_24dp_1x.png b/src/resources/icons/ic_add_circle_white_24dp_1x.png
deleted file mode 100644
index 9121d99..0000000
Binary files a/src/resources/icons/ic_add_circle_white_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_cached_black_24dp_1x.png b/src/resources/icons/ic_cached_black_24dp_1x.png
deleted file mode 100644
index 83b946a..0000000
Binary files a/src/resources/icons/ic_cached_black_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_cached_white_24dp_1x.png b/src/resources/icons/ic_cached_white_24dp_1x.png
deleted file mode 100644
index 91dc808..0000000
Binary files a/src/resources/icons/ic_cached_white_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_get_app_black_24dp_1x.png b/src/resources/icons/ic_get_app_black_24dp_1x.png
deleted file mode 100644
index c2c845e..0000000
Binary files a/src/resources/icons/ic_get_app_black_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_get_app_white_24dp_1x.png b/src/resources/icons/ic_get_app_white_24dp_1x.png
deleted file mode 100644
index d400472..0000000
Binary files a/src/resources/icons/ic_get_app_white_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_info_black_24dp_1x.png b/src/resources/icons/ic_info_black_24dp_1x.png
deleted file mode 100644
index 5ef3dc0..0000000
Binary files a/src/resources/icons/ic_info_black_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_info_white_24dp_1x.png b/src/resources/icons/ic_info_white_24dp_1x.png
deleted file mode 100644
index 17faafb..0000000
Binary files a/src/resources/icons/ic_info_white_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_settings_black_24dp_1x.png b/src/resources/icons/ic_settings_black_24dp_1x.png
deleted file mode 100644
index c59419c..0000000
Binary files a/src/resources/icons/ic_settings_black_24dp_1x.png and /dev/null differ
diff --git a/src/resources/icons/ic_settings_white_24dp_1x.png b/src/resources/icons/ic_settings_white_24dp_1x.png
deleted file mode 100644
index 8909c35..0000000
Binary files a/src/resources/icons/ic_settings_white_24dp_1x.png and /dev/null differ