From 24391f40aced5b55094b50d597928fc4cd09d4da Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 19 Mar 2017 13:07:26 +0100
Subject: [PATCH] Fixed error in server settings
---
settings.properties | 4 ++--
src/de/deadlocker8/budgetmaster/logic/Settings.java | 6 ++++++
src/de/deadlocker8/budgetmaster/ui/Controller.java | 3 +++
.../budgetmasterserver/main/DatabaseCreator.java | 2 +-
.../budgetmasterserver/main/DatabaseHandler.java | 1 +
src/de/deadlocker8/budgetmasterserver/main/Main.java | 1 +
.../budgetmasterserver/resources/settings.properties | 6 +++---
7 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/settings.properties b/settings.properties
index 1da1d4e8e..fd1857014 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 f6d501ae3..84a6b6ff5 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 2175ef471..f18acda0b 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 b60867ca2..18f8cb2ad 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 ce93c39f2..b2ee4c350 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 7db6b448d..2337e8c2a 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 798a418c8..fd1857014 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
--
GitLab