From 63b1809c90a56d26c10614a1f932da8b2756fcd1 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Wed, 13 Nov 2019 05:59:51 +0100
Subject: [PATCH] Loading config from properties before command line args

---
 src/main/java/envoy/client/Config.java     |  4 +--
 src/main/java/envoy/client/ui/Startup.java | 34 ++++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/envoy/client/Config.java b/src/main/java/envoy/client/Config.java
index c31c972..545df2f 100644
--- a/src/main/java/envoy/client/Config.java
+++ b/src/main/java/envoy/client/Config.java
@@ -32,7 +32,7 @@ public class Config {
 	 * 
 	 * @param properties a {@link Properties} object containing information about
 	 *                   the server and port, as well as the path to the local
-	 *                   database
+	 *                   database and the synchronization timeout
 	 * @since Envoy v0.1-alpha
 	 */
 	public void load(Properties properties) {
@@ -64,8 +64,6 @@ public class Config {
 				case "-db":
 					localDB = new File(args[++i]);
 			}
-		if (localDB == null) localDB = new File(".\\localDB");
-		if (syncTimeout == 0) syncTimeout = 1000;
 	}
 
 	/**
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index c3a3baa..5a2d92f 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -26,21 +26,24 @@ public class Startup {
 
 	public static void main(String[] args) {
 		Config config = Config.getInstance();
-		if (args.length > 0) {
-			config.load(args);
-		} else {
-			ClassLoader loader = Thread.currentThread().getContextClassLoader();
-			try {
-				Properties configProperties = new Properties();
-				configProperties.load(loader.getResourceAsStream("client.properties"));
-				config.load(configProperties);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+
+		// Load the configuration from client.properties first
+		ClassLoader loader = Thread.currentThread().getContextClassLoader();
+		try {
+			Properties configProperties = new Properties();
+			configProperties.load(loader.getResourceAsStream("client.properties"));
+			config.load(configProperties);
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
 
+		// Override configuration values with command line arguments
+		if (args.length > 0)
+			config.load(args);
+
 		if (!config.isInitialized()) {
-			System.err.println("Server or port are not defined. Exiting...");
+			JOptionPane.showMessageDialog(null, "Error loading configuration values.", "Configuration error",
+					JOptionPane.ERROR_MESSAGE);
 			System.exit(1);
 		}
 
@@ -49,16 +52,15 @@ public class Startup {
 			System.err.println("User name is not set or empty. Exiting...");
 			System.exit(1);
 		}
-		Client	client	= new Client(config, userName);
-		LocalDB	localDB	= new LocalDB(client.getSender());
+		Client client = new Client(config, userName);
+		LocalDB localDB = new LocalDB(client.getSender());
 		try {
 			localDB.initializeDBFile(config.getLocalDB());
 		} catch (EnvoyException e) {
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
 					"Error while loading local database: " + e.toString() + "\nChats will not be stored locally.",
-					"Local DB error",
-					JOptionPane.WARNING_MESSAGE);
+					"Local DB error", JOptionPane.WARNING_MESSAGE);
 		}
 
 		EventQueue.invokeLater(() -> {