diff --git a/settings.properties b/settings.properties index 1da1d4e8ebcd3dbf225755e5de875cf17799b44c..fd1857014ab872a54ca8d6c3aabb77625031a4b6 100644 --- a/settings.properties +++ b/settings.properties @@ -3,6 +3,6 @@ "databaseName": "budgetmastersave", "databaseUsername": "root", "databasePassword": "", - "port": 9000, - "secret": "geheim" + "serverPort": 9000, + "serverSecret": "geheim" } \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmaster/logic/Settings.java b/src/de/deadlocker8/budgetmaster/logic/Settings.java index f6d501ae3146ec9f3ba49b0baad332a4f34f57ba..84a6b6ff524b6d19e94dcaf081e953e7ff75ab4e 100644 --- a/src/de/deadlocker8/budgetmaster/logic/Settings.java +++ b/src/de/deadlocker8/budgetmaster/logic/Settings.java @@ -51,4 +51,10 @@ public class Settings { this.restActivated = restActivated; } + + @Override + public String toString() + { + return "Settings [url=" + url + ", secret=" + secret + ", currency=" + currency + ", restActivated=" + restActivated + "]"; + } } \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmaster/ui/Controller.java b/src/de/deadlocker8/budgetmaster/ui/Controller.java index 2175ef4717a68a94833cdd5ab119e87f15a9b1b5..f18acda0b3ac9ab2331fd3f89c66a2db099b6855 100644 --- a/src/de/deadlocker8/budgetmaster/ui/Controller.java +++ b/src/de/deadlocker8/budgetmaster/ui/Controller.java @@ -109,6 +109,8 @@ public class Controller implements Refreshable chartController = fxmlLoader.getController(); chartController.init(this); tabCharts.setContent(nodeTabChart); + //TODO + tabCharts.setDisable(true); fxmlLoader = new FXMLLoader(getClass().getResource("/de/deadlocker8/budgetmaster/ui/SettingsTab.fxml")); Parent nodeTabSettings = (Parent)fxmlLoader.load(); @@ -287,6 +289,7 @@ public class Controller implements Refreshable } catch(Exception e) { + Logger.error(e); categoryHandler = new CategoryHandler(null); showConnectionErrorAlert(); } diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseCreator.java b/src/de/deadlocker8/budgetmasterserver/main/DatabaseCreator.java index b60867ca254be24ddc226c11ed891560ef0af39a..18f8cb2ad37ab1c6db132b0c8dfca68a1e1a4db9 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseCreator.java +++ b/src/de/deadlocker8/budgetmasterserver/main/DatabaseCreator.java @@ -20,7 +20,7 @@ public class DatabaseCreator this.settings = settings; Logger.info("Checking tables..."); createTables(getExistingTables()); - Logger.info("Successfully initialized database"); + Logger.info("Checking tables [DONE]"); } private ArrayList<String> getExistingTables() diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java b/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java index ce93c39f2d3efa3ca61ef359d106d576fa05186a..b2ee4c350864d158a9b5cbdee8877160b5be1d89 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java +++ b/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java @@ -32,6 +32,7 @@ public class DatabaseHandler { this.connection = DriverManager.getConnection(settings.getDatabaseUrl() + settings.getDatabaseName() + "?useLegacyDatetimeCode=false&serverTimezone=Europe/Berlin", settings.getDatabaseUsername(), settings.getDatabasePassword()); new DatabaseCreator(connection, settings); + Logger.info("Successfully initialized database (" + settings.getDatabaseUrl() + settings.getDatabaseName() + ")"); } catch(Exception e) { diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java index 7db6b448d7ac9916d7e94e0b5a684efc265e3f1e..2337e8c2a091de457ba7698b3fe9c42d31d92b07 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/Main.java +++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java @@ -41,6 +41,7 @@ public class Main try { settings = Utils.loadSettings(); + System.out.println(settings); new SparkServer(settings); } catch(IOException e) diff --git a/src/de/deadlocker8/budgetmasterserver/resources/settings.properties b/src/de/deadlocker8/budgetmasterserver/resources/settings.properties index 798a418c8642c57113b25a33c1cc1243d287312d..fd1857014ab872a54ca8d6c3aabb77625031a4b6 100644 --- a/src/de/deadlocker8/budgetmasterserver/resources/settings.properties +++ b/src/de/deadlocker8/budgetmasterserver/resources/settings.properties @@ -1,8 +1,8 @@ { "databaseUrl": "jdbc:mysql://localhost:3306/", - "databaseName": "budgetmaster", + "databaseName": "budgetmastersave", "databaseUsername": "root", "databasePassword": "", - "port": 9000, - "secret": "geheim" + "serverPort": 9000, + "serverSecret": "geheim" } \ No newline at end of file